diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
| commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
| tree | 4de98db5a6edb6d74192028d50893da2b764421f /engine/trainer_card.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/trainer_card.asm')
| -rwxr-xr-x | engine/trainer_card.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 6d59660f7..e9d9147f5 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -9,11 +9,11 @@ const TRAINERCARDSTATE_QUIT ; 6 TrainerCard: ; 25105 - ld a, [VramState] + ld a, [wVramState] push af xor a - ld [VramState], a - ld hl, Options + ld [wVramState], a + ld hl, wOptions ld a, [hl] push af set NO_TEXT_SCROLL, [hl] @@ -33,9 +33,9 @@ TrainerCard: ; 25105 .quit pop af - ld [Options], a + ld [wOptions], a pop af - ld [VramState], a + ld [wVramState], a ret .InitRAM: ; 2513b (9:513b) @@ -237,14 +237,14 @@ TrainerCard_PrintTopHalfOfCard: ; 25299 (9:5299) ld de, .ID_No call TrainerCardSetup_PlaceTilemapString hlcoord 7, 2 - ld de, PlayerName + ld de, wPlayerName call PlaceString hlcoord 5, 4 - ld de, PlayerID + ld de, wPlayerID lb bc, PRINTNUM_LEADINGZEROS | 2, 5 call PrintNum hlcoord 7, 6 - ld de, Money + ld de, wMoney lb bc, PRINTNUM_MONEY | 3, 6 call PrintNum hlcoord 1, 3 @@ -278,8 +278,8 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a) hlcoord 10, 15 ld de, .Badges call PlaceString - ld hl, PokedexCaught - ld b, EndPokedexCaught - PokedexCaught + ld hl, wPokedexCaught + ld b, wEndPokedexCaught - wPokedexCaught call CountSetBits ld de, wd265 hlcoord 15, 10 @@ -444,11 +444,11 @@ TrainerCard_Page2_3_PlaceLeadersFaces: ; 253f4 (9:53f4) TrainerCard_Page1_PrintGameTime: ; 25415 (9:5415) hlcoord 11, 12 - ld de, GameTimeHours + ld de, wGameTimeHours lb bc, 2, 4 call PrintNum inc hl - ld de, GameTimeMinutes + ld de, wGameTimeMinutes lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum ld a, [hVBlankCounter] @@ -479,7 +479,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448) ld d, a ld a, [de] ld c, a - ld de, Sprite01 + ld de, wSprite01 ld b, NUM_JOHTO_BADGES .loop srl c |