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

102
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
View File

@@ -10,8 +10,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
end
BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
special CallFrontierUtilFunc
frontier_settrainers
call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE
end
@@ -40,18 +39,13 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2
waitmovement 0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
setvar VAR_TEMP_2, 1
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 1
goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
@@ -109,23 +103,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB
msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT
BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
waitstate
BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
switch VAR_RESULT
case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7
@@ -138,22 +124,17 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT
special LoadPlayerParty
special SavePlayerParty
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special CallFrontierUtilFunc
frontier_setpartyorder FRONTIER_PARTY_SIZE
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
special CallFrontierUtilFunc
frontier_getbrainstatus
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257870
compare VAR_RESULT, 2
@@ -195,7 +176,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E
case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0
call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4
call BattleFrontier_EventScript_SaveBattle
goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA
@@ -224,10 +205,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A
BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852
delay 60
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_ARENA_LOBBY, 255, 7, 8
waitstate
@@ -270,8 +248,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
playse SE_SAVE
waitse
fadescreen 1
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
special CallFrontierUtilFunc
frontier_reset
end
BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC
@@ -303,7 +280,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B
case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
call BattleFrontier_BattleArenaBattleRoom_EventScript_242170
call BattleFrontier_EventScript_SetBrainObjectGfx
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
waitmovement 0
@@ -327,19 +304,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2
waitmovement 0
switch VAR_TEMP_F
case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5
case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, MSGBOX_DEFAULT
@@ -357,8 +330,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
special CallFrontierUtilFunc
frontier_getsymbols
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
@@ -368,22 +340,17 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
message BattleFrontier_BattleArenaBattleRoom_Text_25819C
waitmessage
waitfanfare
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
special CallFrontierUtilFunc
frontier_givesymbol
msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, MSGBOX_DEFAULT
goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
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_BattleArenaBattleRoom_EventScript_257AF8
msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, MSGBOX_DEFAULT
@@ -401,8 +368,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
special CallFrontierUtilFunc
frontier_getsymbols
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
@@ -412,8 +378,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
message BattleFrontier_BattleArenaBattleRoom_Text_25835B
waitmessage
waitfanfare
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
special CallFrontierUtilFunc
frontier_givesymbol
msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, MSGBOX_DEFAULT
goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
@@ -426,20 +391,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C
FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
closemessage
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 0
special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_ARENA
setvar VAR_0x8005, 0
special DoSpecialTrainerBattle
waitstate
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18
special CallFrontierUtilFunc
frontier_restorehelditems
special HealPlayerParty
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
special CallFrontierUtilFunc
frontier_resetsketch
return
BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
@@ -453,7 +413,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, MSGBOX_DEFAULT
closemessage
call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA
call BattleFrontier_EventScript_IncrementWinStreak
return
BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2