diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/printer.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/printer.asm')
| -rwxr-xr-x | engine/printer.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/printer.asm b/engine/printer.asm index 4479d5d0b..b9e55ef2a 100755 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -751,7 +751,7 @@ Printer_PrintBoxListSegment: ; 848e7 (21:48e7) cp $ff jp z, .finish ld [wd265], a - ld [CurPartySpecies], a + ld [wCurPartySpecies], a push bc push hl @@ -769,7 +769,7 @@ Printer_PrintBoxListSegment: ; 848e7 (21:48e7) push hl call PlaceString - ld a, [CurPartySpecies] + ld a, [wCurPartySpecies] cp EGG pop hl jr z, .ok2 @@ -850,16 +850,16 @@ Printer_GetMonGender: ; 8498a (21:498a) ld bc, BOXMON_STRUCT_LENGTH ld a, [wWhichBoxMonToPrint] call AddNTimes - ld de, TempMonDVs + ld de, wTempMonDVs ld a, [hli] ld [de], a inc de ld a, [hli] ld [de], a ld a, [wWhichBoxMonToPrint] - ld [CurPartyMon], a + ld [wCurPartyMon], a ld a, TEMPMON - ld [MonType], a + ld [wMonType], a farcall GetGender ld a, " " jr c, .got_gender |