Name massage step counter

This commit is contained in:
PikalaxALT
2019-10-21 12:30:57 -04:00
parent ac6dbf731b
commit 629b9268e1
5 changed files with 8 additions and 8 deletions
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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