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/RusturfTunnel/scripts.inc
+64 -64
View File
@@ -4,27 +4,27 @@
.set LOCALID_PEEKO, 7
.equ LOCALID_WANDA, 10
RusturfTunnel_MapScripts:: @ 822CE27
RusturfTunnel_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_OnFrame
.byte 0
RusturfTunnel_OnFrame: @ 822CE32
RusturfTunnel_OnFrame:
map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_ClearTunnelScene
map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_ClearTunnelScene
.2byte 0
RusturfTunnel_OnTransition: @ 822CE44
RusturfTunnel_OnTransition:
compare VAR_RUSTURF_TUNNEL_STATE, 2
call_if_eq RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos
end
RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos:: @ 822CE50
RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos::
setobjectxyperm LOCALID_PEEKO, 13, 4
setobjectxyperm LOCALID_GRUNT, 13, 5
return
RusturfTunnel_EventScript_Wanda:: @ 822CE5F
RusturfTunnel_EventScript_Wanda::
lock
faceplayer
msgbox RusturfTunnel_Text_BoyfriendOnOtherSideOfRock, MSGBOX_DEFAULT
@@ -34,7 +34,7 @@ RusturfTunnel_EventScript_Wanda:: @ 822CE5F
release
end
RusturfTunnel_EventScript_WandasBoyfriend:: @ 822CE76
RusturfTunnel_EventScript_WandasBoyfriend::
lock
faceplayer
goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_AlreadySpokenTo
@@ -46,7 +46,7 @@ RusturfTunnel_EventScript_WandasBoyfriend:: @ 822CE76
release
end
RusturfTunnel_EventScript_AlreadySpokenTo:: @ 822CE99
RusturfTunnel_EventScript_AlreadySpokenTo::
msgbox RusturfTunnel_Text_ToGetToVerdanturf, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
@@ -54,7 +54,7 @@ RusturfTunnel_EventScript_AlreadySpokenTo:: @ 822CE99
release
end
RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE
RusturfTunnel_EventScript_ClearTunnelScene::
lockall
compare VAR_TEMP_1, 1
call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend1
@@ -90,13 +90,13 @@ RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE
releaseall
end
RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D
RusturfTunnel_EventScript_BoyfriendApproachWanda1::
applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1
applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda1
waitmovement 0
return
RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F
RusturfTunnel_EventScript_BoyfriendApproachWanda2::
applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda
waitmovement 0
@@ -104,7 +104,7 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F
waitmovement 0
return
RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B
RusturfTunnel_EventScript_BoyfriendApproachWanda3::
applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda
waitmovement 0
@@ -112,41 +112,41 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B
waitmovement 0
return
RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7
RusturfTunnel_EventScript_FaceWandasBoyfriend1::
applymovement LOCALID_WANDAS_BF, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
RusturfTunnel_EventScript_FaceWandasBoyfriend2:: @ 822CFBC
RusturfTunnel_EventScript_FaceWandasBoyfriend2::
applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendFaceRight
waitmovement 0
return
RusturfTunnel_EventScript_FaceWandasBoyfriend3:: @ 822CFC7
RusturfTunnel_EventScript_FaceWandasBoyfriend3::
return
RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: @ 822CFC8
RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer::
closemessage
applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer
waitmovement 0
return
RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4
RusturfTunnel_EventScript_WandaAndBoyfriendExit1::
applymovement LOCALID_WANDA, RusturfTunnel_Movement_WandaExit1
applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit1
waitmovement 0
return
RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6
RusturfTunnel_EventScript_WandaAndBoyfriendExit::
applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit
applymovement LOCALID_WANDA, RusturfTunnel_Movement_WandaExit
applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit
waitmovement 0
return
RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF
RusturfTunnel_EventScript_WandasBoyfriendNotice::
playse SE_PIN
applymovement LOCALID_WANDAS_BF, Common_Movement_ExclamationMark
waitmovement 0
@@ -154,7 +154,7 @@ RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF
waitmovement 0
return
RusturfTunnel_Movement_WandaExit1: @ 822D017
RusturfTunnel_Movement_WandaExit1:
walk_right
walk_right
walk_right
@@ -168,7 +168,7 @@ RusturfTunnel_Movement_WandaExit1: @ 822D017
walk_down
step_end
RusturfTunnel_Movement_WandaExit: @ 822D023
RusturfTunnel_Movement_WandaExit:
walk_right
walk_right
walk_right
@@ -182,7 +182,7 @@ RusturfTunnel_Movement_WandaExit: @ 822D023
walk_down
step_end
RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
RusturfTunnel_Movement_PlayerWatchWandaExit:
delay_8
walk_in_place_fastest_up
delay_16
@@ -190,41 +190,41 @@ RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
walk_in_place_fastest_right
step_end
RusturfTunnel_Movement_Unused1: @ 822D035
RusturfTunnel_Movement_Unused1:
walk_left
walk_in_place_fastest_right
step_end
RusturfTunnel_Movement_Unused2: @ 822D038
RusturfTunnel_Movement_Unused2:
walk_down
walk_in_place_fastest_up
delay_8
walk_in_place_fastest_right
step_end
RusturfTunnel_Movement_Unused3: @ 822D03D
RusturfTunnel_Movement_Unused3:
walk_up
walk_in_place_fastest_down
delay_8
walk_in_place_fastest_right
step_end
RusturfTunnel_Movement_PlayerWatchBoyfriend1: @ 822D042
RusturfTunnel_Movement_PlayerWatchBoyfriend1:
walk_left
walk_in_place_fastest_right
step_end
RusturfTunnel_Movement_PlayerWatchBoyfriend: @ 822D045
RusturfTunnel_Movement_PlayerWatchBoyfriend:
walk_right
walk_in_place_fastest_left
step_end
RusturfTunnel_Movement_BoyfriendFaceRight: @ 822D048
RusturfTunnel_Movement_BoyfriendFaceRight:
walk_up
walk_in_place_fastest_right
step_end
RusturfTunnel_Movement_WandasBoyfriendExit1: @ 822D04B
RusturfTunnel_Movement_WandasBoyfriendExit1:
walk_right
walk_right
walk_right
@@ -239,7 +239,7 @@ RusturfTunnel_Movement_WandasBoyfriendExit1: @ 822D04B
walk_down
step_end
RusturfTunnel_Movement_WandasBoyfriendExit: @ 822D058
RusturfTunnel_Movement_WandasBoyfriendExit:
walk_up
walk_right
walk_right
@@ -254,37 +254,37 @@ RusturfTunnel_Movement_WandasBoyfriendExit: @ 822D058
walk_down
step_end
RusturfTunnel_Movement_WandasBoyfriendApproachPlayer: @ 822D065
RusturfTunnel_Movement_WandasBoyfriendApproachPlayer:
walk_right
step_end
RusturfTunnel_Movement_BoyfriendApproachWanda1: @ 822D067
RusturfTunnel_Movement_BoyfriendApproachWanda1:
walk_in_place_fast_up
walk_in_place_fast_up
walk_fast_up
walk_fast_right
step_end
RusturfTunnel_Movement_BoyfriendApproachWanda: @ 822D06C
RusturfTunnel_Movement_BoyfriendApproachWanda:
walk_in_place_fast_right
walk_in_place_fast_right
walk_fast_right
walk_in_place_fastest_up
step_end
RusturfTunnel_EventScript_TunnelBlockagePos1:: @ 822D071
RusturfTunnel_EventScript_TunnelBlockagePos1::
setvar VAR_TEMP_1, 1
end
RusturfTunnel_EventScript_TunnelBlockagePos2:: @ 822D077
RusturfTunnel_EventScript_TunnelBlockagePos2::
setvar VAR_TEMP_1, 2
end
RusturfTunnel_EventScript_TunnelBlockagePos3:: @ 822D07D
RusturfTunnel_EventScript_TunnelBlockagePos3::
setvar VAR_TEMP_1, 3
end
RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083
RusturfTunnel_EventScript_AquaGruntBackUp::
lockall
msgbox RusturfTunnel_Text_ComeAndGetSome, MSGBOX_DEFAULT
closemessage
@@ -297,13 +297,13 @@ RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083
releaseall
end
RusturfTunnel_Movement_GruntAndPeekoBackUp: @ 822D0AB
RusturfTunnel_Movement_GruntAndPeekoBackUp:
lock_facing_direction
walk_right
unlock_facing_direction
step_end
RusturfTunnel_EventScript_Peeko:: @ 822D0AF
RusturfTunnel_EventScript_Peeko::
lock
faceplayer
waitse
@@ -313,7 +313,7 @@ RusturfTunnel_EventScript_Peeko:: @ 822D0AF
release
end
RusturfTunnel_EventScript_Grunt:: @ 822D0C2
RusturfTunnel_EventScript_Grunt::
lock
faceplayer
playbgm MUS_ENCOUNTER_AQUA, FALSE
@@ -357,7 +357,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2
release
end
RusturfTunnel_Movement_PushPlayerAsideForGrunt: @ 822D178
RusturfTunnel_Movement_PushPlayerAsideForGrunt:
face_down
lock_facing_direction
walk_up
@@ -365,12 +365,12 @@ RusturfTunnel_Movement_PushPlayerAsideForGrunt: @ 822D178
walk_in_place_fastest_left
step_end
RusturfTunnel_Movement_PlayerMoveAsideForBriney: @ 822D17E
RusturfTunnel_Movement_PlayerMoveAsideForBriney:
walk_down
walk_in_place_fastest_up
step_end
RusturfTunnel_Movement_GruntEscape: @ 822D181
RusturfTunnel_Movement_GruntEscape:
walk_fast_left
walk_fast_left
walk_fast_left
@@ -382,7 +382,7 @@ RusturfTunnel_Movement_GruntEscape: @ 822D181
walk_fast_left
step_end
RusturfTunnel_Movement_BrineyApproachPeeko1: @ 822D18B
RusturfTunnel_Movement_BrineyApproachPeeko1:
walk_right
walk_right
walk_right
@@ -392,7 +392,7 @@ RusturfTunnel_Movement_BrineyApproachPeeko1: @ 822D18B
walk_right
step_end
RusturfTunnel_Movement_BrineyExit: @ 822D193
RusturfTunnel_Movement_BrineyExit:
walk_left
walk_left
walk_left
@@ -406,19 +406,19 @@ RusturfTunnel_Movement_BrineyExit: @ 822D193
walk_left
step_end
RusturfTunnel_Movement_PlayerWatchBrineyExit: @ 822D19F
RusturfTunnel_Movement_PlayerWatchBrineyExit:
delay_16
delay_8
delay_4
walk_in_place_fastest_left
step_end
RusturfTunnel_Movement_BrineyApproachPeeko2: @ 822D1A4
RusturfTunnel_Movement_BrineyApproachPeeko2:
delay_16
walk_right
step_end
RusturfTunnel_Movement_PeekoExit: @ 822D1A7
RusturfTunnel_Movement_PeekoExit:
walk_left
walk_left
walk_left
@@ -430,19 +430,19 @@ RusturfTunnel_Movement_PeekoExit: @ 822D1A7
walk_left
step_end
RusturfTunnel_EventScript_Mike:: @ 822D1B1
RusturfTunnel_EventScript_Mike::
trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_MikeIntro, RusturfTunnel_Text_MikeDefeat
msgbox RusturfTunnel_Text_MikePostBattle, MSGBOX_AUTOCLOSE
end
RusturfTunnel_Text_ComeAndGetSome: @ 822D1C8
RusturfTunnel_Text_ComeAndGetSome:
.string "What, are you coming?\n"
.string "Come and get some, then!$"
RusturfTunnel_Text_Peeko: @ 822D1F7
RusturfTunnel_Text_Peeko:
.string "PEEKO: Pii pihyoh!$"
RusturfTunnel_Text_GruntIntro: @ 822D20A
RusturfTunnel_Text_GruntIntro:
.string "Grah, keelhaul it all!\p"
.string "That hostage POKéMON turned out to\n"
.string "be worthless!\p"
@@ -451,11 +451,11 @@ RusturfTunnel_Text_GruntIntro: @ 822D20A
.string "Hey! You!\n"
.string "So you want to battle me?$"
RusturfTunnel_Text_GruntDefeat: @ 822D2B0
RusturfTunnel_Text_GruntDefeat:
.string "Urrrggh! My career in crime comes to\n"
.string "a dead end!$"
RusturfTunnel_Text_GruntTakePackage: @ 822D2E1
RusturfTunnel_Text_GruntTakePackage:
.string "This is plain not right…\p"
.string "The BOSS told me this would be a\n"
.string "slick-and-easy job to pull.\p"
@@ -464,11 +464,11 @@ RusturfTunnel_Text_GruntTakePackage: @ 822D2E1
.string "Tch!\n"
.string "You want it back that badly, take it!$"
RusturfTunnel_Text_PeekoGladToSeeYouSafe: @ 822D395
RusturfTunnel_Text_PeekoGladToSeeYouSafe:
.string "PEEKO!\n"
.string "Am I glad to see you're safe!$"
RusturfTunnel_Text_ThankYouLetsGoHomePeeko: @ 822D3BA
RusturfTunnel_Text_ThankYouLetsGoHomePeeko:
.string "PEEKO owes her life to you!\p"
.string "They call me MR. BRINEY.\n"
.string "And, you are?\p"
@@ -484,7 +484,7 @@ RusturfTunnel_Text_ThankYouLetsGoHomePeeko: @ 822D3BA
.string "home.\p"
.string "PEEKO: Pihyoh!$"
RusturfTunnel_Text_WhyCantTheyKeepDigging: @ 822D510
RusturfTunnel_Text_WhyCantTheyKeepDigging:
.string "… …\p"
.string "Why can't they keep digging?\n"
.string "Is the bedrock too hard?\p"
@@ -496,30 +496,30 @@ RusturfTunnel_Text_WhyCantTheyKeepDigging: @ 822D510
.string "But this…\n"
.string "What am I to do?$"
RusturfTunnel_Text_ToGetToVerdanturf: @ 822D5F3
RusturfTunnel_Text_ToGetToVerdanturf:
.string "To get from RUSTBORO to VERDANTURF,\n"
.string "you need to go to DEWFORD, then pass\l"
.string "through SLATEPORT and MAUVILLE…$"
RusturfTunnel_Text_YouShatteredBoulderTakeHM: @ 822D65C
RusturfTunnel_Text_YouShatteredBoulderTakeHM:
.string "Wow! You shattered that boulder\n"
.string "blocking the way.\p"
.string "To show you how much I appreciate it,\n"
.string "I'd like you to have this HM.$"
RusturfTunnel_Text_ExplainStrength: @ 822D6D2
RusturfTunnel_Text_ExplainStrength:
.string "That HM contains STRENGTH.\p"
.string "If a muscular POKéMON were to learn\n"
.string "that, it would be able to move even\l"
.string "large boulders.$"
RusturfTunnel_Text_WandaReunion: @ 822D745
RusturfTunnel_Text_WandaReunion:
.string "WANDA!\n"
.string "Now I can see you anytime!\p"
.string "WANDA: That's…wonderful.\p"
.string "Please, take some rest at my home.$"
RusturfTunnel_Text_BoyfriendOnOtherSideOfRock: @ 822D7A3
RusturfTunnel_Text_BoyfriendOnOtherSideOfRock:
.string "On the other side of this rock…\n"
.string "My boyfriend is there.\p"
.string "He… He's not just digging the tunnel\n"
@@ -527,17 +527,17 @@ RusturfTunnel_Text_BoyfriendOnOtherSideOfRock: @ 822D7A3
.string "He works his hands raw and rough\n"
.string "for the benefit of everyone.$"
RusturfTunnel_Text_MikeIntro: @ 822D84D
RusturfTunnel_Text_MikeIntro:
.string "What do you call a wild man up in the\n"
.string "mountains? A mountain man, right?\p"
.string "So why don't they call a POKéMON in\n"
.string "the mountains a mountain POKéMON?$"
RusturfTunnel_Text_MikeDefeat: @ 822D8DB
RusturfTunnel_Text_MikeDefeat:
.string "My POKéMON…\n"
.string "Ran out of power…$"
RusturfTunnel_Text_MikePostBattle: @ 822D8F9
RusturfTunnel_Text_MikePostBattle:
.string "They halted development here to\n"
.string "protect POKéMON, right?\l"
.string "There's a feel-good story!$"