Use more LOCALID constants

This commit is contained in:
GriffinR
2021-02-10 20:20:15 -05:00
parent a34c9d09b6
commit 515dde69af
50 changed files with 372 additions and 231 deletions
@@ -1,5 +1,8 @@
.equ SPOKE_TO_WOMAN_LAST, FLAG_TEMP_2
.equ SPOKE_TO_FAT_MAN_LAST, FLAG_TEMP_3
.set LOCALID_WOMAN, 5
.set LOCALID_FAT_MAN, 6
.set SPOKE_TO_WOMAN_LAST, FLAG_TEMP_2
.set SPOKE_TO_FAT_MAN_LAST, FLAG_TEMP_3
VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E
.byte 0
@@ -56,7 +59,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: @ 816B528
goto_if_set SPOKE_TO_FAT_MAN_LAST, VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan
msgbox VermilionCity_PokemonFanClub_Text_AdoreMySeel
closemessage
applymovement 5, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
waitmovement 0
setflag SPOKE_TO_WOMAN_LAST
release
@@ -65,7 +68,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: @ 816B528
VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan:: @ 816B54B
msgbox VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive
closemessage
applymovement 5, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
waitmovement 0
clearflag SPOKE_TO_FAT_MAN_LAST
release
@@ -77,7 +80,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: @ 816B563
goto_if_set SPOKE_TO_WOMAN_LAST, VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman
msgbox VermilionCity_PokemonFanClub_Text_AdmirePikachusTail
closemessage
applymovement 6, Movement_FaceOriginalDirection
applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
waitmovement 0
setflag SPOKE_TO_FAT_MAN_LAST
release
@@ -86,7 +89,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: @ 816B563
VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman:: @ 816B586
msgbox VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute
closemessage
applymovement 6, Movement_FaceOriginalDirection
applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
waitmovement 0
clearflag SPOKE_TO_WOMAN_LAST
release