Merge branch 'master' into fix-eventobj
This commit is contained in:
@@ -6,10 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
|
||||
.byte 0
|
||||
|
||||
BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
|
||||
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
|
||||
setvar VAR_0x8005, 200
|
||||
setvar VAR_0x8006, 0
|
||||
special CallBattlePyramidFunction
|
||||
pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS
|
||||
setvar VAR_TEMP_F, 1
|
||||
end
|
||||
|
||||
@@ -64,13 +61,10 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
|
||||
end
|
||||
|
||||
BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
|
||||
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
|
||||
setvar VAR_0x8005, 1
|
||||
special CallBattlePyramidFunction
|
||||
pyramid_save CHALLENGE_STATUS_SAVING
|
||||
special SavePlayerParty
|
||||
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
|
||||
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
|
||||
special CallBattlePyramidFunction
|
||||
pyramid_inittrainers
|
||||
frontier_setpartyorder FRONTIER_PARTY_SIZE
|
||||
setvar VAR_TEMP_F, 1
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user