137 Commits

Author SHA1 Message Date
Ruby
2a762cbbed
Removes vestigial EWRAM variable from debug menu. (#6686) 2025-04-23 20:03:58 +02:00
Ruby
aba34015db
Time menu for RTC in debug menu. (#6634)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-23 19:34:37 +02:00
khbsd
971a595e4a
Evolution Refactor (#6556)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-04-23 16:01:33 +02:00
AlexOn1ine
d767211c4a helper function to get the species type based on personality 2025-03-31 14:49:40 +02:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03:00
cawtds
5c3381b2f6
fix spit up getting skipped (#6295) 2025-02-19 12:51:11 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
Eduardo Quezada
af884b1be4
Cleaned up Debug Menu (#6070) 2025-01-22 15:27:08 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums (#6071) 2025-01-21 21:19:41 +01:00
Pawkkie
44ebf33f1d
Add Steven Multi to debug menu (#6064) 2025-01-20 22:29:21 +01:00
Eduardo Quezada
21bc5cfd30
Debug menu and createmon additions/cleanup (#5994) 2025-01-11 10:07:47 +01:00
Eduardo Quezada
107984e273
Added "Game Clear" flag toggle to debug menu (#5929) 2025-01-02 00:21:43 +01:00
kittenchilly
6e6352569f
Narrower font tweaks and font fitting fixes (#5782) 2024-12-07 18:12:09 -03:00
Eduardo Quezada
5c180a0b09
Added FONT_SHORT_NARROWER (#5101) 2024-12-04 06:30:19 -08:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids (#5560) 2024-10-28 18:03:15 +01:00
Salem
90089ecf51
add debug build target (#4817)
* add debug build target

* fix maybe uninitialized error

* add option to undef NDEBUG

* debug for agbcc

* init instead of ignore to not break agbcc

* make clean removes modern and agbcc artifacts. explicit use of -O0 again for NOOPT

* automatically enable debug menu when building for debug

* automatically enable debug menu when building for debug

* automatically enable debug menu when building for debug

* clean up previous mess omg

* remove preproc around debug menus

* automatically enable debug menu when building for debug

* clean up previous mess omg

* Apply suggestions from code review

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

* Update Makefile

* Update field_control_avatar.c

* make debug print independent

* remove unwanted changes

* remove trailing endif

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-07 10:13:22 -04:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces (#5261)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable (#5047)
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable

* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
Frank DeBlasio
849bd0c8bb
Consolidate natures (#4562)
* Added NatureInfo struct

* Added back animation variants to struct

* Added PokeBlock animations to struct

* Added Battle Palace info to struct

* Added nature girl messages to struct

* Reordered gNaturesInfo to match struct order

* Refactored nature stat table

* Fixed battle dome nature calculation

* Fixed neutral nature values

* Fixed bracket layout
2024-05-19 10:14:31 +02:00
Eduardo Quezada
ab682ce900 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/data/items.h
#	src/pokemon_summary_screen.c
2024-05-15 09:58:21 -04:00
Bassoonian
bbb6ade9e8
Fix debug ability u8 (#4576) 2024-05-15 11:56:58 +02:00
Alex
a48d2c9ce2
Set GiveBoxMonIntialMoveset_Fast as default (#4470)
* Set GiveBoxMonIntialMoveset_Fast as default

* Update pokemon.h

removed duplicates
2024-05-02 17:53:32 +02:00
Martin Griffin
62ce29d0e9 Debug Menu: Re-render 'Flags & Vars' rather than re-create 2024-04-25 18:40:37 +01:00
Eduardo Quezada
1568b0a424
Pre-1.8 tweaks (#4275)
* Moved BERRY_MUTATION_CHANCE to include/config/overworld.h and renamed it to OW_BERRY_MUTATION_CHANCE

* Move level_caps.h to config folder

* Multiple EV/IV refered as EVs/IVs

* Disabled decap by default

* Level up learnsetst comments
2024-03-12 12:21:03 +01:00
LOuroboros
64b7cfeb29
Upgrading the debug menu's 'Poison Party' (#4235)
* Upgrading the debug menu's 'Poison Party'

* Optimized the 'No Pokémon' check in Debug_EventScript_InflictStatus1

* Killed a pointless function call in Script_SetStatus1

* Added Frostbite support to ¡inflict status1'
2024-03-01 19:55:54 +01:00
Martin Griffin
311d732359
Save-compatible SaveBlock3 (#4112)
* SaveBlock3 in sector footers

* Update load_save.c

Since mgriffin is currently not available I took the liberty to edit the file. Hope it's fine.

* SaveBlock3 in debug menu (#3)

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2024-02-10 18:14:36 +01:00
LOuroboros
916e4814bd
Implemented Custom/Complex/Expanded GiveMon scripting command (#3924)
* Introducing an expanded givemon

* Added debug features to check a Pokémon's EV and IV

* Added a parameter to set a custom mon's gender

* Added a debug feature to clear the party

* Defined the EV/IV getters in gSpecials

* Added Gigantamax Factor toggle to givecustommon

* Updated Gigantamax Factor label in givecustommon macro

* Added tera type parameter to givecustommon

Misc. changes:
-Added a few harmless comments to CreateCustomMon for consistency reasons.

* Cleaned up the code inside CreateCustomMon a bit

Also updated the values assigned to the parameters of ScriptGiveCustomMon
This is temporary though. I'll probably end up turning them into 2byte parameters so they can be filled when the scripting command is called by using variables once I solve the bigger problem that the scripting command is currently facing.

* Foolproofed the Poké Ball check in CreateCustomMon

* Assigned a default gender to givecustommon
This solved the nasty issue by which the command wasn't working properly if you didn't fill in each parameter when calling givecustommon in a script.

* Reinforced the gender checks at CreateCustomMon

* Re-reinforced the gender checks at CreateCustomMon

* Compressed givecustommon and added tests

-Made givecustommon skip unspecified parameters.
-Added scripting variables support for every parameter.
-Added tests.

* Updated the default values of some ScriptGiveCustomMon parameters

* Replaced vanilla's givemon with givecustommon

Misc. Changes:
-Renamed CreateCustomMon to ScriptGiveMonParameterized.
 -The truth is that the function was never limited to creating the skeleton of a Pokémon like the actual CreateMon functions do, so that label was never correct. The function was always an expanded ScriptGiveMon.
-Moved the core functions to src/script_pokemon_util.c which is where they actually belong.
-Updated ScriptGiveMonParameterized a little to incorporateb changes that were applied to the original ScriptGiveMon, namely, Synchronize ability and form change handling.
-Introduced a new ScriptGiveMon to replace the original one.

* Corrected givecustommon tests

* Fixed the default IV values for the new givemon

* Updated DebugAction_Party_ClearParty for consistency with the other debug functions

* Updated the text strings used by the Check EV/IV debug features

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-08 09:11:13 +01:00
LOuroboros
a64e1c63c1
Move data unification (#3999)
* Made gBattleMoves handle the InGame name and description of battle moves
No more multiple arrays in separate, individual files.

Note:
-Keep an eye on Task_LearnedMove.

* Reintroduced move names

Misc:
-Fixed Trick-or-Treat and Light of Ruin's expanded names.
-Introduced a new field for Z-Move names, and a constant for their name length.
-Added a few TODOs to GetBattleMoveName.
-Updated GetMaxMoveName and GetZMoveName. There's no reason not to let GetBattleMoveName handle everything on its own.

* Updated GetBattleMoveName to handle Z-Move Names

Misc:
-Removed pointless TODO about MOVE_NAME_LENGTH.
 -The compiler doesn't allow to have a move name with a value higher than MOVE_NAME_LENGTH, therefore it's pointless to worry about it.

* Fixed a couple of expanded move names

* Removed zMoveName variable of struct BattleMove and extended the name variable's size

* Ditched no longer used MOVE_NAME_LENGTH constant

* Corrected the names of the max moves
I should have done this after updating the size of the name variable of the struct BattleMove, but I didn't think about it at all until Cancer Fairy indirectly gave me the idea.

* Fixed U-turn's name

* Brought back MOVE_NAME_LENGTH
I think it doesn't make sense to have a Z_MOVE_NAME_LENGTH because the length in question is used for all battle moves, not just the Z-Moves.

* Introduced a union for Move/Z-Move names in the struct BattleMove

* Fixed the union for gBattleMoves move names
Also updated GetBattleMoveName to properly handle Max Move names.
Also also renamed the "zMoveName" variable to "bigMoveName" which better reflects its purpose. Z-Move names weren't the only thing it covered, since it also handles Max Move names.

* Removed deprecated GetZMoveName and GetMaxMoveName

* Reintroduced mention to gMoveNames in sGFRomHeader

* Fixed move names and ported move descriptions

* Fused the struct ContestMove into the struct BattleMove

* Removed no longer used Z_MOVE_NAME_LENGTH constant

* Renamed the struct BattleMove's bigMoveName variable and introduced macros to prettify move names

* Reintroduced the contest parameters for Pokémon moves

* Renamed gBattleMoves to gMovesInfo
This is consistent with gSpeciesInfo, the array that contains most of the species data.

* Renamed the BattleMove struct to MovesInfo
This is consistent with the struct SpeciesInfo, which contains the variables used by the gSpeciesInfo array.

* Removed empty lines separating battle params from contest params in gMovesInfo

* Renamed MovesInfo to MoveInfo

* Added Cancer Fairy's HANDLE_EXPANDED_MOVE_NAME macro
Used to handle moves with expanded names in a more comfortable manner.
Also fixed Trick-or-Treat's expanded name.

* Renamed GetBattleMoveName to GetMoveName

* Added a comment pointing out that the shared move descriptions are shared move descriptions

* Re-aligned one of the escape characters of CHECK_MOVE_FLAG

* Renamed the battle_moves.h file to moves_info.h instead for consistency's sake

* Applied Eduardo's adjustments

* Using compound string for regular move names as well, saving 1180 bytes and making their use consistent
* Move description formatting

* Updated Pursuit test after merge

* Renamed the BATTLE_CATEGORY constants to DAMAGE_CATEGORY

---------

Co-authored-by: Nephrite <thechurchofcage@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-29 08:51:32 -03: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
Eduardo Quezada D'Ottone
6857497f60
Debug menu tweaks (#4025)
* Moved Access PC to the first option of the PC/Bag debug submenu

* Prevent item give music from cutting off by having a shorter jingle

* Removed redundant "Give all TMs" option

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-19 21:06:21 +01:00
LOuroboros
80ffaa5e2c
Raised the limit of max items per stack to 999 (#3923)
* Expanded the amount of max items per stack from 99 to 999

* Set Battle Pyramid Bag stack limit back to 99
This commit exists for archival purposes.
People who may want to set the limit of item stacks in the Battle Pyramid's bag to 999 can refer to its code diff.

* Reintroduced the Battle Pyramid changes through a MAX_PYRAMID_BAG_ITEM_CAPACITY constant

* Gave 3 digit support to the Battle Pyramid's bag

* Rewrote the comment for MAX_PYRAMID_BAG_ITEM_CAPACITY

* Made DebugAction_Give_Item_SelectQuantity use MAX_ITEM_DIGITS

* Ditched BERRY_CAPACITY_DIGITS and BAG_ITEM_CAPACITY_DIGITS

* Removed MAX_BERRY_CAPACITY
No point in keeping it if we're making all item stacks cap at 999.

* Applied review corrections

* Removed pointless local var in DebugAction_Give_Item_SelectQuantity

* Defined a MAX_PYRAMID_ITEM_DIGITS

* Cleaned up some of the functions in which MAX_ITEM_DIGITS is used

Summary:
-Removed pointless local variables in CheckBagHasSpace, AddBagItem, PrintItemQuantity and PrintItemSoldAmount.
-Removed pointless brackets in an if statement of CheckBagHasSpace.
-Initialized the pocket local variable of CheckBagHasSpace from the get go to save a few lines too.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-14 16:32:38 -03:00
Biffalo XIII
4a3954ff34 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/birch_pc.c
#	src/main.c
2024-01-09 09:19:12 -03:00
LOuroboros
dbad66ee1b
Applied a number of changes to the debug menu (#3926)
* Renamed the Party/Boxes section of the debug menu to just Party

Misc:
-Relabeled the enums containing the constants for the different features in each main section of the menu.
 -The reason why is that "enum PartyMenu" was throwing a compiler error for whatever reason, so I renamed the other labels to keep them consistent with it.

* Renamed the debug menu's 'Fill PC/Pockets' to 'PC/Bag'

* Moved PC/Bar higher in the debug menu's list

* Added a debug feature to clear the bag

* Moved 'Access PC' and 'Clear Boxes' to PC/Bag

* Relocated the GivePCBagDebugMenu enum

* Packed the debug menu's 'Fill' options into a PC/Bag category of their own
And reupdated a lot of labels that I previously renamed. I shouldn't have removed the "Fill" in them when I renamed PC/Pockets to PC/Bag..

* Fixed alignment in sDebugMenu_Items_Utilities

* Shuffled the positions of the debug menu's 'Access PC' and 'Clear Bag'

* Made the B button take you back to PC/Bag from Fill, instead of taking you to the main debug menu

* Updated alignment in sDebugMenu_Items_Utilities again

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2024-01-05 16:09:39 +01:00
Gabriel Cowley
9c07718a05
Fix debug action SelectShiny tInput value toggle (#3930) 2024-01-05 15:30:25 +01:00
Bassoonian
418e551960 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2024-01-05 00:32:21 +01:00
Frank DeBlasio
6cb89ef382
Update debug menu text (#3919)
* Updated capitalization and abbrevations in debug menu

* Updated spacing in debug.c
2024-01-03 22:49:11 +00:00
ravepossum
e9e46d8272
Fix debug menu flags not redrawing correctly after PR 3796 (#3916)
* Fix debug menu flags not redrawing correctly after PR 3796

* Update src/debug.c

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

---------

Co-authored-by: ravepossum <ravepossum@example.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-03 22:27:10 +00:00
LOuroboros
d7cdf41429
Added EV setters to the debug menu's "Give Pokémon Complex" (#3566)
* Added EV setters to the debug menu's "Give Pokémon Complex"

Misc. Changes:
-Updated the text strings for the 2 "Give Pokémon" options used by the debug menu.

* Optimized DebugAction_Give_Pokemon_SelectShiny and made some debug functions use relevant constants

* Removed extra call to CalculateMonStats in DebugAction_Give_Pokemon_ComplexCreateMon

* Made the EV selection go back to the start if the sum of EV is > 510

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-03 21:28:55 +00:00
Martin Griffin
ab900e38df Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-29 19:48:21 +00:00
Bassoonian
1662dc3478
Merge branch 'upcoming' into berryexpansion 2023-12-29 14:32:10 +01:00
Bassoonian
6bc0bf9f8b
Ability refactor (#3861)
* Ability refactor

* Adds abilities to RHH rom header

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2023-12-29 14:25:24 +01:00
Martin Griffin
3ad66028e9
Backwards-compatible BoxPokémon Refactor (#3438)
* Check progress in non-battle PARAMETRIZEd tests

* Overworld Script Tests

* Backward-compatible BoxPokemon Refactor

Reuses space that contains zeros to provide space for:
- HP/status in the box
- 12-character nicknames
- Up to 63 PokéBalls
- Shininess separate from PID
- Hidden Nature
- Hyper Training
- Dynamax Level
- Gigantamax Factor
- Terastallization Types
- Shadow

Implements:
- OW_PC_HEAL to switch between Gen7- and Gen8+ behavior
- Nature Mints
- Dynamax Candy
- Hyper Training commands (canhypertrain/hypertrain)
- Gigantamax Factor commands (hasgigantamaxfactor/togglegigantamaxfactor)
- Terastallization Type on the summary screen
- Prevents Gigantamax Factor Pokémon from evolving into a species without a Gigantamax form

* fixup! Backward-compatible BoxPokemon Refactor

* displaydexinfo fix from Jasper
2023-12-27 17:48:17 +01:00
Bassoonian
db0a9484ae Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2023-12-23 00:39:10 +01:00
tertu
fb28ce50ae
Optional high-quality RNG (#3780)
High-quality RNG, behind the HQ_RANDOM flag, enabled by default

Makes the shuffle test error a bit more tolerant
2023-12-22 17:39:15 +00:00
DizzyEggg
91741cb60f
fix debug menu toggling first flag (#3796) 2023-12-22 11:26:43 +01:00
Bassoonian
f1966904d7
Add Move Reminder to debug menu + organization (#3707)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-12-12 15:20:12 -03:00
Eduardo Quezada
1fc712f153 Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210
# Conflicts:
#	Makefile
#	data/battle_scripts_1.s
#	gflib/malloc.c
#	gflib/malloc.h
#	include/battle.h
#	ld_script.ld
#	ld_script_modern.ld
#	src/battle_ai_script_commands.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2023-12-10 13:27:09 -03:00
Bassoonian
9be5d4fba1 Add single stage growth to debug menu 2023-12-07 12:05:12 +01:00
Bassoonian
6ba4ec744b Small change to debug script for clarity 2023-12-07 11:46:44 +01:00
Bassoonian
8e43b7d696 Debug Berry functions 2023-12-06 21:08:09 +01:00