diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-21 12:30:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-21 12:30:57 -0400 |
| commit | 629b9268e16ad3180dd32554d9d78bd97296a849 (patch) | |
| tree | 59e319c45c27bc980efc76d0d6cefccda5b8cb9f | |
| parent | ac6dbf731b280ccd806f58e0558bfd32050a0cb0 (diff) | |
Name massage step counter
| -rw-r--r-- | asm/field_specials.s | 6 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/maps/PalletTown_GarysHouse/scripts.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index 85baed06e..cef042cf1 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4611,8 +4611,8 @@ _080CC940: .4byte 0x00004025 _080CC944: .4byte 0x000001f3 thumb_func_end sub_80CC918 - thumb_func_start sub_80CC948 -sub_80CC948: @ 80CC948 + thumb_func_start Special_DaisyMassageServices +Special_DaisyMassageServices: @ 80CC948 push {lr} ldr r0, _080CC968 @ =gSpecialVar_0x8004 ldrh r1, [r0] @@ -4631,7 +4631,7 @@ sub_80CC948: @ 80CC948 _080CC968: .4byte gSpecialVar_0x8004 _080CC96C: .4byte gPlayerParty _080CC970: .4byte 0x00004025 - thumb_func_end sub_80CC948 + thumb_func_end Special_DaisyMassageServices thumb_func_start sub_80CC974 sub_80CC974: @ 80CC974 diff --git a/data/event_scripts.s b/data/event_scripts.s index 3052d5933..4f4603505 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1541,7 +1541,7 @@ EventScript_ResetAllMapFlags:: @ 81A6481 setflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL setflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS - setvar VAR_0x4025, 500 + setvar VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 end EventScript_1A651A:: @ 81A651A diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 9693bebf4..5984c6e87 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -49,7 +49,7 @@ EventScript_168DB9:: @ 8168DB9 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_0x4025, 500 + compare_var_to_value VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if lt, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 @@ -69,7 +69,7 @@ EventScript_168DB9:: @ 8168DB9 fadescreen 1 playfanfare MUS_ME_ASA waitfanfare - special sub_80CC948 + special Special_DaisyMassageServices fadescreen 0 special TV_CopyNicknameToStringVar1AndEnsureTerminated msgbox gUnknown_818D8FE diff --git a/data/specials.inc b/data/specials.inc index 6bfea0583..25ae2a961 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -416,7 +416,7 @@ gSpecials:: @ 815FD60 def_special sub_815D9E8 def_special sub_814B504 def_special sub_80CC8CC - def_special sub_80CC948 + def_special Special_DaisyMassageServices def_special HelpSystem_Disable def_special HelpSystem_Enable def_special sub_810B82C diff --git a/include/constants/vars.h b/include/constants/vars.h index 5b551db0d..50ffa9681 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -40,7 +40,7 @@ #define VAR_ICE_STEP_COUNT 0x4022 #define VAR_RENEWABLE_ITEM_STEP_COUNTER 0x4023 #define VAR_ALTERING_CAVE_WILD_SET 0x4024 -#define VAR_0x4025 0x4025 +#define VAR_MASSAGE_COOLDOWN_STEP_COUNTER 0x4025 #define VAR_0x4026 0x4026 #define VAR_0x4027 0x4027 #define VAR_0x4028 0x4028 |