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_BrendansHouse_2F/scripts.inc
+39 -39
View File
@@ -1,11 +1,11 @@
.set LOCALID_RIVAL, 1
LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3
LittlerootTown_BrendansHouse_2F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_OnWarp
.byte 0
LittlerootTown_BrendansHouse_2F_OnTransition: @ 81F83EE
LittlerootTown_BrendansHouse_2F_OnTransition:
compare VAR_LITTLEROOT_RIVAL_STATE, 2
call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan
compare VAR_LITTLEROOT_RIVAL_STATE, 3
@@ -16,13 +16,13 @@ LittlerootTown_BrendansHouse_2F_OnTransition: @ 81F83EE
setvar VAR_SECRET_BASE_INITIALIZED, 0
end
LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos:: @ 81F841A
LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos::
goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos
compare VAR_BIRCH_LAB_STATE, 2
goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_Ret
goto LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos
LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos:: @ 81F8433
LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos::
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_Ret
@@ -32,30 +32,30 @@ LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos:: @ 81F8433
setobjectmovementtype LOCALID_RIVAL, MOVEMENT_TYPE_FACE_UP
return
LittlerootTown_BrendansHouse_2F_EventScript_Ret:: @ 81F8456
LittlerootTown_BrendansHouse_2F_EventScript_Ret::
return
LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan:: @ 81F8457
LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan::
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan
return
LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan:: @ 81F8464
LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan::
setvar VAR_LITTLEROOT_RIVAL_STATE, 2
return
LittlerootTown_BrendansHouse_2F_OnWarp: @ 81F846A
LittlerootTown_BrendansHouse_2F_OnWarp:
map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor
.2byte 0
LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor:: @ 81F8474
LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor::
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq SecretBase_EventScript_InitDecorations
end
LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall:: @ 81F8481
LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall::
lockall
compare VAR_LITTLEROOT_RIVAL_STATE, 2
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan
@@ -63,7 +63,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall:: @ 81F8481
releaseall
end
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan::
delay 10
addobject LOCALID_RIVAL
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters
@@ -92,7 +92,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497
releaseall
end
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth::
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
@@ -104,7 +104,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507
waitmovement 0
return
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth::
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
@@ -116,7 +116,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536
waitmovement 0
return
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest::
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
@@ -128,7 +128,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565
waitmovement 0
return
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast::
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -139,13 +139,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594
waitmovement 0
return
LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters: @ 81F85BC
LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters:
walk_down
walk_down
walk_in_place_fastest_left
step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth: @ 81F85C0
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth:
walk_left
walk_left
walk_down
@@ -153,7 +153,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth: @ 81F85C0
walk_left
step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth: @ 81F85C6
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth:
walk_up
walk_up
walk_up
@@ -164,7 +164,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth: @ 81F85C6
walk_in_place_fastest_up
step_end
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth: @ 81F85CF
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth:
delay_16
walk_in_place_fastest_up
delay_16
@@ -174,13 +174,13 @@ LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth: @ 81F85CF
walk_in_place_fastest_left
step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth: @ 81F85D7
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth:
walk_left
walk_left
walk_left
step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth: @ 81F85DB
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth:
walk_up
walk_left
walk_left
@@ -189,7 +189,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth: @ 81F85DB
walk_in_place_fastest_up
step_end
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth: @ 81F85E2
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth:
delay_16
walk_in_place_fastest_up
delay_16
@@ -197,14 +197,14 @@ LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth: @ 81F85E2
walk_in_place_fastest_left
step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest: @ 81F85E8
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest:
walk_left
walk_left
walk_down
walk_in_place_fastest_left
step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest: @ 81F85ED
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest:
walk_up
walk_up
walk_left
@@ -215,7 +215,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest: @ 81F85ED
walk_in_place_fastest_up
step_end
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest: @ 81F85F6
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest:
delay_8
delay_16
walk_in_place_fastest_up
@@ -224,7 +224,7 @@ LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest: @ 81F85F6
walk_in_place_fastest_left
step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast: @ 81F85FD
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast:
walk_left
walk_left
walk_left
@@ -233,7 +233,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast: @ 81F85FD
walk_in_place_fastest_down
step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast: @ 81F8604
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast:
walk_up
walk_left
walk_left
@@ -241,13 +241,13 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast: @ 81F8604
step_end
@ Unused, the player is already facing this direction so its unneeded
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast: @ 81F8609
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast:
delay_16
delay_16
walk_in_place_fastest_left
step_end
LittlerootTown_BrendansHouse_2F_EventScript_PC:: @ 81F860D
LittlerootTown_BrendansHouse_2F_EventScript_PC::
lockall
checkplayergender
compare VAR_RESULT, MALE
@@ -256,7 +256,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_PC:: @ 81F860D
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC
end
LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC:: @ 81F8626
LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC::
setvar VAR_0x8004, 1
special DoPCTurnOnEffect
playse SE_PC_ON
@@ -266,31 +266,31 @@ LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC:: @ 81F8626
releaseall
end
LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F863F
LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC::
setvar VAR_0x8004, 1
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall
end
LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC:: @ 81F864C
LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC::
msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT
releaseall
end
PlayersHouse_2F_EventScript_Notebook:: @ 81F8656
PlayersHouse_2F_EventScript_Notebook::
msgbox PlayersHouse_2F_Text_Notebook, MSGBOX_SIGN
end
PlayersHouse_2F_EventScript_GameCube:: @ 81F865F
PlayersHouse_2F_EventScript_GameCube::
msgbox PlayersHouse_2F_Text_ItsAGameCube, MSGBOX_SIGN
end
PlayersHouse_2F_Text_ClockIsStopped: @ 81F8668
PlayersHouse_2F_Text_ClockIsStopped:
.string "The clock is stopped…\p"
.string "Better set it and start it!$"
PlayersHouse_2F_Text_HowDoYouLikeYourRoom: @ 81F869A
PlayersHouse_2F_Text_HowDoYouLikeYourRoom:
.string "MOM: {PLAYER}, how do you like your\n"
.string "new room?\p"
.string "Good! Everything's put away neatly!\p"
@@ -300,7 +300,7 @@ PlayersHouse_2F_Text_HowDoYouLikeYourRoom: @ 81F869A
.string "Oh, you should make sure that\n"
.string "everything's all there on your desk.$"
PlayersHouse_2F_Text_Notebook: @ 81F877F
PlayersHouse_2F_Text_Notebook:
.string "{PLAYER} flipped open the notebook.\p"
.string "ADVENTURE RULE NO. 1\n"
.string "Open the MENU with START.\p"
@@ -308,11 +308,11 @@ PlayersHouse_2F_Text_Notebook: @ 81F877F
.string "Record your progress with SAVE.\p"
.string "The remaining pages are blank…$"
Common_Text_LookCloserAtMap: @ 81F8820
Common_Text_LookCloserAtMap:
.string "{PLAYER} took a closer look at the\n"
.string "HOENN region map.$"
PlayersHouse_2F_Text_ItsAGameCube: @ 81F884F
PlayersHouse_2F_Text_ItsAGameCube:
.string "It's a Nintendo GameCube.\p"
.string "A Game Boy Advance is connected to\n"
.string "serve as the Controller.$"