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_1F/scripts.inc
+50 -50
View File
@@ -2,34 +2,34 @@
.set LOCALID_RIVAL_MOM, 4
.set LOCALID_RIVAL, 7
LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
LittlerootTown_MaysHouse_1F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_OnFrame
.byte 0
LittlerootTown_MaysHouse_1F_OnLoad: @ 81F88B5
LittlerootTown_MaysHouse_1F_OnLoad:
compare VAR_LITTLEROOT_INTRO_STATE, 6
call_if_lt LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes
call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual
end
LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes:: @ 81F88CA
LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes::
setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
return
LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual:: @ 81F88DD
LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual::
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual
return
LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F88EA
LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual::
setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
return
LittlerootTown_MaysHouse_1F_OnTransition: @ 81F88F4
LittlerootTown_MaysHouse_1F_OnTransition:
compare VAR_LITTLEROOT_INTRO_STATE, 3
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor
compare VAR_LITTLEROOT_INTRO_STATE, 5
@@ -38,23 +38,23 @@ LittlerootTown_MaysHouse_1F_OnTransition: @ 81F88F4
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV
end
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs:: @ 81F8916
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs::
setobjectxyperm LOCALID_MOM, 2, 4
setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
return
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV:: @ 81F8922
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV::
setobjectxyperm LOCALID_MOM, 6, 5
setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
return
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor:: @ 81F892E
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor::
setobjectxyperm LOCALID_MOM, 1, 8
setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
return
@ Many of the below scripts have no gender check because they assume youre in the correct house
LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A
LittlerootTown_MaysHouse_1F_OnFrame:
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport
@@ -62,7 +62,7 @@ LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A
map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV
.2byte 0
LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964
LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock::
lockall
msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT
closemessage
@@ -74,25 +74,25 @@ LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964
releaseall
end
LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs: @ 81F898A
LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs:
walk_up
step_end
LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F898C
LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn::
lockall
setvar VAR_0x8004, LOCALID_MOM
setvar VAR_0x8005, FEMALE
goto PlayersHouse_1F_EventScript_EnterHouseMovingIn
end
LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport:: @ 81F899D
LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport::
lockall
setvar VAR_0x8004, FEMALE
setvar VAR_0x8005, LOCALID_MOM
goto PlayersHouse_1F_EventScript_PetalburgGymReportFemale
end
LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE
LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor::
lockall
playse SE_PIN
applymovement LOCALID_RIVAL_MOM, Common_Movement_ExclamationMark
@@ -109,7 +109,7 @@ LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE
releaseall
end
LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach: @ 81F89EC
LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach:
walk_down
walk_left
walk_left
@@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach: @ 81F89EC
walk_left
step_end
RivalsHouse_1F_EventScript_RivalMom:: @ 81F89F3
RivalsHouse_1F_EventScript_RivalMom::
lock
faceplayer
goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, RivalsHouse_1F_EventScript_GoHomeEverySoOften
@@ -130,22 +130,22 @@ RivalsHouse_1F_EventScript_RivalMom:: @ 81F89F3
release
end
RivalsHouse_1F_EventScript_RivalTooBusy:: @ 81F8A1F
RivalsHouse_1F_EventScript_RivalTooBusy::
msgbox RivalsHouse_1F_Text_TooBusyToNoticeVisit, MSGBOX_DEFAULT
release
end
RivalsHouse_1F_EventScript_RivalIsOnRoute103:: @ 81F8A29
RivalsHouse_1F_EventScript_RivalIsOnRoute103::
msgbox RivalsHouse_1F_Text_WentOutToRoute103, MSGBOX_DEFAULT
release
end
RivalsHouse_1F_EventScript_GoHomeEverySoOften:: @ 81F8A33
RivalsHouse_1F_EventScript_GoHomeEverySoOften::
msgbox RivalsHouse_1F_Text_ShouldGoHomeEverySoOften, MSGBOX_DEFAULT
release
end
RivalsHouse_1F_EventScript_RivalSibling:: @ 81F8A3D
RivalsHouse_1F_EventScript_RivalSibling::
lock
faceplayer
special GetPlayerBigGuyGirlString
@@ -153,7 +153,7 @@ RivalsHouse_1F_EventScript_RivalSibling:: @ 81F8A3D
release
end
LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 81F8A4C
LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom::
lockall
setvar VAR_0x8004, LOCALID_MOM
setvar VAR_0x8005, FEMALE
@@ -162,25 +162,25 @@ LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 81F8A4C
goto PlayersHouse_1F_EventScript_MomGoSeeRoom
end
LittlerootTown_MaysHouse_1F_EventScript_MeetRival0:: @ 81F8A67
LittlerootTown_MaysHouse_1F_EventScript_MeetRival0::
lockall
setvar VAR_0x8008, 0
goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
end
LittlerootTown_MaysHouse_1F_EventScript_MeetRival1:: @ 81F8A73
LittlerootTown_MaysHouse_1F_EventScript_MeetRival1::
lockall
setvar VAR_0x8008, 1
goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
end
LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F
LittlerootTown_MaysHouse_1F_EventScript_MeetRival2::
lockall
setvar VAR_0x8008, 2
goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
end
LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
LittlerootTown_MaysHouse_1F_EventScript_MeetRival::
playse SE_EXIT
delay 10
addobject LOCALID_RIVAL
@@ -220,27 +220,27 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
releaseall
end
LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: @ 81F8B2A
LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0:: @ 81F8B35
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1:: @ 81F8B40
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2:: @ 81F8B4B
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2
waitmovement 0
return
LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: @ 81F8B56
LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0:
walk_in_place_fastest_left
walk_left
walk_in_place_fastest_up
@@ -250,13 +250,13 @@ LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: @ 81F8B56
walk_up
step_end
LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1: @ 81F8B5E
LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1:
walk_up
walk_up
walk_up
step_end
LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62
LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2:
walk_in_place_fastest_right
walk_right
walk_in_place_fastest_up
@@ -266,31 +266,31 @@ LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62
walk_up
step_end
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0:: @ 81F8B6A
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0::
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1:: @ 81F8B7C
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1::
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2:: @ 81F8B8E
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2::
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2
waitmovement 0
return
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0: @ 81F8BA0
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0:
delay_16
delay_8
walk_in_place_fastest_right
step_end
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1: @ 81F8BA4
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1:
delay_16
delay_8
walk_in_place_fastest_right
@@ -299,13 +299,13 @@ LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1: @ 81F8BA4
walk_in_place_fastest_up
step_end
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2: @ 81F8BAB
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2:
delay_16
delay_8
walk_in_place_fastest_left
step_end
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0: @ 81F8BAF
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0:
walk_in_place_fastest_right
walk_right
walk_in_place_fastest_up
@@ -313,7 +313,7 @@ LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0: @ 81F8BAF
walk_up
step_end
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1: @ 81F8BB5
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1:
walk_in_place_fastest_right
walk_right
walk_in_place_fastest_up
@@ -325,7 +325,7 @@ LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1: @ 81F8BB5
walk_up
step_end
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2: @ 81F8BBF
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2:
walk_in_place_fastest_left
walk_left
walk_in_place_fastest_up
@@ -333,7 +333,7 @@ LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2: @ 81F8BBF
walk_up
step_end
RivalsHouse_1F_Text_OhYoureTheNewNeighbor: @ 81F8BC5
RivalsHouse_1F_Text_OhYoureTheNewNeighbor:
.string "Oh, hello. And you are?\p"
.string "… … … … … … … … …\n"
.string "… … … … … … … … …\p"
@@ -345,26 +345,26 @@ RivalsHouse_1F_Text_OhYoureTheNewNeighbor: @ 81F8BC5
.string "a new friend.\p"
.string "Our {STR_VAR_1} is upstairs, I think.$"
RivalsHouse_1F_Text_LikeChildLikeFather: @ 81F8CA5
RivalsHouse_1F_Text_LikeChildLikeFather:
.string "Like child, like father.\p"
.string "My husband is as wild about POKéMON\n"
.string "as our child.\p"
.string "If he's not at his LAB, he's likely\n"
.string "scrabbling about in grassy places.$"
RivalsHouse_1F_Text_TooBusyToNoticeVisit: @ 81F8D37
RivalsHouse_1F_Text_TooBusyToNoticeVisit:
.string "That {RIVAL}!\p"
.string "I guess our child is too busy with\n"
.string "POKéMON to notice that you came\l"
.string "to visit, {PLAYER}{KUN}.$"
RivalsHouse_1F_Text_WentOutToRoute103: @ 81F8D93
RivalsHouse_1F_Text_WentOutToRoute103:
.string "Oh, {RIVAL} went out to ROUTE 103\n"
.string "just a little while ago.\p"
.string "Like father, like child.\n"
.string "{RIVAL} can't stay quietly at home.$"
RivalsHouse_1F_Text_ShouldGoHomeEverySoOften: @ 81F8E01
RivalsHouse_1F_Text_ShouldGoHomeEverySoOften:
.string "I think it's wonderful for people to\n"
.string "travel with POKéMON.\p"
.string "But you should go home every so often\n"
@@ -372,7 +372,7 @@ RivalsHouse_1F_Text_ShouldGoHomeEverySoOften: @ 81F8E01
.string "She might not say it, but I'm sure she\n"
.string "worries about you, {PLAYER}{KUN}.$"
RivalsHouse_1F_Text_MayWhoAreYou: @ 81F8EC6
RivalsHouse_1F_Text_MayWhoAreYou:
.string "Huh?\n"
.string "Who… Who are you?\p"
.string "… … … … … … … …\n"
@@ -396,7 +396,7 @@ RivalsHouse_1F_Text_MayWhoAreYou: @ 81F8EC6
.string "some wild POKéMON!\p"
.string "{PLAYER}{KUN}, I'll catch you later!$"
RivalsHouse_1F_Text_BrendanWhoAreYou: @ 81F90B4
RivalsHouse_1F_Text_BrendanWhoAreYou:
.string "Hey!\n"
.string "You…\p"
.string "Who are you?\p"
@@ -416,7 +416,7 @@ RivalsHouse_1F_Text_BrendanWhoAreYou: @ 81F90B4
.string "some wild POKéMON.\p"
.string "Some other time, okay?$"
RivalsHouse_1F_Text_DoYouHavePokemon: @ 81F9262
RivalsHouse_1F_Text_DoYouHavePokemon:
.string "Hi, neighbor!\p"
.string "Do you already have your\n"
.string "own POKéMON?$"