dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into ObjEvent rename and prune accidental inclusions

Browse Source
This commit is contained in:
GriffinR
2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
View File

@@ -1,55 +1,52 @@
BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6
map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_OnLoad
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_OnFrame
.byte 0
BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5
BattleFrontier_BattleTowerCorridor_OnLoad: @ 8241AB5
compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor
setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
end
BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3
BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor:: @ 8241AD3
setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
end
BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0
BattleFrontier_BattleTowerCorridor_OnFrame: @ 8241AE6
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor
.2byte 0
BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0
BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
setvar VAR_TEMP_0, 1
compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor
waitmovement 0
goto BattleFrontier_BattleTowerCorridor_EventScript_241B27
goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom
BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36
BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor
waitmovement 0
BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27
BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27
setvar VAR_TEMP_0, 0
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
waitstate
end
BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36
BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor: @ 8241B36
walk_right
BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37
BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor: @ 8241B37
walk_right
walk_right
BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39
BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor: @ 8241B39
walk_right
BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A
BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor: @ 8241B3A
walk_right
walk_right
walk_right