diff options
| author | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
| commit | a02a98ee7ada1a658e28698484058be2796dc0df (patch) | |
| tree | 945986054565bd8b5212fc755415096050d1d3a8 /engine/printer/printer2.asm | |
| parent | Use long option flags for rgbgfx, same as tools/gfx (diff) | |
| parent | Use `const_skip` (diff) | |
| download | pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/printer/printer2.asm')
| -rw-r--r-- | engine/printer/printer2.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/printer/printer2.asm b/engine/printer/printer2.asm index 4a7b68db..944cee0f 100644 --- a/engine/printer/printer2.asm +++ b/engine/printer/printer2.asm @@ -42,9 +42,9 @@ Printer_GetMonStats: lb bc, 2, 3 call PrintNumber - ld a, [wMonHeader] - ld [wPokeBallAnimData], a - ld [wd0b5], a + ld a, [wMonHIndex] + ld [wPokedexNum], a + ld [wCurSpecies], a ld hl, wPartyMonNicks call .GetNamePointer hlcoord 8, 2 @@ -60,7 +60,7 @@ Printer_GetMonStats: inc hl ld [hl], $f2 inc hl - ld de, wPokeBallAnimData + ld de, wPokedexNum lb bc, $80 | 1, 3 call PrintNumber @@ -85,11 +85,11 @@ Printer_GetMonStats: hlcoord 9, 8 ld de, .Stats ldh a, [hUILayoutFlags] - set 2, a + set BIT_SINGLE_SPACED_LINES, a ldh [hUILayoutFlags], a call PlaceString ldh a, [hUILayoutFlags] - res 2, a + res BIT_SINGLE_SPACED_LINES, a ldh [hUILayoutFlags], a hlcoord 16, 8 @@ -151,7 +151,7 @@ Printer_GetMonStats: .PlaceMoveName: and a jr z, .no_move - ld [wPokeBallAnimData], a + ld [wNamedObjectIndex], a call GetMoveName jr .place_string |