diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/choose_party.h | 2 | ||||
| -rw-r--r-- | include/debug.h | 3 | ||||
| -rw-r--r-- | include/decoration_inventory.h | 4 | ||||
| -rw-r--r-- | include/field_fadetransition.h | 2 | ||||
| -rw-r--r-- | include/menu.h | 4 | ||||
| -rw-r--r-- | include/overworld.h | 2 | ||||
| -rw-r--r-- | include/pokeblock.h | 2 | ||||
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | include/roamer.h | 4 | ||||
| -rw-r--r-- | include/wild_encounter.h | 2 |
10 files changed, 16 insertions, 11 deletions
diff --git a/include/choose_party.h b/include/choose_party.h index 1f7d48f59..9aacef27d 100644 --- a/include/choose_party.h +++ b/include/choose_party.h @@ -10,7 +10,7 @@ void HandleLinkMultiBattlePartyMenu(u8 taskId); void HandleDaycarePartyMenu(u8 taskId); void sub_8123138(u8 taskId); #if DEBUG -void debug_sub_81381B4(void); +void Debug_CopyLastThreePartyMonsToMultiPartnerParty(void); #endif #endif // GUARD_CHOOSE_PARTY_H diff --git a/include/debug.h b/include/debug.h index 2136dbfb8..469560b9e 100644 --- a/include/debug.h +++ b/include/debug.h @@ -14,4 +14,7 @@ void debug_nullsub_66(void); // sound_check_menu void CB2_StartSoundCheckMenu(void); +// nakamura_debug_menu +void NakaGenderTest(void); + #endif // GUARD_DEBUG_H diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h index 0772aacf6..e2e31bee9 100644 --- a/include/decoration_inventory.h +++ b/include/decoration_inventory.h @@ -4,12 +4,12 @@ void ClearDecorationInventories(void); s8 sub_8133F9C(u8); u8 sub_8133FE4(u8); -u8 IsThereStorageSpaceForDecoration(u8); +u8 GiveDecoration(u8); u8 sub_8134074(u8); s8 sub_81340A8(u8); u8 sub_8134194(u8); #if DEBUG -void debug_sub_814A3A8(void); +void Debug_GiveAllDecorations(void); #endif // DEBUG #endif // GUARD_DECORATION_INVENTORY_H diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index cd0cb6eab..64e922651 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -13,7 +13,7 @@ void sub_8080A3C(void); void sub_8080AC4(void); void mapldr_default(); void sub_8080B60(void); -void atk17_seteffectsecondary(void); +void sub_8080DEC(void); void sub_8080E28(void); void sub_8080E44(void); bool32 sub_8080E70(void); diff --git a/include/menu.h b/include/menu.h index 3295cd5c5..523037839 100644 --- a/include/menu.h +++ b/include/menu.h @@ -4,10 +4,12 @@ #include "task.h" #include "text.h" +typedef bool8 (*MenuFunc)(); + struct MenuAction { const u8 *text; - u8 (*func)(); + MenuFunc func; }; struct MenuAction2 diff --git a/include/overworld.h b/include/overworld.h index dc393cc63..b18027933 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -138,7 +138,7 @@ void c2_exit_to_overworld_2_switch(void); void c2_exit_to_overworld_2_local(void); void c2_exit_to_overworld_2_link(void); // sub_805465C -void sub_805469C(void); +void c2_exit_to_overworld_1_sub_8080DEC(void); // sub_80546B8 void c2_exit_to_overworld_1_continue_scripts_restart_music(void); void sub_80546F0(void); diff --git a/include/pokeblock.h b/include/pokeblock.h index a606a32ad..f674666ff 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -42,7 +42,7 @@ s16 PokeblockGetGain(u8, const struct Pokeblock *); u8 sub_810CB68(u8, u8*); void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest); void CB2_PreparePokeblockFeedScene(void); -bool8 sub_810CA34(const struct Pokeblock *); +bool8 GivePokeblock(const struct Pokeblock *); #include "main.h" diff --git a/include/pokemon.h b/include/pokemon.h index c827e3cd5..842833542 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -632,7 +632,7 @@ void BoxMonRestorePP(struct BoxPokemon *); bool8 HealStatusConditions(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId); #if DEBUG -void debug_sub_803F55C(struct Pokemon *); +void Nakamura_NakaGenderTest_RecalcStats(struct Pokemon *); #endif // DEBUG #endif // GUARD_POKEMON_H diff --git a/include/roamer.h b/include/roamer.h index c91742d44..6f0813eb8 100644 --- a/include/roamer.h +++ b/include/roamer.h @@ -11,8 +11,8 @@ void UpdateRoamerHPStatus(struct Pokemon *mon); void SetRoamerInactive(void); #if DEBUG -void debug_sub_814A714(void); -void debug_sub_814A73C(u8 *); +void Debug_CreateRoamer(void); +void Debug_GetRoamerLocation(u8 *); #endif // DEBUG #endif // GUARD_ROAMER_H diff --git a/include/wild_encounter.h b/include/wild_encounter.h index 2846c12f5..41ca31835 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -36,7 +36,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon); u16 GetLocalWaterMon(void); bool8 UpdateRepelCounter(void); #if DEBUG -u16 debug_sub_8092344(u8 arg0); +u16 FeebasDebug_GetTrueNumberOfWaterTilesInMapThird(u8 arg0); void FeebasSeedRng(u16 seed); u16 FeebasRandom(void); #endif // DEBUG |