ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-26 21:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix map script names

Browse Source
This commit is contained in:
GriffinR 2019-10-13 15:40:15 -04:00
parent 70d1d8956e
commit 60a9dc6a0e
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
View File

@ -1,14 +1,14 @@
EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_OnFrame
.byte 0
EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF
call Common_EventScript_SetupRivalGfxId
end
EverGrandeCity_ChampionsRoom_MapScript2_OnWarp: @ 8228A05
EverGrandeCity_ChampionsRoom_OnWarp: @ 8228A05
map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth
.2byte 0
@ -16,7 +16,7 @@ EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 8228A0F
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
EverGrandeCity_ChampionsRoom_MapScript2_OnFrame: @ 8228A14
EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14
map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_EnterRoom
.2byte 0

12
data/maps/EverGrandeCity_DrakesRoom/scripts.inc
View File

@ -1,11 +1,11 @@
EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_OnFrame
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_OnLoad
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
.byte 0
@ Unused, Drake uses Sidneys identical OnWarp for some reason
EverGrandeCity_DrakesRoom_MapScript2_OnWarp: @ 82286AC
EverGrandeCity_DrakesRoom_OnWarp: @ 82286AC
map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth
.2byte 0
@ -13,7 +13,7 @@ EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 82286B6
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
EverGrandeCity_DrakesRoom_MapScript2_OnFrame: @ 82286BB
EverGrandeCity_DrakesRoom_OnFrame: @ 82286BB
map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor
.2byte 0
@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor:: @ 82286C5
releaseall
end
EverGrandeCity_DrakesRoom_MapScript1_OnLoad: @ 82286D2
EverGrandeCity_DrakesRoom_OnLoad: @ 82286D2
call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom
compare VAR_ELITE_4_STATE, 4
call_if_eq EverGrandeCity_DrakesRoom_EventScript_CloseDoor

12
data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
View File

@ -1,10 +1,10 @@
EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_OnFrame
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_OnLoad
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_OnWarp
.byte 0
EverGrandeCity_GlaciasRoom_MapScript2_OnWarp: @ 8228422
EverGrandeCity_GlaciasRoom_OnWarp: @ 8228422
map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth
.2byte 0
@ -12,7 +12,7 @@ EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 822842C
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
EverGrandeCity_GlaciasRoom_MapScript2_OnFrame: @ 8228431
EverGrandeCity_GlaciasRoom_OnFrame: @ 8228431
map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor
.2byte 0
@ -23,7 +23,7 @@ EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor:: @ 822843B
releaseall
end
EverGrandeCity_GlaciasRoom_MapScript1_OnLoad: @ 8228448
EverGrandeCity_GlaciasRoom_OnLoad: @ 8228448
call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom
compare VAR_ELITE_4_STATE, 3
call_if_eq EverGrandeCity_GlaciasRoom_EventScript_CloseDoor

12
data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
View File

@ -1,10 +1,10 @@
EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_OnLoad
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_OnFrame
.byte 0
EverGrandeCity_PhoebesRoom_MapScript2_OnWarp: @ 8228184
EverGrandeCity_PhoebesRoom_OnWarp: @ 8228184
map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth
.2byte 0
@ -12,7 +12,7 @@ EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 822818E
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
EverGrandeCity_PhoebesRoom_MapScript2_OnFrame: @ 8228193
EverGrandeCity_PhoebesRoom_OnFrame: @ 8228193
map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor
.2byte 0
@ -23,7 +23,7 @@ EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor:: @ 822819D
releaseall
end
EverGrandeCity_PhoebesRoom_MapScript1_OnLoad: @ 82281AA
EverGrandeCity_PhoebesRoom_OnLoad: @ 82281AA
call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom
compare VAR_ELITE_4_STATE, 2
call_if_eq EverGrandeCity_PhoebesRoom_EventScript_CloseDoor

12
data/maps/EverGrandeCity_SidneysRoom/scripts.inc
View File

@ -1,8 +1,8 @@
EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_OnLoad
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_OnFrame
.byte 0
EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16
@ -10,7 +10,7 @@ EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
end
EverGrandeCity_SidneysRoom_MapScript1_OnLoad: @ 8227F1D
EverGrandeCity_SidneysRoom_OnLoad: @ 8227F1D
call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom
compare VAR_ELITE_4_STATE, 1
call_if_eq EverGrandeCity_SidneysRoom_EventScript_CloseDoor
@ -24,7 +24,7 @@ EverGrandeCity_SidneysRoom_EventScript_CloseDoor:: @ 8227F38
call PokemonLeague_EliteFour_EventScript_CloseDoor
return
EverGrandeCity_SidneysRoom_MapScript2_OnWarp: @ 8227F3E
EverGrandeCity_SidneysRoom_OnWarp: @ 8227F3E
map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth
.2byte 0
@ -32,7 +32,7 @@ EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 8227F48
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
EverGrandeCity_SidneysRoom_MapScript2_OnFrame: @ 8227F4D
EverGrandeCity_SidneysRoom_OnFrame: @ 8227F4D
map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor
.2byte 0