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/VermilionCity/scripts.inc
+38 -38
View File
@@ -1,15 +1,15 @@
.equ LOCALID_FERRY_SAILOR, 6
VermilionCity_MapScripts:: @ 81668DC
VermilionCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame
.byte 0
VermilionCity_OnFrame:: @ 81668E7
VermilionCity_OnFrame::
map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, VermilionCity_EventScript_ExitSSAnne
.2byte 0
VermilionCity_EventScript_ExitSSAnne:: @ 81668F1
VermilionCity_EventScript_ExitSSAnne::
lockall
applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_ExitSSAnne
waitmovement 0
@@ -17,25 +17,25 @@ VermilionCity_EventScript_ExitSSAnne:: @ 81668F1
releaseall
end
VermilionCity_Movement_ExitSSAnne:: @ 8166903
VermilionCity_Movement_ExitSSAnne::
walk_up
walk_up
step_end
VermilionCity_OnTransition:: @ 8166906
VermilionCity_OnTransition::
setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY
call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, VermilionCity_EventScript_HideOaksAide
end
VermilionCity_EventScript_HideOaksAide:: @ 8166913
VermilionCity_EventScript_HideOaksAide::
setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE
return
VermilionCity_EventScript_Woman:: @ 8166917
VermilionCity_EventScript_Woman::
msgbox VermilionCity_Text_GrimerMultipliesInSludge, MSGBOX_NPC
end
VermilionCity_EventScript_OldMan1:: @ 8166920
VermilionCity_EventScript_OldMan1::
lock
faceplayer
compare VAR_MAP_SCENE_VERMILION_CITY, 3
@@ -44,12 +44,12 @@ VermilionCity_EventScript_OldMan1:: @ 8166920
release
end
VermilionCity_EventScript_OldMan1SSAnneLeft:: @ 8166937
VermilionCity_EventScript_OldMan1SSAnneLeft::
msgbox VermilionCity_Text_SSAnneHasDepartedForYear
release
end
VermilionCity_EventScript_FerrySailor:: @ 8166941
VermilionCity_EventScript_FerrySailor::
lock
faceplayer
compare VAR_MAP_SCENE_VERMILION_CITY, 3
@@ -58,7 +58,7 @@ VermilionCity_EventScript_FerrySailor:: @ 8166941
release
end
VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958
VermilionCity_EventScript_CheckHasMysticTicket::
goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, EventScript_SetResultFalse
checkitem ITEM_MYSTIC_TICKET, 1
compare VAR_RESULT, FALSE
@@ -66,7 +66,7 @@ VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958
goto EventScript_SetResultTrue
end
VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977
VermilionCity_EventScript_CheckHasAuroraTicket::
goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, EventScript_SetResultFalse
checkitem ITEM_AURORA_TICKET, 1
compare VAR_RESULT, FALSE
@@ -74,7 +74,7 @@ VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977
goto EventScript_SetResultTrue
end
VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996
VermilionCity_EventScript_CheckSeagallopPresent::
setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestRainbowPass
@@ -84,7 +84,7 @@ VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996
release
end
VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB
VermilionCity_EventScript_ChooseSeagallopDestRainbowPass::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
call VermilionCity_EventScript_CheckHasMysticTicket
@@ -99,7 +99,7 @@ VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB
goto EventScript_SeviiDestinationsPage1
end
VermilionCity_EventScript_HasMysticTicket:: @ 81669FD
VermilionCity_EventScript_HasMysticTicket::
call VermilionCity_EventScript_CheckHasAuroraTicket
compare VAR_RESULT, TRUE
goto_if_eq VermilionCity_EventScript_HasMysticAndAuroraTickets
@@ -114,12 +114,12 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD
case 127, EventScript_CancelSail
end
VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53
VermilionCity_EventScript_ShowMysticTicket::
setflag FLAG_SHOWN_MYSTIC_TICKET
msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock
return
VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F
VermilionCity_EventScript_HasAuroraTicket::
call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket
message VermilionCity_Text_BoardSeagallopFerry
waitmessage
@@ -131,12 +131,12 @@ VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F
case 127, EventScript_CancelSail
end
VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5
VermilionCity_EventScript_ShowAuroraTicket::
setflag FLAG_SHOWN_AURORA_TICKET
msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland
return
VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1
VermilionCity_EventScript_HasMysticAndAuroraTickets::
call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket
call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket
message VermilionCity_Text_BoardSeagallopFerry
@@ -150,21 +150,21 @@ VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1
case 127, EventScript_CancelSail
end
EventScript_SailToNavelRock:: @ 8166B0B
EventScript_SailToNavelRock::
msgbox VermilionCity_Text_Seagallop10Departing
setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
setvar VAR_0x8006, SEAGALLOP_NAVEL_ROCK
goto EventScript_SetSail
end
EventScript_SailToBirthIsland:: @ 8166B23
EventScript_SailToBirthIsland::
msgbox VermilionCity_Text_Seagallop12Departing
setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
setvar VAR_0x8006, SEAGALLOP_BIRTH_ISLAND
goto EventScript_SetSail
end
VermilionCity_EventScript_ChooseSeagallopDestTriPass:: @ 8166B3B
VermilionCity_EventScript_ChooseSeagallopDestTriPass::
message VermilionCity_Text_BoardSeagallopTriPass
waitmessage
setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
@@ -178,27 +178,27 @@ VermilionCity_EventScript_ChooseSeagallopDestTriPass:: @ 8166B3B
end
@ Unreachable
Vermilion_EventScript_Unused:: @ 8166B88
Vermilion_EventScript_Unused::
release
end
VermilionCity_EventScript_CheckTicketLeft:: @ 8166B8A
VermilionCity_EventScript_CheckTicketLeft::
lockall
goto VermilionCity_EventScript_CheckTicket
end
VermilionCity_EventScript_CheckTicketRight:: @ 8166B91
VermilionCity_EventScript_CheckTicketRight::
lockall
goto VermilionCity_EventScript_CheckTicket
end
VermilionCity_EventScript_ExitedTicketCheck:: @ 8166B98
VermilionCity_EventScript_ExitedTicketCheck::
lockall
setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
releaseall
end
VermilionCity_EventScript_CheckTicket:: @ 8166BA0
VermilionCity_EventScript_CheckTicket::
textcolor 0
applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
@@ -212,13 +212,13 @@ VermilionCity_EventScript_CheckTicket:: @ 8166BA0
releaseall
end
VermilionCity_EventScript_DontHaveSSTicket:: @ 8166BDE
VermilionCity_EventScript_DontHaveSSTicket::
msgbox VermilionCity_Text_DontHaveNeededSSTicket
closemessage
goto VermilionCity_EventScript_WalkUpPier
end
VermilionCity_EventScript_CheckSeagallopPresentTrigger:: @ 8166BED
VermilionCity_EventScript_CheckSeagallopPresentTrigger::
setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestRainbowPass
@@ -229,11 +229,11 @@ VermilionCity_EventScript_CheckSeagallopPresentTrigger:: @ 8166BED
goto VermilionCity_EventScript_WalkUpPier
end
VermilionCity_EventScript_Sailor:: @ 8166C17
VermilionCity_EventScript_Sailor::
msgbox VermilionCity_Text_SSAnneVisitsOnceAYear, MSGBOX_NPC
end
VermilionCity_EventScript_OaksAide:: @ 8166C20
VermilionCity_EventScript_OaksAide::
lock
faceplayer
setflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION
@@ -241,11 +241,11 @@ VermilionCity_EventScript_OaksAide:: @ 8166C20
release
end
VermilionCity_EventScript_OldMan2:: @ 8166C2F
VermilionCity_EventScript_OldMan2::
msgbox VermilionCity_Text_BuildingOnThisLand, MSGBOX_NPC
end
VermilionCity_EventScript_Machop:: @ 8166C38
VermilionCity_EventScript_Machop::
lock
faceplayer
waitse
@@ -256,25 +256,25 @@ VermilionCity_EventScript_Machop:: @ 8166C38
release
end
VermilionCity_EventScript_CitySign:: @ 8166C53
VermilionCity_EventScript_CitySign::
msgbox VermilionCity_Text_CitySign, MSGBOX_SIGN
end
VermilionCity_EventScript_SnorlaxNotice:: @ 8166C5C
VermilionCity_EventScript_SnorlaxNotice::
msgbox VermilionCity_Text_SnorlaxBlockingRoute12, MSGBOX_SIGN
end
VermilionCity_EventScript_PokemonFanClubSign:: @ 8166C65
VermilionCity_EventScript_PokemonFanClubSign::
msgbox VermilionCity_Text_PokemonFanClubSign, MSGBOX_SIGN
end
VermilionCity_EventScript_GymSign:: @ 8166C6E
VermilionCity_EventScript_GymSign::
lockall
famechecker FAMECHECKER_LTSURGE, 0
msgbox VermilionCity_Text_GymSign
releaseall
end
VermilionCity_EventScript_HarborSign:: @ 8166C86
VermilionCity_EventScript_HarborSign::
msgbox VermilionCity_Text_VermilionHarbor, MSGBOX_SIGN
end