diff options
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 68 |
1 files changed, 37 insertions, 31 deletions
@@ -129,6 +129,22 @@ channel_struct: MACRO ds 1 ; c132 ENDM +battle_tower_struct: MACRO +\1Name:: ds NAME_LENGTH +- 1 +\1TrainerClass:: ds 1 +\1Pkmn1:: party_struct \1Pkmn1 +\1Pkmn1Name:: ds PKMN_NAME_LENGTH +\1Pkmn1NameEnd:: +\1Pkmn2:: party_struct \1Pkmn2 +\1Pkmn2Name:: ds PKMN_NAME_LENGTH +\1Pkmn2NameEnd:: +\1Pkmn3:: party_struct \1Pkmn3 +\1Pkmn3Name:: ds PKMN_NAME_LENGTH +\1Pkmn3NameEnd:: +\1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH +\1TrainerEnd:: +endm + INCLUDE "vram.asm" SECTION "Stack", WRAM0 @@ -435,10 +451,12 @@ wOddEggName:: ds PKMN_NAME_LENGTH wOddEggOTName:: ds PKMN_NAME_LENGTH ds -70 +wBT_OTTemp:: battle_tower_struct wBT_OTTemp + ds -BATTLE_TOWER_STRUCT_LENGTH + wMisc:: wBattle:: wc608:: -wBT_OTTempCopy:: ; used to copy the data of the BattleTower-Trainer and the 3 Pkmn wEnemyMoveStruct:: ds MOVE_LENGTH ; c608 wc60f:: @@ -888,21 +906,21 @@ wMiscEnd:: wc7e8:: ds 24 -RSSET 0 ; Offsets for wBT_OTTempCopy:: @ $c608 -wBT_OTTempCopy_0 RB NAME_LENGTH + -1 ; $c608 -wBT_OTTempCopy_TrainerClass RB 1 ; $c608 + $a = $c612 -wBT_OTTempCopy_Pkmn1 RB $30 ; PARTYMON_STRUCT_LENGTH ; $c608 + $b = $c613 -wBT_OTTempCopy_Pkmn1Name RB PKMN_NAME_LENGTH + -1 ; $c608 + $45 = $c64d -wBT_OTTempCopy_45 RB 1 -wBT_OTTempCopy_Pkmn2 RB $30 ; PARTYMON_STRUCT_LENGTH ; $c608 + $46 = $c64e -wBT_OTTempCopy_Pkmn2Name RB PKMN_NAME_LENGTH + -1 ; $c608 + $76 = $c67e -wBT_OTTempCopy_80 RB 1 -wBT_OTTempCopy_Pkmn3 RB $30 ; PARTYMON_STRUCT_LENGTH ; $c608 + $81 = $c689 -wBT_OTTempCopy_Pkmn3Name RB PKMN_NAME_LENGTH + -1 ; $c608 + $b1 = $c6b9 -wBT_OTTempCopy_BB RB 1 +RSSET 0 ; Offsets for wBT_OTTemp:: @ $c608 +wBT_OTTemp_0 RB NAME_LENGTH + -1 ; $c608 +wBT_OTTemp_TrainerClass RB 1 ; $c608 + $a = $c612 +wBT_OTTemp_Pkmn1 RB $30 ; PARTYMON_STRUCT_LENGTH ; $c608 + $b = $c613 +wBT_OTTemp_Pkmn1Name RB PKMN_NAME_LENGTH + -1 ; $c608 + $45 = $c64d +wBT_OTTemp_45 RB 1 +wBT_OTTemp_Pkmn2 RB $30 ; PARTYMON_STRUCT_LENGTH ; $c608 + $46 = $c64e +wBT_OTTemp_Pkmn2Name RB PKMN_NAME_LENGTH + -1 ; $c608 + $76 = $c67e +wBT_OTTemp_80 RB 1 +wBT_OTTemp_Pkmn3 RB $30 ; PARTYMON_STRUCT_LENGTH ; $c608 + $81 = $c689 +wBT_OTTemp_Pkmn3Name RB PKMN_NAME_LENGTH + -1 ; $c608 + $b1 = $c6b9 +wBT_OTTemp_BB RB 1 -GLOBAL wBT_OTTempCopy_TrainerClass, wBT_OTTempCopy_Pkmn1, wBT_OTTempCopy_Pkmn1Name, wBT_OTTempCopy_Pkmn2, wBT_OTTempCopy_Pkmn2Name, wBT_OTTempCopy_Pkmn3, wBT_OTTempCopy_Pkmn3Name -GLOBAL wBT_OTTempCopy_45, wBT_OTTempCopy_80, wBT_OTTempCopy_BB +GLOBAL wBT_OTTemp_TrainerClass, wBT_OTTemp_Pkmn1, wBT_OTTemp_Pkmn1Name, wBT_OTTemp_Pkmn2, wBT_OTTemp_Pkmn2Name, wBT_OTTemp_Pkmn3, wBT_OTTemp_Pkmn3Name +GLOBAL wBT_OTTemp_45, wBT_OTTemp_80, wBT_OTTemp_BB @@ -1205,7 +1223,8 @@ CurMove:: wNamedObjectTypeBuffer:: ds 1 ds 1 -wJumptableIndex:: ds 1 +wJumptableIndex:: +wcf63:: ds 1 wNrOfBeatenBattleTowerTrainers:: wMomBankDigitCursorPosition:: wIntroSceneFrameCounter:: @@ -2695,22 +2714,9 @@ w3_d000:: ; d000 w3_d090:: ds $70 -BT_OTrainer:: w3_d100:: ; BattleTower OpponentTrainer-Data (length = 0xe0 = $a + $1 + 3*$3b + $24) -BT_OTrainer_Name:: - ds NAME_LENGTH + -1 -BT_OTrainer_TrainerClass:: - ds 1 -BT_OTPkmn1:: party_struct BT_OTPkmn1 -BT_OTPkmn1Name:: ds PKMN_NAME_LENGTH -BT_OTPkmn2:: party_struct BT_OTPkmn2 -BT_OTPkmn2Name:: ds PKMN_NAME_LENGTH -BT_OTPkmn3:: party_struct BT_OTPkmn3 -BT_OTPkmn3Name:: ds PKMN_NAME_LENGTH - -BT_OTrainerData:: ds $24 -BT_OTrainerEnd:: ; w3_d1e0 - +BT_OTTrainer:: battle_tower_struct BT_OT +; d1e0 ds $20 BT_TrainerTextIndex:: ds $600 |