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
2019-12-06 02:34:54 -05:00
committed by GitHub
parent cb90f22c5e 7beddd16dd
commit c51e0f3bae
106 changed files with 1965 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
View File

@@ -48,8 +48,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
waitmovement 0
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 2
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1
waitmovement 0
@@ -164,9 +163,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
message BattleFrontier_BattlePalaceBattleRoom_Text_25007E
waitmessage
setvar VAR_0x8004, 7
setvar VAR_0x8005, 2
special CallBattlePalaceFunction
palace_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
@@ -233,8 +230,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
setvar VAR_0x8004, 6
special CallBattlePalaceFunction
palace_incrementstreak
frontier_getsymbols
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -269,8 +265,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
setvar VAR_0x8004, 6
special CallBattlePalaceFunction
palace_incrementstreak
frontier_getsymbols
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28