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/PetalburgCity/scripts.inc
+78 -78
View File
@@ -9,7 +9,7 @@ PetalburgCity_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame
.byte 0
PetalburgCity_OnTransition: @ 81DC2D7
PetalburgCity_OnTransition:
setflag FLAG_VISITED_PETALBURG_CITY
compare VAR_PETALBURG_CITY_STATE, 0
call_if_eq PetalburgCity_EventScript_MoveGymBoyToWestEntrance
@@ -21,25 +21,25 @@ PetalburgCity_OnTransition: @ 81DC2D7
call_if_eq PetalburgCity_EventScript_SetGymDoorsUnlocked
end
PetalburgCity_EventScript_MoveGymBoyToWestEntrance:: @ 81DC307
PetalburgCity_EventScript_MoveGymBoyToWestEntrance::
setobjectxyperm LOCALID_GYM_BOY, 5, 11
return
PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F
PetalburgCity_EventScript_DisableMapNameAndMusic::
setflag FLAG_HIDE_MAP_NAME_POPUP
savebgm MUS_FOLLOW_ME
return
PetalburgCity_EventScript_SetGymDoorsUnlocked:: @ 81DC316
PetalburgCity_EventScript_SetGymDoorsUnlocked::
setvar VAR_PETALBURG_GYM_STATE, 7
return
PetalburgCity_OnFrame: @ 81DC31C
PetalburgCity_OnFrame:
map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_WallyTutorial
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_WalkToWallyHouse
.2byte 0
PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
PetalburgCity_EventScript_WallyTutorial::
lockall
special SavePlayerParty
special PutZigzagoonInPlayerParty
@@ -65,7 +65,7 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
releaseall
end
PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
PetalburgCity_EventScript_WalkToWallyHouse::
lockall
setflag FLAG_HIDE_MAP_NAME_POPUP
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad
@@ -90,7 +90,7 @@ PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
releaseall
end
PetalburgCity_EventScript_Boy:: @ 81DC3E6
PetalburgCity_EventScript_Boy::
lock
faceplayer
msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT
@@ -100,11 +100,11 @@ PetalburgCity_EventScript_Boy:: @ 81DC3E6
release
end
PetalburgCity_EventScript_WallysMom:: @ 81DC3FD
PetalburgCity_EventScript_WallysMom::
msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC
end
PetalburgCity_Movement_WalkToWallyHousePlayer: @ 81DC406
PetalburgCity_Movement_WalkToWallyHousePlayer:
delay_8
walk_down
walk_down
@@ -124,12 +124,12 @@ PetalburgCity_Movement_WalkToWallyHousePlayer: @ 81DC406
walk_up
step_end
PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418
PetalburgCity_Movement_WalkInsideHousePlayer:
walk_up
walk_up
step_end
PetalburgCity_Movement_WalkToWallyHouseWallysDad: @ 81DC41B
PetalburgCity_Movement_WalkToWallyHouseWallysDad:
delay_8
walk_down
walk_down
@@ -149,12 +149,12 @@ PetalburgCity_Movement_WalkToWallyHouseWallysDad: @ 81DC41B
walk_up
step_end
PetalburgCity_Movement_WalkInsideHouseWallysDad: @ 81DC42D
PetalburgCity_Movement_WalkInsideHouseWallysDad:
walk_up
set_invisible
step_end
PetalburgCity_Movement_WallyTutorialPlayer: @ 81DC430
PetalburgCity_Movement_WallyTutorialPlayer:
delay_8
walk_down
walk_down
@@ -189,7 +189,7 @@ PetalburgCity_Movement_WallyTutorialPlayer: @ 81DC430
walk_in_place_fastest_right
step_end
PetalburgCity_Movement_WallyTutorialWally: @ 81DC451
PetalburgCity_Movement_WallyTutorialWally:
delay_8
walk_down
walk_down
@@ -228,47 +228,47 @@ PetalburgCity_Movement_WallyTutorialWally: @ 81DC451
walk_in_place_fastest_right
step_end
PetalburgCity_EventScript_GymSign:: @ 81DC476
PetalburgCity_EventScript_GymSign::
msgbox PetalburgCity_Text_GymSign, MSGBOX_SIGN
end
PetalburgCity_EventScript_CitySign:: @ 81DC47F
PetalburgCity_EventScript_CitySign::
msgbox PetalburgCity_Text_CitySign, MSGBOX_SIGN
end
PetalburgCity_EventScript_Gentleman:: @ 81DC488
PetalburgCity_EventScript_Gentleman::
msgbox PetalburgCity_Text_FullPartyExplanation, MSGBOX_NPC
end
PetalburgCity_EventScript_WallyHouseSign:: @ 81DC491
PetalburgCity_EventScript_WallyHouseSign::
msgbox PetalburgCity_Text_WallyHouseSign, MSGBOX_SIGN
end
PetalburgCity_EventScript_ShowGymToPlayer0:: @ 81DC49A
PetalburgCity_EventScript_ShowGymToPlayer0::
lockall
setvar VAR_0x8008, 0
goto PetalburgCity_EventScript_ShowGymToPlayer
end
PetalburgCity_EventScript_ShowGymToPlayer1:: @ 81DC4A6
PetalburgCity_EventScript_ShowGymToPlayer1::
lockall
setvar VAR_0x8008, 1
goto PetalburgCity_EventScript_ShowGymToPlayer
end
PetalburgCity_EventScript_ShowGymToPlayer2:: @ 81DC4B2
PetalburgCity_EventScript_ShowGymToPlayer2::
lockall
setvar VAR_0x8008, 2
goto PetalburgCity_EventScript_ShowGymToPlayer
end
PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE
PetalburgCity_EventScript_ShowGymToPlayer3::
lockall
setvar VAR_0x8008, 3
goto PetalburgCity_EventScript_ShowGymToPlayer
end
PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA
PetalburgCity_EventScript_ShowGymToPlayer::
applymovement LOCALID_GYM_BOY, Common_Movement_FacePlayer
waitmovement 0
playbgm MUS_FOLLOW_ME, FALSE
@@ -307,83 +307,83 @@ PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA
releaseall
end
PetalburgCity_EventScript_BoyApproachPlayer0:: @ 81DC57F
PetalburgCity_EventScript_BoyApproachPlayer0::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer0
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_EventScript_BoyApproachPlayer1:: @ 81DC594
PetalburgCity_EventScript_BoyApproachPlayer1::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer1
waitmovement 0
return
PetalburgCity_EventScript_BoyApproachPlayer2:: @ 81DC59F
PetalburgCity_EventScript_BoyApproachPlayer2::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer2
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_EventScript_BoyApproachPlayer3:: @ 81DC5B4
PetalburgCity_EventScript_BoyApproachPlayer3::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer3
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_EventScript_LeadPlayerToGym0:: @ 81DC5C9
PetalburgCity_EventScript_LeadPlayerToGym0::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym0
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0
waitmovement 0
return
PetalburgCity_EventScript_LeadPlayerToGym1:: @ 81DC5DB
PetalburgCity_EventScript_LeadPlayerToGym1::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym1
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1
waitmovement 0
return
PetalburgCity_EventScript_LeadPlayerToGym2:: @ 81DC5ED
PetalburgCity_EventScript_LeadPlayerToGym2::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym2
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2
waitmovement 0
return
PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
PetalburgCity_EventScript_LeadPlayerToGym3::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym3
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3
waitmovement 0
return
@ Unused
PetalburgCity_Movement_Delay48:: @ 81DC611
PetalburgCity_Movement_Delay48::
delay_16
delay_16
delay_16
step_end
PetalburgCity_Movement_BoyApproachPlayer0: @ 81DC615
PetalburgCity_Movement_BoyApproachPlayer0:
walk_right
walk_right
walk_right
walk_in_place_fastest_up
step_end
PetalburgCity_Movement_BoyApproachPlayer1: @ 81DC61A
PetalburgCity_Movement_BoyApproachPlayer1:
walk_right
walk_right
step_end
PetalburgCity_Movement_BoyApproachPlayer2: @ 81DC61D
PetalburgCity_Movement_BoyApproachPlayer2:
walk_right
walk_right
walk_right
walk_in_place_fastest_down
step_end
PetalburgCity_Movement_BoyApproachPlayer3: @ 81DC622
PetalburgCity_Movement_BoyApproachPlayer3:
walk_down
walk_right
walk_right
@@ -391,7 +391,7 @@ PetalburgCity_Movement_BoyApproachPlayer3: @ 81DC622
walk_in_place_fastest_down
step_end
PetalburgCity_Movement_BoyWalkToGym0: @ 81DC628
PetalburgCity_Movement_BoyWalkToGym0:
walk_right
walk_right
walk_right
@@ -404,7 +404,7 @@ PetalburgCity_Movement_BoyWalkToGym0: @ 81DC628
walk_in_place_fastest_up
step_end
PetalburgCity_Movement_BoyWalkToGym1: @ 81DC633
PetalburgCity_Movement_BoyWalkToGym1:
walk_down
walk_right
walk_right
@@ -420,7 +420,7 @@ PetalburgCity_Movement_BoyWalkToGym1: @ 81DC633
walk_in_place_fastest_up
step_end
PetalburgCity_Movement_BoyWalkToGym2: @ 81DC641
PetalburgCity_Movement_BoyWalkToGym2:
walk_right
walk_right
walk_right
@@ -433,7 +433,7 @@ PetalburgCity_Movement_BoyWalkToGym2: @ 81DC641
walk_in_place_fastest_up
step_end
PetalburgCity_Movement_BoyWalkToGym3: @ 81DC64C
PetalburgCity_Movement_BoyWalkToGym3:
walk_right
walk_right
walk_right
@@ -447,7 +447,7 @@ PetalburgCity_Movement_BoyWalkToGym3: @ 81DC64C
walk_in_place_fastest_up
step_end
PetalburgCity_Movement_BoyWalkAway: @ 81DC658
PetalburgCity_Movement_BoyWalkAway:
walk_down
walk_left
walk_left
@@ -462,7 +462,7 @@ PetalburgCity_Movement_BoyWalkAway: @ 81DC658
walk_left
step_end
PetalburgCity_Movement_PlayerWalkToGym0: @ 81DC665
PetalburgCity_Movement_PlayerWalkToGym0:
walk_down
walk_right
walk_right
@@ -474,7 +474,7 @@ PetalburgCity_Movement_PlayerWalkToGym0: @ 81DC665
walk_up
step_end
PetalburgCity_Movement_PlayerWalkToGym1: @ 81DC66F
PetalburgCity_Movement_PlayerWalkToGym1:
delay_16
delay_16
walk_down
@@ -489,7 +489,7 @@ PetalburgCity_Movement_PlayerWalkToGym1: @ 81DC66F
walk_up
step_end
PetalburgCity_Movement_PlayerWalkToGym2: @ 81DC67C
PetalburgCity_Movement_PlayerWalkToGym2:
walk_up
walk_right
walk_right
@@ -501,7 +501,7 @@ PetalburgCity_Movement_PlayerWalkToGym2: @ 81DC67C
walk_up
step_end
PetalburgCity_Movement_PlayerWalkToGym3: @ 81DC686
PetalburgCity_Movement_PlayerWalkToGym3:
walk_up
walk_right
walk_right
@@ -514,7 +514,7 @@ PetalburgCity_Movement_PlayerWalkToGym3: @ 81DC686
walk_up
step_end
PetalburgCity_EventScript_Scott0:: @ 81DC691
PetalburgCity_EventScript_Scott0::
lockall
addobject LOCALID_SCOTT
setvar VAR_0x8008, 0
@@ -522,7 +522,7 @@ PetalburgCity_EventScript_Scott0:: @ 81DC691
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott1:: @ 81DC6A7
PetalburgCity_EventScript_Scott1::
lockall
addobject LOCALID_SCOTT
setvar VAR_0x8008, 1
@@ -530,7 +530,7 @@ PetalburgCity_EventScript_Scott1:: @ 81DC6A7
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott2:: @ 81DC6BD
PetalburgCity_EventScript_Scott2::
lockall
addobject LOCALID_SCOTT
setvar VAR_0x8008, 2
@@ -538,7 +538,7 @@ PetalburgCity_EventScript_Scott2:: @ 81DC6BD
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott3:: @ 81DC6D3
PetalburgCity_EventScript_Scott3::
lockall
addobject LOCALID_SCOTT
setvar VAR_0x8008, 3
@@ -546,7 +546,7 @@ PetalburgCity_EventScript_Scott3:: @ 81DC6D3
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott:: @ 81DC6E9
PetalburgCity_EventScript_Scott::
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft
waitmovement 0
playse SE_PIN
@@ -584,45 +584,45 @@ PetalburgCity_EventScript_Scott:: @ 81DC6E9
releaseall
end
PetalburgCity_EventScript_ScottExit0:: @ 81DC78E
PetalburgCity_EventScript_ScottExit0::
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit0
waitmovement 0
return
PetalburgCity_EventScript_ScottExit1:: @ 81DC7A0
PetalburgCity_EventScript_ScottExit1::
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit1
waitmovement 0
return
PetalburgCity_EventScript_ScottExit2:: @ 81DC7B2
PetalburgCity_EventScript_ScottExit2::
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit2
waitmovement 0
return
PetalburgCity_EventScript_ScottExit3:: @ 81DC7C4
PetalburgCity_EventScript_ScottExit3::
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit3
waitmovement 0
return
PetalburgCity_Movement_ScottStartWalkLeft: @ 81DC7D6
PetalburgCity_Movement_ScottStartWalkLeft:
walk_left
walk_left
walk_left
walk_left
step_end
PetalburgCity_Movement_ScottApproachPlayer: @ 81DC7DB
PetalburgCity_Movement_ScottApproachPlayer:
walk_left
walk_left
walk_left
walk_left
step_end
PetalburgCity_Movement_ScottExit0: @ 81DC7E0
PetalburgCity_Movement_ScottExit0:
walk_down
walk_down
walk_left
@@ -638,7 +638,7 @@ PetalburgCity_Movement_ScottExit0: @ 81DC7E0
walk_left
step_end
PetalburgCity_Movement_PlayerWatchScottExit0: @ 81DC7EE
PetalburgCity_Movement_PlayerWatchScottExit0:
delay_16
walk_in_place_fastest_down
delay_16
@@ -647,7 +647,7 @@ PetalburgCity_Movement_PlayerWatchScottExit0: @ 81DC7EE
walk_in_place_fastest_left
step_end
PetalburgCity_Movement_ScottExit1: @ 81DC7F5
PetalburgCity_Movement_ScottExit1:
walk_down
walk_left
walk_left
@@ -662,7 +662,7 @@ PetalburgCity_Movement_ScottExit1: @ 81DC7F5
walk_left
step_end
PetalburgCity_Movement_PlayerWatchScottExit1: @ 81DC802
PetalburgCity_Movement_PlayerWatchScottExit1:
delay_16
walk_in_place_fastest_down
delay_16
@@ -670,7 +670,7 @@ PetalburgCity_Movement_PlayerWatchScottExit1: @ 81DC802
walk_in_place_fastest_left
step_end
PetalburgCity_Movement_ScottExit2: @ 81DC808
PetalburgCity_Movement_ScottExit2:
walk_down
walk_left
walk_left
@@ -685,7 +685,7 @@ PetalburgCity_Movement_ScottExit2: @ 81DC808
walk_left
step_end
PetalburgCity_Movement_PlayerWatchScottExit2: @ 81DC815
PetalburgCity_Movement_PlayerWatchScottExit2:
delay_16
walk_in_place_fastest_down
delay_16
@@ -693,7 +693,7 @@ PetalburgCity_Movement_PlayerWatchScottExit2: @ 81DC815
walk_in_place_fastest_left
step_end
PetalburgCity_Movement_ScottExit3: @ 81DC81B
PetalburgCity_Movement_ScottExit3:
walk_up
walk_left
walk_left
@@ -708,7 +708,7 @@ PetalburgCity_Movement_ScottExit3: @ 81DC81B
walk_left
step_end
PetalburgCity_Movement_PlayerWatchScottExit3: @ 81DC828
PetalburgCity_Movement_PlayerWatchScottExit3:
delay_16
walk_in_place_fastest_up
delay_16
@@ -716,16 +716,16 @@ PetalburgCity_Movement_PlayerWatchScottExit3: @ 81DC828
walk_in_place_fastest_left
step_end
PetalburgCity_EventScript_GymBoy:: @ 81DC82E
PetalburgCity_EventScript_GymBoy::
msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_NPC
end
PetalburgCity_Text_WhereIsWally: @ 81DC837
PetalburgCity_Text_WhereIsWally:
.string "Where has our WALLY gone?\p"
.string "We have to leave for VERDANTURF TOWN\n"
.string "very soon…$"
PetalburgCity_Text_AreYouRookieTrainer: @ 81DC881
PetalburgCity_Text_AreYouRookieTrainer:
.string "Hiya! Are you maybe…\n"
.string "A rookie TRAINER?\p"
.string "Do you know what POKéMON TRAINERS\n"
@@ -733,51 +733,51 @@ PetalburgCity_Text_AreYouRookieTrainer: @ 81DC881
.string "They first check what kind of GYM\n"
.string "is in the town.$"
PetalburgCity_Text_ThisIsPetalburgGym: @ 81DC91B
PetalburgCity_Text_ThisIsPetalburgGym:
.string "See? This is PETALBURG CITY's GYM.$"
PetalburgCity_Text_ThisIsGymSign: @ 81DC93E
PetalburgCity_Text_ThisIsGymSign:
.string "This is the GYM's sign. Look for it\n"
.string "whenever you're looking for a GYM.$"
PetalburgCity_Text_WaterReflection: @ 81DC985
PetalburgCity_Text_WaterReflection:
.string "My face is reflected in the water.\p"
.string "It's a shining grin full of hope…\p"
.string "Or it could be a look of somber silence\n"
.string "struggling with fear…\p"
.string "What do you see reflected in your face?$"
PetalburgCity_Text_FullPartyExplanation: @ 81DCA30
PetalburgCity_Text_FullPartyExplanation:
.string "Let's say you have six POKéMON.\n"
.string "If you catch another one…\p"
.string "It is automatically sent to a STORAGE\n"
.string "BOX over a PC connection.$"
PetalburgCity_Text_GymSign: @ 81DCAAA
PetalburgCity_Text_GymSign:
.string "PETALBURG CITY POKéMON GYM\n"
.string "LEADER: NORMAN\l"
.string "“A man in pursuit of power!”$"
PetalburgCity_Text_CitySign: @ 81DCAF1
PetalburgCity_Text_CitySign:
.string "PETALBURG CITY\n"
.string "“Where people mingle with nature.”$"
PetalburgCity_Text_WallyHouseSign: @ 81DCB23
PetalburgCity_Text_WallyHouseSign:
.string "WALLY'S HOUSE$"
PetalburgCity_Text_AreYouATrainer: @ 81DCB31
PetalburgCity_Text_AreYouATrainer:
.string "Excuse me!\p"
.string "Let me guess, from the way you're\n"
.string "dressed, are you a POKéMON TRAINER?$"
PetalburgCity_Text_WellMaybeNot: @ 81DCB82
PetalburgCity_Text_WellMaybeNot:
.string "… … … … … …\p"
.string "Well, maybe not.\n"
.string "Your clothes aren't all that dirty.\p"
.string "You're either a rookie TRAINER,\n"
.string "or maybe you're just an ordinary kid.$"
PetalburgCity_Text_ImLookingForTalentedTrainers: @ 81DCC09
PetalburgCity_Text_ImLookingForTalentedTrainers:
.string "I'm roaming the land in search of\n"
.string "talented TRAINERS.\p"
.string "I'm sorry to have taken your time.$"