diff options
author | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:15:46 +0100 |
---|---|---|
committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:15:46 +0100 |
commit | 9457679af8d36a140db7b8832df595e8310e6bb4 (patch) | |
tree | d3bf8b1b424582f66add4f2b8d95f409cfafecb2 /engine/trainer_card.asm | |
parent | e2b378f5e32ea1416fbc9ac5e96d23be244e4a6b (diff) |
Prefix engine_flags wram addresses with w
Diffstat (limited to 'engine/trainer_card.asm')
-rwxr-xr-x | engine/trainer_card.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 01a033650..c4f8e15a6 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -120,7 +120,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7) .KantoCheck: ; unreferenced - ld a, [KantoBadges] + ld a, [wKantoBadges] and a ret z ld a, $4 @@ -166,7 +166,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221) .KantoCheck: ; unreferenced - ld a, [KantoBadges] + ld a, [wKantoBadges] and a ret z ld a, $4 @@ -281,7 +281,7 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a) hlcoord 2, 8 ld de, .StatusTilemap call TrainerCardSetup_PlaceTilemapString - ld a, [StatusFlags] ; pokedex + ld a, [wStatusFlags] bit 0, a ret nz hlcoord 1, 9 @@ -562,7 +562,7 @@ TrainerCard_JohtoBadgesOAM: ; 254c9 ; cycle 1: face tile, in1 tile, in2 tile, in3 tile ; cycle 2: face tile, in1 tile, in2 tile, in3 tile - dw JohtoBadges + dw wJohtoBadges ; Zephyrbadge db $68, $18, 0 |