diff options
Diffstat (limited to 'engine/gfx/sgb_layouts.asm')
| -rw-r--r-- | engine/gfx/sgb_layouts.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index 8e86210f..93673068 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -3,11 +3,11 @@ LoadSGBLayout: jp nz, LoadSGBLayoutCGB ld a, b - cp SCGB_RAM - jr nz, .not_ram - ld a, [wSGBPredef] -.not_ram - cp SCGB_PARTY_MENU_HP_PALS + cp SCGB_DEFAULT + jr nz, .not_default + ld a, [wDefaultSGBLayout] +.not_default + cp SCGB_PARTY_MENU_HP_BARS jp z, SGB_ApplyPartyMenuHPPals ld l, a ld h, 0 @@ -131,7 +131,7 @@ LoadSGBLayout: ld hl, wSGBPals ld de, wSGBPals + PALPACKET_LENGTH ld a, SCGB_BATTLE_COLORS - ld [wSGBPredef], a + ld [wDefaultSGBLayout], a ret .SGB_MoveList: @@ -324,7 +324,7 @@ endr ld hl, PalPacket_GSTitleScreen ld de, BlkPacket_GSTitleScreen ld a, SCGB_DIPLOMA - ld [wSGBPredef], a + ld [wDefaultSGBLayout], a ret .SGB_MagnetTrain: @@ -356,7 +356,7 @@ endr ld [hld], a ld de, BlkPacket_9ee5 ld a, SCGB_MAPPALS - ld [wSGBPredef], a + ld [wDefaultSGBLayout], a ret .SGB_Evolution: |