summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-03 15:05:19 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-03 15:22:04 -0500
commit10beeb3c0611b9114a8e5ff6ab0b8c5d7716defe (patch)
tree849a489313f516c3e4f51b18969824543debf7a2 /wram.asm
parentb1dc88b7281e0486cb952c8f8c62dab705eb4b9d (diff)
Battle Tower
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm24
1 files changed, 9 insertions, 15 deletions
diff --git a/wram.asm b/wram.asm
index 8ec526bbd..ab0cd5d11 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2645,23 +2645,17 @@ w3_d000:: ; d000
BT_OTrainer::
w3_d100:: ; BattleTower OpponentTrainer-Data (length = 0xe0 = $a + $1 + 3*$3b + $24)
BT_OTrainer_Name::
- ds $A
+ ds NAME_LENGTH + -1
BT_OTrainer_TrainerClass::
- ds $1
-BT_OTPkmn1:: ; w3_d10b
- ds $1
-BT_OTPkmn1Item::
- ds $3b-1
-BT_OTPkmn2:: ; w3_d146
- ds $1
-BT_OTPkmn2Item::
- ds $3b-1
-BT_OTPkmn3:: ; w3_d181
- ds $1
-BT_OTPkmn3Item::
- ds $3b-1
+ 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
- ds $24
+BT_OTrainerData:: ds $24
BT_OTrainerEnd:: ; we_d1e0
ds $20