diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 10 | ||||
| -rw-r--r-- | include/vars.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 88c2f6d2f..1f32d50ec 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -245,7 +245,7 @@ void HideMapNamePopup(); // asm/item_menu.o void sub_80A3684(void); -void ClearItems(void); +void ClearBag(void); void sub_80A53F8(void); void sub_80A5B40(void); void sub_80A68CC(); @@ -353,7 +353,7 @@ u8 *CopyLocationName(u8 *dest, u8 location); void PlaySlotMachine(u8, void *); // asm/pokeblock.o -void sub_810C994(void); +void ClearPokeblocks(void); void sub_810CA6C(s32); s16 sub_810CAE4(u8, struct Pokeblock *); @@ -365,8 +365,8 @@ u8 IsMirageIslandPresent(void); // asm/field_specials.o void ResetCyclingRoadChallengeData(void); -bool32 sub_810D9B0(u16); -u8 sub_810D9EC(s8 *, s8 *, s16 *, s16 *); +bool32 CountSSTidalStep(u16); +u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); void ScriptAddElevatorMenuItem(u8, u8, u8, u8); void ScriptShowElevatorMenu(void); u8 GetLeadMonIndex(void); @@ -410,7 +410,7 @@ u8 sub_8128124(u8 id); void sub_8132670(void); // asm/decoration_inventory.o -void sub_8133F80(void); +void ClearDecorationInventories(void); u8 sub_8133FE4(u8); u8 IsThereStorageSpaceForDecoration(u8); u8 sub_8134074(u8); diff --git a/include/vars.h b/include/vars.h index 5477ba98a..55df0a5e3 100644 --- a/include/vars.h +++ b/include/vars.h @@ -3,7 +3,7 @@ #define VAR_RECYCLE_GOODS 0x4020 #define VAR_REPEL_STEP_COUNT 0x4021 - +#define VAR_ICE_STEP_COUNT 0x4022 #define VAR_FIRST_POKE 0x4023 #define VAR_MIRAGE_RND_H 0x4024 #define VAR_MIRAGE_RND_L 0x4025 @@ -18,9 +18,9 @@ #define VAR_POKELOT_PRIZE 0x4045 #define VAR_NATIONAL_DEX 0x4046 #define VAR_SHROOMISH_SIZE_RECORD 0x4047 - +#define VAR_ASH_GATHER_COUNT 0x4048 #define VAR_BIRCH_STATE 0x4049 - +#define VAR_CRUISE_STEP_COUNT 0x404A #define VAR_POKELOT_RND1 0x404B #define VAR_POKELOT_RND2 0x404C |