diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
| commit | 9f01e33a0428f8a8c206b3f6018f526a41d65b43 (patch) | |
| tree | 7f3c8606ebbe0f882955761a899ec9f819412c17 /engine/gfx | |
| parent | 0bc1e91d217fb1a724c08ed6c5826c2379f10507 (diff) | |
Port miscellaneous recent updates from pokecrystal
Diffstat (limited to 'engine/gfx')
| -rw-r--r-- | engine/gfx/color.asm | 11 | ||||
| -rw-r--r-- | engine/gfx/sgb_layouts.asm | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index d7998019..f8fcffc2 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -247,13 +247,13 @@ Unreferenced_Function91b4: ldh a, [hCGB] and a jr nz, .cgb - ld hl, wc602 + ld hl, wBetaPokerSGBPals jp PushSGBPals .cgb - ld a, [wc606] ; col + ld a, [wBetaPokerSGBCol] ld c, a - ld a, [wc607] ; row + ld a, [wBetaPokerSGBRow] hlcoord 0, 0, wAttrmap ld de, SCREEN_WIDTH .loop @@ -267,7 +267,7 @@ Unreferenced_Function91b4: ld b, $0 add hl, bc lb bc, 6, 4 - ld a, [wc605] ; value + ld a, [wBetaPokerSGBAttr] and $3 call FillBoxCGB call CopyTilemapAtOnce @@ -1236,6 +1236,9 @@ INCLUDE "gfx/diploma/diploma.pal" PartyMenuOBPals: INCLUDE "gfx/stats/party_menu_ob.pal" +UnusedBattleObjectPals: +INCLUDE "gfx/battle_anims/unused_battle_anims.pal" + GSTitleBGPals: IF DEF(_GOLD) INCLUDE "gfx/title/title_bg_gold.pal" diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index db4e929f..561d6063 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -339,7 +339,7 @@ endr .SGB_BetaPoker: ld hl, BlkPacket_9ee5 - ld de, wc602 + ld de, wBetaPokerSGBPals ld bc, PALPACKET_LENGTH call CopyBytes ld hl, PalPacket_BetaPoker |