diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-19 21:36:23 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-19 21:36:23 -0400 |
| commit | 0def3b67fa0a64bc2e2778c99c53e1a77cbf302c (patch) | |
| tree | c70beb8a39f122cad0753a2f4974ac6d1712e3f6 /engine/gfx | |
| parent | 7b63a9c032a130a08fc554b9b6790fe47d170530 (diff) | |
Start adding engine/battle/core.asm.
Diffstat (limited to 'engine/gfx')
| -rwxr-xr-x | engine/gfx/cgb_layouts.asm | 2 | ||||
| -rwxr-xr-x | engine/gfx/color.asm | 6 | ||||
| -rwxr-xr-x | engine/gfx/sgb_layouts.asm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index cbc8d203..4392fed1 100755 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -84,7 +84,7 @@ Function9399: ; 9399 (2:5399) call Function9bba push hl call Function9adb - ld a, [wcc9a] + ld a, [wEnemyHPPal] ld l, a ld h, $0 add hl, hl diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 10507851..a807ff09 100755 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -586,17 +586,17 @@ Function9b9c: ; 9b9c (2:5b9c) Function9ba9: ; 9ba9 (2:5ba9) push de - farcall Function3d8f5 + farcall GetPartyMonDVs ld c, l ld b, h - ld a, [wd0ee] + ld a, [wTempBattleMonSpecies] call Function9bcb pop de ret Function9bba: ; 9bba (2:5bba) push de - farcall Function3d907 + farcall GetEnemyMonDVs ld c, l ld b, h ld a, [wTempEnemyMonSpecies] diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index e94ad9fc..623bbbca 100755 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -81,7 +81,7 @@ Function8c97: ; 8c97 (2:4c97) ld [wccae], a ld a, [hl] ld [wccaf], a - ld a, [wcc9a] + ld a, [wEnemyHPPal] ld l, a ld h, $0 add hl, hl |