ref: 4cd354ec3285cb24a0ab468c75e466b670036bbe
parent: 2f4a0179feb846ac2eba945ba5365d0ebf6a6179
author: JimB16 <f1@jimb.de>
date: Tue Aug 25 23:11:19 EDT 2015
fixed the BT_OTrainer Labels
--- a/data/battle_tower.asm
+++ b/data/battle_tower.asm
@@ -3,15 +3,22 @@
push af
ld a, $3
ld [rSVBK], a
+
+ ; Fill BT_OTrainer with zeros
xor a
- ld hl, w3_d100
- ld bc, $00e0
+ ld hl, BT_OTrainer
+ ld bc, BT_OTrainerEnd - BT_OTrainer
call ByteFill
+
+ ; Write $ff into the Item-Slots
ld a, $ff
- ld [w3_d100 + $0c], a
- ld [w3_d100 + $47], a
- ld [w3_d100 + $82], a
- ld de, w3_d100
+ ld [BT_OTPkmn1Item], a
+ ld [BT_OTPkmn2Item], a
+ ld [BT_OTPkmn3Item], a
+
+ ; Set BT_OTTrainer as start address to write the following data to
+ ld de, BT_OTrainer
+
ld a, [hRandomAdd]
ld b, a
.asm_1f8022 ; loop to find a random trainer
@@ -110,22 +117,22 @@
ld b, a
ld a, [hld]
ld c, a
- ld a, [w3_d100 + $0b]
+ ld a, [BT_OTPkmn1]
cp b
jr z, .FindARandomBattleTowerPkmn
- ld a, [w3_d100 + $0c]
+ ld a, [BT_OTPkmn1Item]
cp c
jr z, .FindARandomBattleTowerPkmn
- ld a, [w3_d100 + $46]
+ ld a, [BT_OTPkmn2]
cp b
jr z, .FindARandomBattleTowerPkmn
- ld a, [w3_d100 + $47]
+ ld a, [BT_OTPkmn2Item]
cp c
jr z, .FindARandomBattleTowerPkmn
- ld a, [w3_d100 + $81]
+ ld a, [BT_OTPkmn3]
cp b
jr z, .FindARandomBattleTowerPkmn
- ld a, [w3_d100 + $82]
+ ld a, [BT_OTPkmn3Item]
cp c
jr z, .FindARandomBattleTowerPkmn
ld a, [sBTPkmnPrevTrainer1]
@@ -178,11 +185,11 @@
ld [sBTPkmnPrevPrevTrainer2], a
ld a, [sBTPkmnPrevTrainer3]
ld [sBTPkmnPrevPrevTrainer3], a
- ld a, [w3_d100 + $0b]
+ ld a, [BT_OTPkmn1]
ld [sBTPkmnPrevTrainer1], a
- ld a, [w3_d100 + $46]
+ ld a, [BT_OTPkmn2]
ld [sBTPkmnPrevTrainer2], a
- ld a, [w3_d100 + $81]
+ ld a, [BT_OTPkmn3]
ld [sBTPkmnPrevTrainer3], a
call CloseSRAM
ret
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -23170,9 +23170,9 @@
push af
ld a, $3
ld [rSVBK], a
- ld hl, LYOverrides
+ ld hl, $d100 ; this is NOT LYOverrides
ld de, $c608
- ld bc, $00e0
+ ld bc, BT_OTrainerEnd - BT_OTrainer
call CopyBytes
pop af
ld [rSVBK], a
--- a/wram.asm
+++ b/wram.asm
@@ -2600,22 +2600,25 @@
ds $100
+BT_OTrainer::
w3_d100:: ; BattleTower OpponentTrainer-Data (lengt = 0xe0)
ds $6
-BT_OTTrainerPkmn1:: ; w3_d10b
+ ds $5
+BT_OTPkmn1:: ; w3_d10b
ds $1
-BT_OTTrainerPkmn1Item::
+BT_OTPkmn1Item::
ds $3b-1
-BT_OTTrainerPkmn2:: ; w3_d146
+BT_OTPkmn2:: ; w3_d146
ds $1
-BT_OTTrainerPkmn2Item::
+BT_OTPkmn2Item::
ds $3b-1
-BT_OTTrainerPkmn3:: ; w3_d181
+BT_OTPkmn3:: ; w3_d181
ds $1
-BT_OTTrainerPkmn3Item::
+BT_OTPkmn3Item::
ds $3b-1
- ds $29
+ ds $24
+BT_OTrainerEnd::
ds $620