diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-08 16:06:13 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-08 16:06:13 -0500 |
| commit | 5b7fc7b0fabec8461c9931cc31a15bf0b28cfe86 (patch) | |
| tree | 535a2270f8b01f98f5d00db0a5c8c5dd17d66b11 /maps | |
| parent | 0549e3413f61e1166441f1630f4d5f2be25e9974 (diff) | |
More battle tower shenanigans
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BattleTower1F.asm | 4 | ||||
| -rw-r--r-- | maps/BattleTowerBattleRoom.asm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index ffd7f3840..c33c3fedc 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -97,7 +97,7 @@ Script_ChoseChallenge: ; 0x9e40f writetext Text_RightThisWayToYourBattleRoom waitbutton closetext - writebyte BATTLETOWERACTION_1E + writebyte BATTLETOWERACTION_CHOOSEREWARD special BattleTowerAction jump Script_WalkToBattleTowerElevator @@ -124,7 +124,7 @@ Script_WalkToBattleTowerElevator: Script_GivePlayerHisPrize: ; 0x9e47a writebyte BATTLETOWERACTION_1C special BattleTowerAction - writebyte BATTLETOWERACTION_1B + writebyte BATTLETOWERACTION_GIVEREWARD special BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull itemtotext $0, $1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index faa45fea2..a264f51d5 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -24,7 +24,7 @@ Script_BattleRoom: ; 0x9f421 applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 - writebyte $2 + writebyte BATTLETOWERBATTLEROOM_YOUNGSTER special Function_LoadOpponentTrainerAndPokemonsWithOTSprite appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound @@ -71,9 +71,9 @@ Script_DontBattleNextOpponent: ; 0x9f483 iffalse Script_DontSaveAndEndTheSession writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group special BattleTowerAction - writebyte BATTLETOWERACTION_CHOOSEREWARD ; choose reward + writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward special BattleTowerAction - writebyte BATTLETOWERACTION_03 ; quicksave + writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave special BattleTowerAction playsound SFX_SAVE waitsfx |