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

Merge master into ObjEvent rename

Browse Source
This commit is contained in:
GriffinR
2019-11-25 20:00:04 -05:00
parent 4c52cf9ed1 6efa51f8ad
commit f559fa3fe2
144 changed files with 8322 additions and 8521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
View File

@@ -28,28 +28,23 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
end
BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
special CallFrontierUtilFunc
compare VAR_RESULT, 0
frontier_getbrainstatus
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
call BattleFrontier_BattlePyramidTop_EventScript_242170
call BattleFrontier_EventScript_SetBrainObjectGfx
BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
copyvar VAR_TEMP_C, VAR_RESULT
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
special CallFrontierUtilFunc
frontier_getstatus
switch VAR_TEMP_0
case 0, BattleFrontier_BattlePyramidTop_EventScript_255193
case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66
case 2, BattleFrontier_BattlePyramidTop_EventScript_255193
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
compare VAR_RESULT, 2
case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidTop_EventScript_252B66
case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_255193
frontier_get FRONTIER_DATA_BATTLE_OUTCOME
compare VAR_RESULT, B_OUTCOME_LOST
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 3
compare VAR_RESULT, B_OUTCOME_DREW
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 9
compare VAR_RESULT, B_OUTCOME_FORFEITED
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
end
@@ -73,15 +68,10 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
setvar VAR_0x8005, 1
special CallBattlePyramidFunction
special SavePlayerParty
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special CallFrontierUtilFunc
frontier_setpartyorder FRONTIER_PARTY_SIZE
setvar VAR_TEMP_F, 1
end
@@ -90,7 +80,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
faceplayer
compare VAR_TEMP_D, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255236
compare VAR_TEMP_C, 0
compare VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240
msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT
closemessage
@@ -107,10 +97,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
closemessage
BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
waitstate
end
@@ -130,22 +117,18 @@ BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240
BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
lockall
switch VAR_TEMP_C
case 2, BattleFrontier_BattlePyramidTop_EventScript_255335
case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0
case 4, BattleFrontier_BattlePyramidTop_EventScript_255388
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_255335
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_2552D0
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_255388
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0
special SpawnCameraObject
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_25573E, MSGBOX_DEFAULT
@@ -165,8 +148,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
goto BattleFrontier_BattlePyramidTop_EventScript_252B42
BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
special CallFrontierUtilFunc
frontier_getsymbols
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A
msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT
@@ -174,25 +156,20 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
message BattleFrontier_BattlePyramidTop_Text_2558E9
waitmessage
waitfanfare
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
special CallFrontierUtilFunc
frontier_givesymbol
msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidTop_EventScript_25521A
BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388
special SpawnCameraObject
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, MSGBOX_DEFAULT
@@ -212,8 +189,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
goto BattleFrontier_BattlePyramidTop_EventScript_252B42
BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
special CallFrontierUtilFunc
frontier_getsymbols
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT
@@ -221,8 +197,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
message BattleFrontier_BattlePyramidTop_Text_255B59
waitmessage
waitfanfare
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
special CallFrontierUtilFunc
frontier_givesymbol
msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidTop_EventScript_25521A