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 authored and GitHub committed 2019-12-06 02:34:54 -05:00
2 parents cb90f22c5e 7beddd16dd
commit c51e0f3bae
106 files changed
+1964 -1417
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+1 -2
View File
@@ -52,8 +52,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 7
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter
waitmovement 0