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

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2019-12-11 01:09:06 -05:00
committed by GitHub
parent 8da7a94423 49f1a90534
commit 6556b556dd
63 changed files with 2120 additions and 2142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+14 -14
View File
@@ -1,25 +1,25 @@
BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_OnWarp
.byte 0
BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786
BattleFrontier_BattlePikeCorridor_OnFrame: @ 825C77C
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor
.2byte 0
BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
delay 16
frontier_set FRONTIER_DATA_BATTLE_NUM, 1
pike_cleartrainerids
pike_nohealing TRUE
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B
applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor
applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor
waitmovement 0
lockall
msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT
closemessage
releaseall
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor
waitmovement 0
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
call BattleFrontier_BattlePike_EventScript_CloseCurtain
@@ -27,27 +27,27 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
waitstate
end
BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801
BattleFrontier_BattlePikeCorridor_OnWarp: @ 825C7F7
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth
.2byte 0
BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth:: @ 825C801
setvar VAR_TEMP_1, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B
BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor: @ 825C80B
walk_up
walk_up
step_end
BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E
BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor: @ 825C80E
walk_up
walk_up
set_invisible
step_end
BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812
BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor: @ 825C812
walk_up
walk_up
walk_left