dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2022-06-24 21:10:48 -04:00
parent d73f39ae40
commit 9cde4e0f74
802 changed files with 20272 additions and 20272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SeafoamIslands_B4F/scripts.inc
+29 -29
View File
@@ -1,6 +1,6 @@
.equ NUM_BOULDERS_PRESENT, VAR_TEMP_2
SeafoamIslands_B4F_MapScripts:: @ 816302E
SeafoamIslands_B4F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B4F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SeafoamIslands_B4F_OnResume
map_script MAP_SCRIPT_ON_LOAD, SeafoamIslands_B4F_OnLoad
@@ -8,24 +8,24 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E
map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B4F_OnFrame
.byte 0
SeafoamIslands_B4F_OnResume:: @ 8163048
SeafoamIslands_B4F_OnResume::
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, SeafoamIslands_B4F_EventScript_TryRemoveArticuno
end
SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: @ 8163052
SeafoamIslands_B4F_EventScript_TryRemoveArticuno::
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
return
SeafoamIslands_B4F_OnTransition:: @ 8163066
SeafoamIslands_B4F_OnTransition::
call_if_unset FLAG_FOUGHT_ARTICUNO, SeafoamIslands_B4F_EventScript_ShowArticuno
call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, SeafoamIslands_B4F_EventScript_CheckStoppedCurrent
call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, SeafoamIslands_B4F_EventScript_SetNoCurrentLayout
end
SeafoamIslands_B4F_EventScript_CheckStoppedCurrent:: @ 8163082
SeafoamIslands_B4F_EventScript_CheckStoppedCurrent::
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent
@@ -33,19 +33,19 @@ SeafoamIslands_B4F_EventScript_CheckStoppedCurrent:: @ 8163082
call_if_eq SeafoamIslands_B4F_EventScript_StoppedCurrent
return
SeafoamIslands_B4F_EventScript_StoppedCurrent:: @ 81630A5
SeafoamIslands_B4F_EventScript_StoppedCurrent::
setflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
return
SeafoamIslands_B4F_EventScript_SetNoCurrentLayout:: @ 81630A9
SeafoamIslands_B4F_EventScript_SetNoCurrentLayout::
setmaplayoutindex LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED
return
SeafoamIslands_B4F_EventScript_ShowArticuno:: @ 81630AD
SeafoamIslands_B4F_EventScript_ShowArticuno::
clearflag FLAG_HIDE_ARTICUNO
return
SeafoamIslands_B4F_OnLoad:: @ 81630B1
SeafoamIslands_B4F_OnLoad::
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent
@@ -53,27 +53,27 @@ SeafoamIslands_B4F_OnLoad:: @ 81630B1
goto_if_eq SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs
end
SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs:: @ 81630D4
SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs::
setmetatile 12, 14, METATILE_General_CalmWater, 0
setmetatile 13, 14, METATILE_General_CalmWater, 0
end
SeafoamIslands_B4F_OnWarp:: @ 81630E7
SeafoamIslands_B4F_OnWarp::
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, SeafoamIslands_B4F_EventScript_WarpInOnCurrent
.2byte 0
SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: @ 81630F1
SeafoamIslands_B4F_EventScript_WarpInOnCurrent::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
special ForcePlayerToStartSurfing
end
SeafoamIslands_B4F_OnFrame:: @ 81630F9
SeafoamIslands_B4F_OnFrame::
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, SeafoamIslands_B4F_EventScript_EnterOnCurrent
map_script_2 VAR_TEMP_1, 1, SeafoamIslands_B4F_EventScript_EnterByFalling
.2byte 0
@ The current the player is forced in on from B3F
SeafoamIslands_B4F_EventScript_EnterOnCurrent:: @ 816310B
SeafoamIslands_B4F_EventScript_EnterOnCurrent::
lockall
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_EnterOnCurrent
waitmovement 0
@@ -81,14 +81,14 @@ SeafoamIslands_B4F_EventScript_EnterOnCurrent:: @ 816310B
releaseall
end
SeafoamIslands_B4F_Movement_EnterOnCurrent:: @ 816311D
SeafoamIslands_B4F_Movement_EnterOnCurrent::
walk_fast_up
walk_fast_up
walk_fast_up
step_end
@ The current the player lands on when entering the map by falling
SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121
SeafoamIslands_B4F_EventScript_EnterByFalling::
lockall
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
@@ -105,26 +105,26 @@ SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121
releaseall
end
SeafoamIslands_B4F_EventScript_AddBoulderPresent:: @ 8163169
SeafoamIslands_B4F_EventScript_AddBoulderPresent::
addvar NUM_BOULDERS_PRESENT, 1
return
SeafoamIslands_B4F_EventScript_RideCurrentFar:: @ 816316F
SeafoamIslands_B4F_EventScript_RideCurrentFar::
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentFar
waitmovement 0
return
SeafoamIslands_B4F_EventScript_RideCurrentClose:: @ 816317A
SeafoamIslands_B4F_EventScript_RideCurrentClose::
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentClose
waitmovement 0
return
SeafoamIslands_B4F_EventScript_CurrentBlocked:: @ 8163185
SeafoamIslands_B4F_EventScript_CurrentBlocked::
setvar VAR_TEMP_1, 0
releaseall
end
SeafoamIslands_B4F_Movement_RideCurrentFar:: @ 816318C
SeafoamIslands_B4F_Movement_RideCurrentFar::
walk_up
walk_up
walk_up
@@ -135,7 +135,7 @@ SeafoamIslands_B4F_Movement_RideCurrentFar:: @ 816318C
walk_up
step_end
SeafoamIslands_B4F_Movement_RideCurrentClose:: @ 8163195
SeafoamIslands_B4F_Movement_RideCurrentClose::
walk_up
walk_up
walk_up
@@ -146,18 +146,18 @@ SeafoamIslands_B4F_Movement_RideCurrentClose:: @ 8163195
step_end
@ Triggers blocking re-entry to B3F
SeafoamIslands_B4F_EventScript_UpwardCurrent:: @ 816319D
SeafoamIslands_B4F_EventScript_UpwardCurrent::
lockall
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_WalkUp
waitmovement 0
releaseall
end
SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA
SeafoamIslands_B4F_Movement_WalkUp::
walk_up
step_end
SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
SeafoamIslands_B4F_EventScript_Articuno::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
lock
@@ -186,20 +186,20 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
release
end
SeafoamIslands_B4F_EventScript_DefeatedArticuno:: @ 816320F
SeafoamIslands_B4F_EventScript_DefeatedArticuno::
setflag FLAG_FOUGHT_ARTICUNO
goto EventScript_RemoveStaticMon
end
SeafoamIslands_B4F_EventScript_RanFromArticuno:: @ 8163218
SeafoamIslands_B4F_EventScript_RanFromArticuno::
setvar VAR_0x8004, SPECIES_ARTICUNO
goto EventScript_MonFlewAway
end
SeafoamIslands_B4F_EventScript_BoulderHintSign:: @ 8163223
SeafoamIslands_B4F_EventScript_BoulderHintSign::
msgbox SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow, MSGBOX_SIGN
end
SeafoamIslands_B4F_EventScript_FastCurrentSign:: @ 816322C
SeafoamIslands_B4F_EventScript_FastCurrentSign::
msgbox SeafoamIslands_B4F_Text_DangerFastCurrent, MSGBOX_SIGN
end
data/maps/SeafoamIslands_B4F/text.inc
+6 -6
View File
@@ -1,4 +1,4 @@
Text_RockSlideTeach:: @ 81799E0
Text_RockSlideTeach::
.string "When you're up on a rocky mountain\n"
.string "like this, rockslides are a threat.\p"
.string "Can you imagine?\n"
@@ -8,22 +8,22 @@ Text_RockSlideTeach:: @ 81799E0
.string "You don't seem to be scared.\n"
.string "Want to try using ROCK SLIDE?$"
Text_RockSlideDeclined:: @ 8179AC0
Text_RockSlideDeclined::
.string "Oh, so you are scared after all.$"
Text_RockSlideWhichMon:: @ 8179AE1
Text_RockSlideWhichMon::
.string "Which POKéMON should I teach\n"
.string "ROCK SLIDE?$"
Text_RockSlideTaught:: @ 8179B0A
Text_RockSlideTaught::
.string "It might be scary to use it in this\n"
.string "tunnel…$"
SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow:: @ 8179B36
SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow::
.string "Hint: Boulders might change the\n"
.string "flow of water.$"
SeafoamIslands_B4F_Text_DangerFastCurrent:: @ 8179B65
SeafoamIslands_B4F_Text_DangerFastCurrent::
.string "DANGER\n"
.string "Fast current!$"