dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2021-07-20 15:18:31 -04:00
parent bea170e8e9
commit 06351bf63c
576 changed files with 17798 additions and 17798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+49 -49
View File
@@ -1,11 +1,11 @@
.set LOCALID_RIVAL, 1
LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
LittlerootTown_MaysHouse_2F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_OnWarp
.byte 0
LittlerootTown_MaysHouse_2F_OnTransition: @ 81F92A1
LittlerootTown_MaysHouse_2F_OnTransition:
compare VAR_LITTLEROOT_RIVAL_STATE, 2
call_if_lt LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay
compare VAR_LITTLEROOT_RIVAL_STATE, 3
@@ -16,13 +16,13 @@ LittlerootTown_MaysHouse_2F_OnTransition: @ 81F92A1
setvar VAR_SECRET_BASE_INITIALIZED, 0
end
LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos:: @ 81F92CD
LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos::
goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos
compare VAR_BIRCH_LAB_STATE, 2
goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret
goto LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos
LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos:: @ 81F92E6
LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos::
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_Ret
@@ -32,30 +32,30 @@ LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos:: @ 81F92E6
setobjectmovementtype LOCALID_RIVAL, MOVEMENT_TYPE_FACE_UP
return
LittlerootTown_MaysHouse_2F_EventScript_Ret:: @ 81F9309
LittlerootTown_MaysHouse_2F_EventScript_Ret::
return
LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay:: @ 81F930A
LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay::
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay
return
LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay:: @ 81F9317
LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay::
setvar VAR_LITTLEROOT_RIVAL_STATE, 2
return
LittlerootTown_MaysHouse_2F_OnWarp: @ 81F931D
LittlerootTown_MaysHouse_2F_OnWarp:
map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor
.2byte 0
LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor:: @ 81F9327
LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor::
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq SecretBase_EventScript_InitDecorations
end
LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: @ 81F9334
LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall::
lockall
compare VAR_LITTLEROOT_RIVAL_STATE, 2
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMay
@@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: @ 81F9334
releaseall
end
LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A
LittlerootTown_MaysHouse_2F_EventScript_MeetMay::
delay 10
addobject LOCALID_RIVAL
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayEnters
@@ -92,7 +92,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A
releaseall
end
LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA
LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -104,7 +104,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA
waitmovement 0
return
LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9
LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -116,7 +116,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9
waitmovement 0
return
LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418
LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -127,7 +127,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418
waitmovement 0
return
LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440
LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -139,13 +139,13 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440
waitmovement 0
return
LittlerootTown_MaysHouse_2F_Movement_MayEnters: @ 81F946F
LittlerootTown_MaysHouse_2F_Movement_MayEnters:
walk_down
walk_down
walk_in_place_fastest_right
step_end
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth: @ 81F9473
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth:
walk_right
walk_right
walk_down
@@ -153,7 +153,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth: @ 81F9473
walk_right
step_end
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth: @ 81F9479
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth:
walk_up
walk_up
walk_up
@@ -165,7 +165,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth: @ 81F9479
walk_in_place_fastest_up
step_end
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth: @ 81F9483
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth:
delay_16
walk_in_place_fastest_up
delay_16
@@ -175,13 +175,13 @@ LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth: @ 81F9483
walk_in_place_fastest_right
step_end
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth: @ 81F948B
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth:
walk_right
walk_right
walk_right
step_end
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth: @ 81F948F
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth:
walk_up
walk_in_place_fastest_right
walk_right
@@ -191,7 +191,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth: @ 81F948F
walk_in_place_fastest_up
step_end
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth: @ 81F9497
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth:
delay_16
walk_in_place_fastest_up
delay_16
@@ -199,7 +199,7 @@ LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth: @ 81F9497
walk_in_place_fastest_right
step_end
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest: @ 81F949D
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest:
walk_right
walk_right
walk_right
@@ -208,7 +208,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest: @ 81F949D
walk_in_place_fastest_down
step_end
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest: @ 81F94A4
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest:
walk_up
walk_right
walk_right
@@ -216,20 +216,20 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest: @ 81F94A4
step_end
@ Unused, the player is already facing this direction so its unneeded
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest: @ 81F94A9
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest:
delay_16
delay_16
walk_in_place_fastest_right
step_end
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast: @ 81F94AD
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast:
walk_right
walk_right
walk_down
walk_in_place_fastest_right
step_end
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast: @ 81F94B2
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast:
walk_up
walk_up
walk_right
@@ -240,7 +240,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast: @ 81F94B2
walk_in_place_fastest_up
step_end
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast: @ 81F94BB
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast:
delay_16
walk_in_place_fastest_up
delay_16
@@ -248,7 +248,7 @@ LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast: @ 81F94BB
walk_in_place_fastest_right
step_end
RivalsHouse_2F_EventScript_Rival:: @ 81F94C1
RivalsHouse_2F_EventScript_Rival::
lockall
goto_if_set FLAG_MET_RIVAL_LILYCOVE, RivalsHouse_2F_EventScript_RivalPostLilycove
checkplayergender
@@ -258,17 +258,17 @@ RivalsHouse_2F_EventScript_Rival:: @ 81F94C1
goto_if_eq RivalsHouse_2F_EventScript_Brendan
end
RivalsHouse_2F_EventScript_May:: @ 81F94E3
RivalsHouse_2F_EventScript_May::
msgbox RivalsHouse_2F_Text_MayGettingReady, MSGBOX_DEFAULT
releaseall
end
RivalsHouse_2F_EventScript_Brendan:: @ 81F94ED
RivalsHouse_2F_EventScript_Brendan::
msgbox RivalsHouse_2F_Text_BrendanGettingReady, MSGBOX_DEFAULT
releaseall
end
RivalsHouse_2F_EventScript_RivalPostLilycove:: @ 81F94F7
RivalsHouse_2F_EventScript_RivalPostLilycove::
applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
waitmovement 0
checkplayergender
@@ -280,25 +280,25 @@ RivalsHouse_2F_EventScript_RivalPostLilycove:: @ 81F94F7
releaseall
end
RivalsHouse_2F_EventScript_MayPostLilycove:: @ 81F951D
RivalsHouse_2F_EventScript_MayPostLilycove::
goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_MayWhereShouldIGoNext
msgbox RivalsHouse_2F_Text_MayJustCheckingMyPokedex, MSGBOX_DEFAULT
return
RivalsHouse_2F_EventScript_BrendanPostLilycove:: @ 81F952F
RivalsHouse_2F_EventScript_BrendanPostLilycove::
goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext
msgbox RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex, MSGBOX_DEFAULT
return
RivalsHouse_2F_EventScript_MayWhereShouldIGoNext:: @ 81F9541
RivalsHouse_2F_EventScript_MayWhereShouldIGoNext::
msgbox RivalsHouse_2F_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT
return
RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext:: @ 81F954A
RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext::
msgbox RivalsHouse_2F_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT
return
LittlerootTown_MaysHouse_2F_EventScript_PC:: @ 81F9553
LittlerootTown_MaysHouse_2F_EventScript_PC::
lockall
checkplayergender
compare VAR_RESULT, MALE
@@ -307,12 +307,12 @@ LittlerootTown_MaysHouse_2F_EventScript_PC:: @ 81F9553
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC
end
LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC:: @ 81F956C
LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC::
msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT
releaseall
end
LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC:: @ 81F9576
LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC::
setvar VAR_0x8004, 2
special DoPCTurnOnEffect
playse SE_PC_ON
@@ -322,14 +322,14 @@ LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC:: @ 81F9576
releaseall
end
LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F958F
LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC::
setvar VAR_0x8004, 2
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall
end
RivalsHouse_2F_Text_MayWhoAreYou: @ 81F959C
RivalsHouse_2F_Text_MayWhoAreYou:
.string "Huh?\n"
.string "Who… Who are you?\p"
.string "… … … … … … … …\n"
@@ -353,11 +353,11 @@ RivalsHouse_2F_Text_MayWhoAreYou: @ 81F959C
.string "some wild POKéMON!\p"
.string "{PLAYER}{KUN}, I'll catch you later!$"
RivalsHouse_2F_Text_MayGettingReady: @ 81F978A
RivalsHouse_2F_Text_MayGettingReady:
.string "POKéMON fully restored!\n"
.string "Items ready, and…$"
RivalsHouse_2F_Text_BrendanWhoAreYou: @ 81F97B4
RivalsHouse_2F_Text_BrendanWhoAreYou:
.string "Hey!\n"
.string "You…\p"
.string "Who are you?\p"
@@ -377,15 +377,15 @@ RivalsHouse_2F_Text_BrendanWhoAreYou: @ 81F97B4
.string "some wild POKéMON.\p"
.string "Some other time, okay?$"
RivalsHouse_2F_Text_BrendanGettingReady: @ 81F9962
RivalsHouse_2F_Text_BrendanGettingReady:
.string "POKéMON fully restored…\n"
.string "Items all packed, and…$"
RivalsHouse_2F_Text_ItsRivalsPokeBall: @ 81F9991
RivalsHouse_2F_Text_ItsRivalsPokeBall:
.string "It's {RIVAL}'s POKé BALL!\p"
.string "Better leave it right where it is.$"
RivalsHouse_2F_Text_MayJustCheckingMyPokedex: @ 81F99C9
RivalsHouse_2F_Text_MayJustCheckingMyPokedex:
.string "MAY: {PLAYER}{KUN}!\p"
.string "I was just checking my POKéDEX.\p"
.string "There's still a lot of POKéMON that\n"
@@ -395,13 +395,13 @@ RivalsHouse_2F_Text_MayJustCheckingMyPokedex: @ 81F99C9
.string "I wonder where I should go catch\n"
.string "some POKéMON next?$"
RivalsHouse_2F_Text_MayWhereShouldIGoNext: @ 81F9A9E
RivalsHouse_2F_Text_MayWhereShouldIGoNext:
.string "MAY: I wonder where I should go catch\n"
.string "some POKéMON next?\p"
.string "Wouldn't it be funny if we ran into each\n"
.string "other, {PLAYER}{KUN}?$"
RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex: @ 81F9B0D
RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex:
.string "BRENDAN: Hey, it's {PLAYER}.\p"
.string "I was just checking out my POKéDEX.\p"
.string "There are still many POKéMON that\n"
@@ -410,7 +410,7 @@ RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex: @ 81F9B0D
.string "Checking this POKéDEX out gives me\n"
.string "the urge to hit the road again.$"
RivalsHouse_2F_Text_BrendanWhereShouldIGoNext: @ 81F9BE7
RivalsHouse_2F_Text_BrendanWhereShouldIGoNext:
.string "BRENDAN: I'm having a hard time deciding\n"
.string "where I should catch POKéMON next.\p"
.string "Hey, {PLAYER}, if I see you while I'm out\n"