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

60
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
View File

@@ -1,89 +1,89 @@
BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_OnWarp
.byte 0
BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0
BattleFrontier_BattleTowerElevator_OnFrame: @ 82419E6
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_EnterElevator
.2byte 0
BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter
waitmovement 0
special BufferBattleTowerElevatorFloors
waitse
special MoveElevator
waitstate
delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantExit
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit
waitmovement 0
call BattleFrontier_BattleTowerElevator_EventScript_241A28
call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom
end
BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28
BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: @ 8241A28
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti
return
BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor:: @ 8241A55
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1
waitstate
return
BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F
goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_241A7C
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti:: @ 8241A5F
goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
waitstate
return
BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti:: @ 8241A72
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
waitstate
return
BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1
BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom:: @ 8241A7C
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 1
waitstate
return
BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86
BattleFrontier_BattleTowerElevator_Movement_AttendantEnter: @ 8241A86
walk_up
walk_right
face_down
step_end
BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A
BattleFrontier_BattleTowerElevator_Movement_PlayerEnter: @ 8241A8A
walk_up
walk_up
face_down
step_end
BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E
BattleFrontier_BattleTowerElevator_Movement_AttendantExit: @ 8241A8E
walk_down
walk_down
set_invisible
step_end
BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92
BattleFrontier_BattleTowerElevator_Movement_PlayerExit: @ 8241A92
walk_right
walk_down
walk_down
step_end
BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0
BattleFrontier_BattleTowerElevator_OnWarp: @ 8241A96
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth
.2byte 0
BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0
setvar VAR_TEMP_1, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end