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

106
data/maps/OldaleTown/scripts.inc
View File

@@ -2,11 +2,11 @@
.set LOCALID_FOOTPRINTS_MAN, 3
.set LOCALID_RIVAL, 4
OldaleTown_MapScripts:: @ 81E8EA2
OldaleTown_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_OnTransition
.byte 0
OldaleTown_OnTransition: @ 81E8EA8
OldaleTown_OnTransition:
call Common_EventScript_SetupRivalGfxId
setflag FLAG_VISITED_OLDALE_TOWN
call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_BlockWestEntrance
@@ -15,29 +15,29 @@ OldaleTown_OnTransition: @ 81E8EA8
end
@ This script seems pointless because nothing uses VAR_OLDALE_TOWN_STATE
OldaleTown_EventScript_SetOldaleState:: @ 81E8ECC
OldaleTown_EventScript_SetOldaleState::
setvar VAR_OLDALE_TOWN_STATE, 1
return
OldaleTown_EventScript_BlockWestEntrance:: @ 81E8ED2
OldaleTown_EventScript_BlockWestEntrance::
setobjectxyperm LOCALID_FOOTPRINTS_MAN, 1, 11
setobjectmovementtype LOCALID_FOOTPRINTS_MAN, MOVEMENT_TYPE_FACE_LEFT
return
OldaleTown_EventScript_MoveMartEmployee:: @ 81E8EDE
OldaleTown_EventScript_MoveMartEmployee::
setobjectxyperm LOCALID_MART_EMPLOYEE, 13, 14
setobjectmovementtype LOCALID_MART_EMPLOYEE, MOVEMENT_TYPE_FACE_DOWN
return
OldaleTown_EventScript_CitySign:: @ 81E8EEA
OldaleTown_EventScript_CitySign::
msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN
end
OldaleTown_EventScript_Girl:: @ 81E8EF3
OldaleTown_EventScript_Girl::
msgbox OldaleTown_Text_SavingMyProgress, MSGBOX_NPC
end
OldaleTown_EventScript_MartEmployee:: @ 81E8EFC
OldaleTown_EventScript_MartEmployee::
lock
faceplayer
goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion
@@ -52,28 +52,28 @@ OldaleTown_EventScript_MartEmployee:: @ 81E8EFC
case DIR_EAST, OldaleTown_EventScript_GoToMartEast
end
OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47
OldaleTown_EventScript_GoToMartSouth::
applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeSouth
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerSouth
waitmovement 0
goto OldaleTown_EventScript_ExplainPokemonMart
end
OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E
OldaleTown_EventScript_GoToMartNorth::
applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeNorth
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerNorth
waitmovement 0
goto OldaleTown_EventScript_ExplainPokemonMart
end
OldaleTown_EventScript_GoToMartEast:: @ 81E8F75
OldaleTown_EventScript_GoToMartEast::
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerEast
applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeEast
waitmovement 0
goto OldaleTown_EventScript_ExplainPokemonMart
end
OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C
OldaleTown_EventScript_ExplainPokemonMart::
msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT
giveitem ITEM_POTION
compare VAR_RESULT, FALSE
@@ -84,18 +84,18 @@ OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C
release
end
OldaleTown_EventScript_ExplainPotion:: @ 81E8FB9
OldaleTown_EventScript_ExplainPotion::
msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT
release
end
OldaleTown_EventScript_BagIsFull:: @ 81E8FC3
OldaleTown_EventScript_BagIsFull::
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
fadedefaultbgm
release
end
OldaleTown_Movement_EmployeeEast: @ 81E8FCE
OldaleTown_Movement_EmployeeEast:
walk_up
walk_up
walk_up
@@ -106,7 +106,7 @@ OldaleTown_Movement_EmployeeEast: @ 81E8FCE
walk_in_place_fastest_down
step_end
OldaleTown_Movement_EmployeeSouth: @ 81E8FD7
OldaleTown_Movement_EmployeeSouth:
walk_left
walk_up
walk_up
@@ -119,7 +119,7 @@ OldaleTown_Movement_EmployeeSouth: @ 81E8FD7
walk_in_place_fastest_down
step_end
OldaleTown_Movement_EmployeeNorth: @ 81E8FE2
OldaleTown_Movement_EmployeeNorth:
walk_up
walk_up
walk_up
@@ -130,7 +130,7 @@ OldaleTown_Movement_EmployeeNorth: @ 81E8FE2
walk_in_place_fastest_down
step_end
OldaleTown_Movement_Unknown1: @ 81E8FEB
OldaleTown_Movement_Unknown1:
walk_up
walk_up
walk_right
@@ -146,7 +146,7 @@ OldaleTown_Movement_Unknown1: @ 81E8FEB
walk_in_place_fastest_down
step_end
OldaleTown_Movement_PlayerEast: @ 81E8FF9
OldaleTown_Movement_PlayerEast:
walk_right
walk_up
walk_up
@@ -156,7 +156,7 @@ OldaleTown_Movement_PlayerEast: @ 81E8FF9
walk_up
step_end
OldaleTown_Movement_PlayerSouth: @ 81E9001
OldaleTown_Movement_PlayerSouth:
delay_16
delay_16
delay_16
@@ -168,7 +168,7 @@ OldaleTown_Movement_PlayerSouth: @ 81E9001
walk_up
step_end
OldaleTown_Movement_PlayerNorth: @ 81E900B
OldaleTown_Movement_PlayerNorth:
walk_up
walk_up
walk_up
@@ -178,7 +178,7 @@ OldaleTown_Movement_PlayerNorth: @ 81E900B
walk_up
step_end
OldaleTown_Movement_Unknown2: @ 81E9013
OldaleTown_Movement_Unknown2:
walk_left
walk_up
walk_up
@@ -192,7 +192,7 @@ OldaleTown_Movement_Unknown2: @ 81E9013
walk_up
step_end
OldaleTown_EventScript_FootprintsMan:: @ 81E901F
OldaleTown_EventScript_FootprintsMan::
lock
faceplayer
goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_NotBlockingPath
@@ -203,7 +203,7 @@ OldaleTown_EventScript_FootprintsMan:: @ 81E901F
release
end
OldaleTown_EventScript_BlockedPath:: @ 81E903F
OldaleTown_EventScript_BlockedPath::
lockall
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerStepBack
applymovement LOCALID_FOOTPRINTS_MAN, OldaleTown_Movement_BackUp
@@ -215,12 +215,12 @@ OldaleTown_EventScript_BlockedPath:: @ 81E903F
releaseall
end
OldaleTown_EventScript_NotBlockingPath:: @ 81E9066
OldaleTown_EventScript_NotBlockingPath::
msgbox OldaleTown_Text_FinishedSketchingFootprints, MSGBOX_DEFAULT
release
end
OldaleTown_EventScript_Rival:: @ 81E9070
OldaleTown_EventScript_Rival::
lockall
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
waitmovement 0
@@ -228,7 +228,7 @@ OldaleTown_EventScript_Rival:: @ 81E9070
goto OldaleTown_EventScript_ShowRivalMessage
end
OldaleTown_EventScript_RivalTrigger1:: @ 81E9086
OldaleTown_EventScript_RivalTrigger1::
lockall
applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer1
waitmovement 0
@@ -238,7 +238,7 @@ OldaleTown_EventScript_RivalTrigger1:: @ 81E9086
goto OldaleTown_EventScript_ShowRivalMessage
end
OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6
OldaleTown_EventScript_RivalTrigger2::
lockall
applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer2
waitmovement 0
@@ -248,7 +248,7 @@ OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6
goto OldaleTown_EventScript_ShowRivalMessage
end
OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6
OldaleTown_EventScript_RivalTrigger3::
lockall
applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer3
waitmovement 0
@@ -258,7 +258,7 @@ OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6
goto OldaleTown_EventScript_ShowRivalMessage
end
OldaleTown_EventScript_ShowRivalMessage:: @ 81E90E6
OldaleTown_EventScript_ShowRivalMessage::
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq OldaleTown_EventScript_ShowMayMessage
@@ -266,17 +266,17 @@ OldaleTown_EventScript_ShowRivalMessage:: @ 81E90E6
goto_if_eq OldaleTown_EventScript_ShowBrendanMessage
end
OldaleTown_EventScript_ShowMayMessage:: @ 81E90FE
OldaleTown_EventScript_ShowMayMessage::
msgbox OldaleTown_Text_MayLetsGoBack, MSGBOX_DEFAULT
goto OldaleTown_EventScript_RivalFinish
end
OldaleTown_EventScript_ShowBrendanMessage:: @ 81E910C
OldaleTown_EventScript_ShowBrendanMessage::
msgbox OldaleTown_Text_BrendanLetsGoBack, MSGBOX_DEFAULT
goto OldaleTown_EventScript_RivalFinish
end
OldaleTown_EventScript_RivalFinish:: @ 81E911A
OldaleTown_EventScript_RivalFinish::
closemessage
compare VAR_0x8009, 0
call_if_eq OldaleTown_EventScript_DoExitMovement1
@@ -290,33 +290,33 @@ OldaleTown_EventScript_RivalFinish:: @ 81E911A
releaseall
end
OldaleTown_EventScript_DoExitMovement1:: @ 81E9148
OldaleTown_EventScript_DoExitMovement1::
compare VAR_FACING, DIR_SOUTH
goto_if_ne OldaleTown_EventScript_DoExitMovement2
applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalExit
waitmovement 0
return
OldaleTown_EventScript_DoExitMovement2:: @ 81E915E
OldaleTown_EventScript_DoExitMovement2::
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_WatchRivalExit
applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalExit
waitmovement 0
return
OldaleTown_Movement_RivalApproachPlayer1: @ 81E9170
OldaleTown_Movement_RivalApproachPlayer1:
walk_left
walk_left
step_end
OldaleTown_Movement_RivalApproachPlayer2: @ 81E9173
OldaleTown_Movement_RivalApproachPlayer2:
walk_left
step_end
OldaleTown_Movement_RivalApproachPlayer3: @ 81E9175
OldaleTown_Movement_RivalApproachPlayer3:
face_left
step_end
OldaleTown_Movement_RivalExit: @ 81E9177
OldaleTown_Movement_RivalExit:
walk_down
walk_down
walk_down
@@ -325,18 +325,18 @@ OldaleTown_Movement_RivalExit: @ 81E9177
walk_down
step_end
OldaleTown_Movement_WatchRivalExit: @ 81E917E
OldaleTown_Movement_WatchRivalExit:
delay_8
delay_4
walk_in_place_fastest_down
step_end
OldaleTown_Movement_PlayerStepBack: @ 81E9182
OldaleTown_Movement_PlayerStepBack:
delay_8
walk_right
step_end
OldaleTown_Movement_BackUp: @ 81E9185
OldaleTown_Movement_BackUp:
walk_fast_up
walk_in_place_fastest_left
lock_facing_direction
@@ -344,21 +344,21 @@ OldaleTown_Movement_BackUp: @ 81E9185
unlock_facing_direction
step_end
OldaleTown_Movement_ReturnToOriginalPosition: @ 81E918B
OldaleTown_Movement_ReturnToOriginalPosition:
walk_down
walk_left
step_end
OldaleTown_Text_SavingMyProgress: @ 81E918E
OldaleTown_Text_SavingMyProgress:
.string "I want to take a rest, so I'm saving my\n"
.string "progress.$"
OldaleTown_Text_IWorkAtPokemonMart: @ 81E91C0
OldaleTown_Text_IWorkAtPokemonMart:
.string "Hi!\n"
.string "I work at a POKéMON MART.\p"
.string "Can I get you to come with me?$"
OldaleTown_Text_ThisIsAPokemonMart: @ 81E91FD
OldaleTown_Text_ThisIsAPokemonMart:
.string "This is a POKéMON MART.\n"
.string "Just look for our blue roof.\p"
.string "We sell a variety of goods including\n"
@@ -366,12 +366,12 @@ OldaleTown_Text_ThisIsAPokemonMart: @ 81E91FD
.string "Here, I'd like you to have this as\n"
.string "a promotional item.$"
OldaleTown_Text_PotionExplanation: @ 81E92AF
OldaleTown_Text_PotionExplanation:
.string "A POTION can be used anytime, so it's\n"
.string "even more useful than a POKéMON CENTER\l"
.string "in certain situations.$"
OldaleTown_Text_WaitDontComeInHere: @ 81E9313
OldaleTown_Text_WaitDontComeInHere:
.string "Aaaaah! Wait!\n"
.string "Please don't come in here.\p"
.string "I just discovered the footprints of\n"
@@ -379,29 +379,29 @@ OldaleTown_Text_WaitDontComeInHere: @ 81E9313
.string "Wait until I finish sketching\n"
.string "them, okay?$"
OldaleTown_Text_DiscoveredFootprints: @ 81E939A
OldaleTown_Text_DiscoveredFootprints:
.string "I just discovered the footprints of\n"
.string "a rare POKéMON!\p"
.string "Wait until I finish sketching\n"
.string "them, okay?$"
OldaleTown_Text_FinishedSketchingFootprints: @ 81E93F8
OldaleTown_Text_FinishedSketchingFootprints:
.string "I finished sketching the footprints of\n"
.string "a rare POKéMON.\p"
.string "But it turns out they were only my\n"
.string "own footprints…$"
OldaleTown_Text_MayLetsGoBack: @ 81E9462
OldaleTown_Text_MayLetsGoBack:
.string "MAY: {PLAYER}{KUN}!\n"
.string "Over here!\l"
.string "Let's hurry home!$"
OldaleTown_Text_BrendanLetsGoBack: @ 81E948A
OldaleTown_Text_BrendanLetsGoBack:
.string "BRENDAN: I'm heading back to my dad's\n"
.string "LAB now.\l"
.string "{PLAYER}, you should hustle back, too.$"
OldaleTown_Text_CitySign: @ 81E94DA
OldaleTown_Text_CitySign:
.string "OLDALE TOWN\n"
.string "“Where things start off scarce.”$"