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

more tower, fail

Browse Source
This commit is contained in:
DizzyEggg
2018-10-21 20:13:12 +02:00
parent 16026fe91d
commit 0ab27e44b1
30 changed files with 628 additions and 1638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_tower.s
View File

@@ -686,7 +686,7 @@ gUnknown_085DF96C:: @ 85DF96C
.4byte ChooseNextBattleTowerTrainer
.4byte sub_81621C0
.4byte sub_816502C
.4byte sub_8164040
.4byte SaveBattleTowerProgress
.4byte sub_8163914
.4byte nullsub_61
.4byte nullsub_116

5
data/event_scripts.s
View File

@@ -7,6 +7,7 @@
#include "constants/vars.h"
#include "constants/heal_locations.h"
#include "constants/trainers.h"
#include "constants/battle_frontier.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
@@ -5126,9 +5127,9 @@ SecretBase_RedCave1_EventScript_27627C:: @ 827627C
SecretBase_RedCave1_EventScript_276286:: @ 8276286
special sub_80EA2E4
setvar VAR_0x8004, 1
setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
compare VAR_RESULT, 3
call_if 1, SecretBase_RedCave1_EventScript_2762BD

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

@@ -89,7 +89,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
waitmovement 0
setvar VAR_0x8004, 5
special sub_8195960
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C
switch VAR_RESULT
@@ -431,9 +431,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
setvar VAR_0x8006, 0
special sub_81A1780
special HealPlayerParty
setvar VAR_0x8004, 5
setvar VAR_0x8004, SPECIAL_BATTLE_ARENA
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
setvar VAR_0x8004, 18
special sub_81A1780

6
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@@ -81,7 +81,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
special sub_8161F74
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
closemessage
setvar VAR_0x8004, 5
special CallBattleDomeFunction
@@ -529,10 +529,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
setvar VAR_0x8006, 0
special sub_81A1780
special HealPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8004, SPECIAL_BATTLE_DOME
setvar VAR_0x8005, 0
setvar VAR_TEMP_9, 1
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
setvar VAR_TEMP_9, 0
setvar VAR_0x8004, 17

10
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View File

@@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
setvar VAR_0x8004, 5
special sub_8195960
lockall
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
setvar VAR_0x8004, 2
@@ -90,9 +90,9 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
setvar VAR_0x8006, 0
special sub_81A1780
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F
@@ -226,9 +226,9 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
setvar VAR_0x8006, 0
special sub_81A1780
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
return

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

@@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
waitmovement 0
setvar VAR_0x8004, 5
special sub_8195960
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
switch VAR_RESULT
@@ -338,9 +338,9 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
setvar VAR_0x8006, 0
special sub_81A1780
special HealPlayerParty
setvar VAR_0x8004, 4
setvar VAR_0x8004, SPECIAL_BATTLE_PALACE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
setvar VAR_0x8004, 18
special sub_81A1780

26
data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
View File

@@ -30,13 +30,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
releaseall
setvar VAR_0x8004, 7
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226
@@ -66,13 +66,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
releaseall
setvar VAR_0x8004, 7
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285
@@ -282,7 +282,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
closemessage
delay 16
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
@@ -290,11 +290,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
setvar VAR_0x8004, 21
setvar VAR_0x8005, 1
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
closemessage
setvar VAR_0x8004, 9
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC
@@ -433,9 +433,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B
closemessage
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
waitmovement 0
setvar VAR_0x8004, 7
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
return
@@ -590,7 +590,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
faceplayer
setvar VAR_0x8004, 14
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
release

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

@@ -228,9 +228,9 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED
closemessage
setvar VAR_0x8004, 10
setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
return

6
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
View File

@@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
special sub_8161F74
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
switch VAR_RESULT
@@ -362,9 +362,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
setvar VAR_0x8006, 0
special sub_81A1780
special HealPlayerParty
setvar VAR_0x8004, 0
setvar VAR_0x8004, SPECIAL_BATTLE_TOWER
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
compare VAR_0x8004, 3

4
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
View File

@@ -78,14 +78,14 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
delay 15
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
setvar VAR_0x8004, 7
setvar VAR_0x8005, 1
special sub_8161F74
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069

2
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
View File

@@ -54,7 +54,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4
setvar VAR_0x8004, 4
special sub_81B99B4
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call FallarborTown_BattleTentBattleRoom_EventScript_257B6C
switch VAR_RESULT

4
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

@@ -264,9 +264,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
setvar VAR_0x8004, 8
setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
setvar VAR_0x8004, 6
special sub_81A1780

6
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
View File

@@ -51,13 +51,13 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
setvar VAR_0x8004, 4
special sub_81B99B4
lockall
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39

6
data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
View File

@@ -16,11 +16,11 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3
waitmovement 0
special sub_8165360
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8004, SPECIAL_BATTLE_EREADER
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
compare VAR_RESULT, 3
call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF

2
data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
View File

@@ -48,7 +48,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
waitmovement 0
setvar VAR_0x8004, 4
special sub_81B99B4
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7
switch VAR_RESULT

2
data/specials.inc
View File

@@ -247,7 +247,7 @@ gSpecials:: @ 81DBA64
def_special CallBattleDomeFunction
def_special sub_8195960
def_special sub_8165360
def_special sub_8163AC4
def_special DoSpecialTrainerBattle
def_special sub_81A5238
def_special sub_81A5E74
def_special sub_81A703C