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

Merge master into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-15 16:11:20 -05:00
parent e92cc7752b 5fff2f2234
commit ea8b1011d3
21 changed files with 135 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
data/scripts/cable_club.inc
View File

@@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365
releaseall
end
EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374
EventScript_BattleColosseum_2P_PlayerSpot0:: @ 8277374
setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E
EventScript_BattleColosseum_2P_PlayerSpot1:: @ 827737E
setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
EventScript_BattleColosseum_4P_PlayerSpot0:: @ 8277388
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
EventScript_BattleColosseum_4P_PlayerSpot1:: @ 82773A3
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
EventScript_BattleColosseum_4P_PlayerSpot2:: @ 82773BE
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 2
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9
EventScript_BattleColosseum_4P_PlayerSpot3:: @ 82773D9
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 3
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4
EventScript_BattleColosseum_4P_CancelSpotTrigger:: @ 82773F4
end
EventScript_TradeCenter_Chair0:: @ 82773F5
@@ -855,9 +855,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C
closemessage
end
BattleColosseum2P_EventScript_Attendant:: @ 82774A6
BattleColosseum_2P_EventScript_Attendant:: @ 82774A6
special Script_FacePlayer
msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
msgbox BattleColosseum_2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
special Script_ClearHeldMovement
closemessage
end