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 /data | |
| parent | ac6dbf731b280ccd806f58e0558bfd32050a0cb0 (diff) | |
Name massage step counter
Diffstat (limited to 'data')
| -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 |
3 files changed, 4 insertions, 4 deletions
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 |