Skip to content

Commit

Permalink
Doc most OnTransitions
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fontbane @huderlem
Fontbane authored and huderlem committed Apr 22, 2019
1 parent dbdb51e commit 2c076f1
Show file tree
Hide file tree
Showing 152 changed files with 318 additions and 318 deletions.
2 changes: 1 addition & 1 deletion data/event_scripts.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ EventScript_MoveMrBrineyToRoute108:: @ 82718B3
end

EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC
clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
clearflag FLAG_DEFEATED_ELITE_4_SIDNEY
clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
clearflag FLAG_DEFEATED_ELITE_4_GLACIA
clearflag FLAG_DEFEATED_ELITE_4_DRAKE
Expand Down
4 changes: 2 additions & 2 deletions data/maps/AquaHideout_B1F/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AquaHideout_B1F_MapScripts:: @ 82339A7
map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_OnTransition
.byte 0

AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
Expand All @@ -14,7 +14,7 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
removeobject VAR_LAST_TALKED
return

AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
AquaHideout_B1F_MapScript1_OnTransition: @ 82339D0
call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3
call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7
end
Expand Down
4 changes: 2 additions & 2 deletions data/maps/AquaHideout_B2F/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AquaHideout_B2F_MapScripts:: @ 8233DCF
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_OnTransition
.byte 0

AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
AquaHideout_B2F_MapScript1_OnTransition: @ 8233DD5
call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF
end

Expand Down
2 changes: 1 addition & 1 deletion data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_OnTransition
.byte 0

BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9
Expand Down
4 changes: 2 additions & 2 deletions data/maps/BirthIsland_Exterior/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BirthIsland_Exterior_MapScripts:: @ 8267F15
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25
.byte 0
Expand All @@ -8,7 +8,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
special sub_813B1D0
end

BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
BirthIsland_Exterior_MapScript1_OnTransition: @ 8267F29
setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0
Expand Down
4 changes: 2 additions & 2 deletions data/maps/CaveOfOrigin_1F/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CaveOfOrigin_1F_MapScripts:: @ 8235768
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_OnTransition
.byte 0

CaveOfOrigin_1F_MapScript1_23576E: @ 823576E
CaveOfOrigin_1F_MapScript1_OnTransition: @ 823576E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1
end
4 changes: 2 additions & 2 deletions data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_OnTransition
.byte 0

CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E
CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_OnTransition: @ 823577E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
end
4 changes: 2 additions & 2 deletions data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_OnTransition
.byte 0

CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E
CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_OnTransition: @ 823578E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
end

4 changes: 2 additions & 2 deletions data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_OnTransition
.byte 0

CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E
CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_OnTransition: @ 823579E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
end

4 changes: 2 additions & 2 deletions data/maps/DewfordTown/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DewfordTown_MapScripts:: @ 81E9507
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_OnTransition
.byte 0

DewfordTown_MapScript1_1E950D: @ 81E950D
DewfordTown_MapScript1_OnTransition: @ 81E950D
setflag FLAG_VISITED_DEWFORD_TOWN
end

Expand Down
4 changes: 2 additions & 2 deletions data/maps/DewfordTown_Gym/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DewfordTown_Gym_MapScripts:: @ 81FC63C
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_OnTransition
.byte 0

DewfordTown_Gym_MapScript1_1FC642: @ 81FC642
DewfordTown_Gym_MapScript1_OnTransition: @ 81FC642
call DewfordTown_Gym_EventScript_1FC648
end

Expand Down
4 changes: 2 additions & 2 deletions data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30
.byte 0

DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E
DewfordTown_PokemonCenter_1F_MapScript1_OnTransition: @ 81FC52E
setrespawn HEAL_LOCATION_DEWFORD_TOWN
call DewfordTown_PokemonCenter_1F_EventScript_2718DE
end
Expand Down
2 changes: 1 addition & 1 deletion data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_OnTransition
.byte 0

DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A
Expand Down
4 changes: 2 additions & 2 deletions data/maps/EverGrandeCity/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
EverGrandeCity_MapScripts:: @ 81E7D1B
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_OnTransition
.byte 0

EverGrandeCity_MapScript1_1E7D21: @ 81E7D21
EverGrandeCity_MapScript1_OnTransition: @ 81E7D21
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
end

Expand Down
4 changes: 2 additions & 2 deletions data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14
.byte 0

EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF
EverGrandeCity_ChampionsRoom_MapScript1_OnTransition: @ 82289FF
call Common_EventScript_SetupRivalGender
end

Expand Down
4 changes: 2 additions & 2 deletions data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
.byte 0

EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
EverGrandeCity_PokemonCenter_1F_MapScript1_OnTransition: @ 8229A3F
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
end
Expand Down
2 changes: 1 addition & 1 deletion data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_OnTransition
.byte 0

EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5
Expand Down
2 changes: 1 addition & 1 deletion data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_OnTransition
.byte 0

EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C
Expand Down
10 changes: 5 additions & 5 deletions data/maps/EverGrandeCity_SidneysRoom/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D
.byte 0

EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
EverGrandeCity_SidneysRoom_MapScript1_OnTransition: @ 8227F16
setflag FLAG_MET_SCOTT_IN_EVERGRANDE
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
end

EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
compare VAR_ELITE_4_STATE, 1
call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
end
Expand Down Expand Up @@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64
lock
faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B
goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B
playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2
Expand All @@ -60,7 +60,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B
end

EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95
setflag FLAG_DEFEATED_ELITE_4_SYDNEY
setflag FLAG_DEFEATED_ELITE_4_SIDNEY
call EverGrandeCity_SidneysRoom_EventScript_2723F8
msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT
release
Expand Down
4 changes: 2 additions & 2 deletions data/maps/FallarborTown/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FallarborTown_MapScripts:: @ 81EB1FA
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_OnTransition
.byte 0

FallarborTown_MapScript1_1EB200: @ 81EB200
FallarborTown_MapScript1_OnTransition: @ 81EB200
setflag FLAG_VISITED_FALLARBOR_TOWN
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
clearflag FLAG_CONTEST_SKETCH_CREATED
Expand Down
4 changes: 2 additions & 2 deletions data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0
.byte 0

FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9
FallarborTown_BattleTentBattleRoom_MapScript1_OnTransition: @ 82008A9
call FallarborTown_BattleTentBattleRoom_EventScript_2008AF
end

Expand Down
4 changes: 2 additions & 2 deletions data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30
.byte 0

FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
FallarborTown_PokemonCenter_1F_MapScript1_OnTransition: @ 8200BD8
setrespawn HEAL_LOCATION_FALLARBOR_TOWN
call FallarborTown_PokemonCenter_1F_EventScript_2718DE
end
Expand Down
2 changes: 1 addition & 1 deletion data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_OnTransition
.byte 0

FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00
Expand Down
4 changes: 2 additions & 2 deletions data/maps/FarawayIsland_Entrance/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FarawayIsland_Entrance_MapScripts:: @ 8267C8E
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_OnTransition
.byte 0

FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
FarawayIsland_Entrance_MapScript1_OnTransition: @ 8267C94
setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND
end

Expand Down
4 changes: 2 additions & 2 deletions data/maps/FarawayIsland_Interior/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FarawayIsland_Interior_MapScripts:: @ 8267CFA
map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F
.byte 0
Expand Down Expand Up @@ -37,7 +37,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
removeobject VAR_LAST_TALKED
return

FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
FarawayIsland_Interior_MapScript1_OnTransition: @ 8267D72
setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0
setvar VAR_TEMP_1, 1
call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86
Expand Down
4 changes: 2 additions & 2 deletions data/maps/FortreeCity/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FortreeCity_MapScripts:: @ 81E25A4
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3
.byte 0

FortreeCity_MapScript1_1E25AF: @ 81E25AF
FortreeCity_MapScript1_OnTransition: @ 81E25AF
setflag FLAG_VISITED_FORTREE_CITY
end

Expand Down
4 changes: 2 additions & 2 deletions data/maps/FortreeCity_Gym/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FortreeCity_Gym_MapScripts:: @ 82165AB
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA
.byte 0

FortreeCity_Gym_MapScript1_2165B6: @ 82165B6
FortreeCity_Gym_MapScript1_OnTransition: @ 82165B6
special RotatingGate_InitPuzzle
end

Expand Down
4 changes: 2 additions & 2 deletions data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30
.byte 0

FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3
FortreeCity_PokemonCenter_1F_MapScript1_OnTransition: @ 82173E3
setrespawn HEAL_LOCATION_FORTREE_CITY
end

Expand Down
2 changes: 1 addition & 1 deletion data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_OnTransition
.byte 0

FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653
Expand Down
4 changes: 2 additions & 2 deletions data/maps/JaggedPass/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
JaggedPass_MapScripts:: @ 8230656
map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666
map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B
map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C
.byte 0

Expand All @@ -20,7 +20,7 @@ JaggedPass_EventScript_230685:: @ 8230685
setvar VAR_JAGGED_PASS_STATE, 1
return

JaggedPass_MapScript1_23068B: @ 823068B
JaggedPass_MapScript1_OnTransition: @ 823068B
compare VAR_JAGGED_PASS_ASH_WEATHER, 1
call_if_eq JaggedPass_EventScript_230697
end
Expand Down
4 changes: 2 additions & 2 deletions data/maps/LavaridgeTown/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
LavaridgeTown_MapScripts:: @ 81EA4D3
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547
.byte 0

LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
LavaridgeTown_MapScript1_OnTransition: @ 81EA4DE
setflag FLAG_VISITED_LAVARIDGE_TOWN
call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
Expand Down
4 changes: 2 additions & 2 deletions data/maps/LavaridgeTown_Gym_1F/scripts.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_OnTransition
.byte 0

LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA
LavaridgeTown_Gym_1F_MapScript1_OnTransition: @ 81FE6FA
call LavaridgeTown_Gym_1F_EventScript_1FE705
call LavaridgeTown_Gym_1F_EventScript_1FE757
end
Expand Down
Loading

0 comments on commit 2c076f1

Please sign in to comment.