Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix wram labels with w, part 2.

Browse Source
This commit is contained in:
luckytyphlosion
2018-01-23 17:39:09 -05:00
parent 79bd48f85c
commit a1951cefc0
323 changed files with 8581 additions and 8581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/events/battle_tower/trainer_text.asm
View File

@@ -1,14 +1,14 @@
BattleTowerText:: ; 11c000
; Print text c for trainer [BT_OTTrainerClass]
; Print text c for trainer [wBT_OTTrainerClass]
; 1: Intro text
; 2: Player lost
; 3: Player won
ld a, [rSVBK]
push af
ld a, BANK(BT_OTTrainerClass)
ld a, BANK(wBT_OTTrainerClass)
ld [rSVBK], a
if DEF(_CRYSTAL11)
ld hl, BT_OTTrainerClass
ld hl, wBT_OTTrainerClass
else
; BUG ALERT
; Instead of loading the Trainer Class, this routine
@@ -16,7 +16,7 @@ else
; uses it to get the gender of the trainer.
; As a consequence, the enemy trainer's dialog will
; always be sampled from the female array.
ld hl, BT_OTName + NAME_LENGTH_JAPANESE - 1
ld hl, wBT_OTName + NAME_LENGTH_JAPANESE - 1
endc
ld a, [hl]
dec a
@@ -53,11 +53,11 @@ endc
ld b, 0
dec c
jr nz, .restore
ld [BT_TrainerTextIndex], a
ld [wBT_TrainerTextIndex], a
jr .okay2
.restore
ld a, [BT_TrainerTextIndex]
ld a, [wBT_TrainerTextIndex]
.okay2
push af