Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,324 Commits 1 Branch 0 Tags
Commit Graph

65 Commits

Author SHA1 Message Date
PCG
6db75af625
Fix Summary screen lag with move relearner when there's a lot of TMs (#8503) 2025-12-14 14:32:52 +01:00
AlexOn1ine
68300e0f9a 27/11/25 Master to upcoming merge 2025-11-27 13:39:12 +01:00
FosterProgramming
29ac028c9e
Fix tossing items applying to the wrong stack (#8282) 2025-11-21 22:13:15 -08:00
PCG
d2425c1468
Move Relearners for TMs, Tutors and Egg moves (#8040) 
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-11-09 12:54:01 -08:00
Bassoonian
be23dfdf2a
Even more enums and documentation (#8029) 2025-10-25 14:37:47 +02:00
Alex
eee546df06
Item battle effect refactor (#7857) 2025-10-12 08:59:33 +02:00
Nephrite
38eb3461b9
Changed item name/pluralName to a compound string (#7359) 2025-08-08 20:51:16 +02:00
Nephrite
2eeb346387
Bag refactor3 + Ghoulslash's sorting feature port (#7330) 2025-07-29 10:47:32 +02:00
Alex
e7cf162180
Fixes various Choice lock issues (#7383) 2025-07-25 10:18:30 -04:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code (#7262) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-07-11 22:53:49 +02:00
Nephrite
7d5a949b71
Bag refactor 2 (#7166) 2025-07-11 11:50:38 +02:00
Nephrite
e8abfbce49
Untangled TMs and HMs from item ids (#7173) 2025-07-04 19:07:53 +02:00
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) (#7018) 2025-06-18 10:59:24 +02:00
cawtds
3491cd95e8
Fix sell price display (#7123) 2025-06-15 11:52:51 +02:00
AlexOn1ine
b90fdd1b3c Master to upcoming merge 2025-05-26 10:41:11 +02:00
Hedara
2e4833240f Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge 
Conflicts:
	include/item.h
	src/battle_ai_script_commands.c
	src/battle_main.c
	src/battle_pyramid_bag.c
	src/battle_script_commands.c
	src/battle_util.c
	src/item.c
	src/item_menu.c
	src/item_use.c
	src/pokemon.c
	src/pokemon_summary_screen.c
	src/shop.c
 2025-05-24 21:24:56 +02:00
Hedara
950dbe7897 Merge commit '16357c7' into pret-merge 
Conflicts:
	include/battle.h
	include/battle_controllers.h
	include/battle_script_commands.h
	include/contest.h
	include/list_menu.h
	src/battle_controllers.c
	src/battle_gfx_sfx_util.c
	src/battle_main.c
	src/battle_message.c
	src/battle_tower.c
	src/berry_crush.c
	src/contest.c
	src/ereader_helpers.c
	src/evolution_scene.c
	src/hall_of_fame.c
	src/mauville_old_man.c
	src/mystery_gift_menu.c
	src/pokedex.c
	src/pokenav_conditions_search_results.c
	src/pokenav_menu_handler_gfx.c
	src/pokenav_ribbons_list.c
	src/rom_header_gf.c
	src/union_room.c
	src/union_room_battle.c
	src/union_room_player_avatar.c
 2025-05-24 19:22:31 +02:00
Alex
b31a73f990
Rename ItemId_GetX to GetItemX (#2116) 2025-05-22 13:27:52 +01:00
Bassoonian
16357c7e29
Streamline pointer notation (#2139) 2025-05-16 12:04:44 +01:00
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids (#5560) 2024-10-28 18:03:15 +01:00
Bassoonian
d4387d880c
Replace hardcoded flute check with consumability check (#5508) 2024-10-16 12:07:34 +02:00
Frank DeBlasio
103ed85b83
Added config to prevent unobtainable Pokemon from being shiny (#4735) 
* Added config to prevent unobtainable Pokemon from being shiny

* Added config for disabling shinies if the player has no Poke Balls

* Removed check for adventure started flag
 2024-06-29 22:07:14 +02:00
Alex
1d83ce430c
Follow up to #4579: wrong naming (#4591) 2024-05-18 17:05:25 +02:00
kittenchilly
4b221b5802
Get rid of gItemIconTable (#4579) 
* Get rid of gItemIconTable

* Move the script to the folder
 2024-05-18 10:22:26 +02:00
Martin Griffin
aab9678b02 Enable GF item names by default 
In the Pokémon Storage System, even FONT_SMALL_NARROWER isn't sufficient
to prevent clipping in all cases. e.g. Unremarkable Teacup clips. We
have decided to accept that cost to make the rest of the user experience
better, but downstream projects that don't like that trade-off can
either a) alter the Pokémon Storage System UI, or b) set
I_EXPANDED_ITEM_NAMES to FALSE.
 2024-04-25 18:40:37 +01:00
Eduardo Quezada D'Ottone
8671da436b
Add LGPE+ Premier Ball Bonus config (#4191) 
* Add LGPE+ Premier Ball Bonus config

* Capitalization

* Premier Ball count in message + only give the amount of Premier Balls possible

* Review changes

* Updated B_TELEPORT_BEHAVIOR to match Premier Ball config

* Update src/shop.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-02-25 10:13:26 +01:00
Bassoonian
b9a02b205d
Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068) 
* Rename gItems to gItemsInfo

* Rename gAbilities to gAbilitiesInfo

* Just fixing up my bad merge

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-26 15:25:52 -03:00
Bassoonian
1aff65029f
Deprecate GetBerryCountString (#4012) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-18 18:59:42 +01:00
psf
cdf7190d15
Add pluralName to gItems to allow the proper spelling when multiple items are received at once (#4001) 
* Updated CopyItemNameHandlePlural to deal with plural names

* Fixed whitespace in a few places

* Fixed whitespace in a few places

* Add remaining plural forms.

* Created ITEM_NAME_PLURAL_LENGTH

* Updated ITEM_NAME_PLURAL_LENGTH per feedback https://github.com/rh-hideout/pokeemerald-expansion/pull/4001\#discussion_r1453598165

* Reverted ITEM_NAME_PLURAL_LENGTH to +2 and added new comment

* Removed GetBerryCountString from CopyItemNameHandlePlural
Will deprecate the former in a future feature: https://github.com/rh-hideout/pokeemerald-expansion/issues/4010

---------

Co-authored-by: Zimmermann Gyula <graiondilach@hotmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-16 19:05:41 +01:00
Eduardo Quezada D'Ottone
9445953833
Moved Item Effects to gItems (#3991) 
* Moved Item Effects to gItems

* Removed redundant item effects

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-14 10:03:48 +01:00
Bassoonian
88b0bd6394
Add gen9 item prices + configs (#3834) 
* Add gen9 item prices + configs

* Adjust gen 1 PP item costs

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-27 22:48:56 +01:00
kittenchilly
ab8bc6e493
Add new sell value of 1/4 of an item's price, with config (#3315) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-05 09:14:42 -03:00
DizzyEggg
9778587935 optimize battle util and item functions by setting u32 variables 2023-09-13 00:02:26 +02:00
Eduardo Quezada
6a70b06240 Removed unused itemId field 2023-09-10 19:42:33 -03:00
Eduardo Quezada
0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
 2023-08-31 14:28:01 -04:00
LOuroboros
9d6953cc63
Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243) 
* Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now
The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16.
* Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it
* Renamed IsMoveHm to IsMoveHM
 2023-08-21 12:49:17 +01:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
AgustinGDLV
2eabcea86e
Battle Item Refactor (#2902) 
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
 2023-04-14 19:25:50 +01:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
Eduardo Quezada
2a8048b677 Removed ItemId_GetId like in upstream 2022-10-07 14:53:58 -03:00
Eduardo Quezada
68b474c0f0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007 
# Conflicts:
#	include/constants/items.h
#	src/battle_interface.c
 2022-10-07 14:52:32 -03:00
Eduardo Quezada
a20334f79a Removed unused functions in item header 2022-10-04 22:06:07 -03:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
ultima-soul
4f2e3bf214 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 21:23:54 -08:00
LOuroboros
4a74d288d4 Review corrections 2021-12-18 00:01:50 -03:00
LOuroboros
dbca24aa82 [LEAK INFORMED] Documented the unk19 item field 2021-12-17 19:41:39 -03:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR
ef2971d8dc Convert GF ROM header to C 2021-11-01 01:42:02 -04:00