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

22
engine/battle/read_trainer_attributes.asm
View File

@@ -1,18 +1,18 @@
GetTrainerClassName: ; 3952d
ld hl, RivalName
ld hl, wRivalName
ld a, c
cp RIVAL1
jr z, .rival
ld [CurSpecies], a
ld [wCurSpecies], a
ld a, TRAINER_NAME
ld [wNamedObjectTypeBuffer], a
call GetName
ld de, StringBuffer1
ld de, wStringBuffer1
ret
.rival
ld de, StringBuffer1
ld de, wStringBuffer1
push de
ld bc, NAME_LENGTH
call CopyBytes
@@ -20,35 +20,35 @@ GetTrainerClassName: ; 3952d
ret
GetOTName: ; 39550
ld hl, OTPlayerName
ld hl, wOTPlayerName
ld a, [wLinkMode]
and a
jr nz, .ok
ld hl, RivalName
ld hl, wRivalName
ld a, c
cp RIVAL1
jr z, .ok
ld [CurSpecies], a
ld [wCurSpecies], a
ld a, TRAINER_NAME
ld [wNamedObjectTypeBuffer], a
call GetName
ld hl, StringBuffer1
ld hl, wStringBuffer1
.ok
ld bc, TRAINER_CLASS_NAME_LENGTH
ld de, OTClassName
ld de, wOTClassName
push de
call CopyBytes
pop de
ret
GetTrainerAttributes: ; 3957b
ld a, [TrainerClass]
ld a, [wTrainerClass]
ld c, a
call GetOTName
ld a, [TrainerClass]
ld a, [wTrainerClass]
dec a
ld hl, TrainerClassAttributes + TRNATTR_ITEM1
ld bc, NUM_TRAINER_ATTRIBUTES