diff options
Diffstat (limited to 'engine/gfx')
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/color.asm | 52 | ||||
| -rw-r--r-- | engine/gfx/load_font.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/load_pics.asm | 2 |
4 files changed, 28 insertions, 30 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 5fb23062..70c4a29c 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -308,7 +308,7 @@ Function95a0: ; unreferenced call LoadHLPaletteIntoDE jr .GotPalette -.GetMonPalette: +.GetMonPalette: ; unreferenced ld bc, wTempMonDVs call GetPlayerOrMonPalettePointer call LoadPalette_White_Col1_Col2_Black diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index d03724f8..fd42d597 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -15,31 +15,31 @@ CheckShininess: ; Attack ld a, [hl] and 1 << SHINY_ATK_BIT - jr z, .NotShiny + jr z, .not_shiny ; Defense ld a, [hli] and $f cp SHINY_DEF_VAL - jr nz, .NotShiny + jr nz, .not_shiny ; Speed ld a, [hl] and $f0 cp SHINY_SPD_VAL << 4 - jr nz, .NotShiny + jr nz, .not_shiny ; Special ld a, [hl] and $f cp SHINY_SPC_VAL - jr nz, .NotShiny + jr nz, .not_shiny -.Shiny: +; shiny scf ret -.NotShiny: +.not_shiny and a ret @@ -49,30 +49,30 @@ Unused_CheckShininess: ; Attack ld a, [hl] cp 10 << 4 - jr c, .NotShiny + jr c, .not_shiny ; Defense ld a, [hli] and $f cp 10 - jr c, .NotShiny + jr c, .not_shiny ; Speed ld a, [hl] cp 10 << 4 - jr c, .NotShiny + jr c, .not_shiny ; Special ld a, [hl] and $f cp 10 - jr c, .NotShiny + jr c, .not_shiny -.Shiny: +; shiny scf ret -.NotShiny: +.not_shiny and a ret @@ -894,7 +894,7 @@ PushSGBBorder: .LoadSGBBorderPointers: ld hl, SGBBorderGFX - ld de, SGBBorderMap + ld de, SGBBorderMapAndPalettes ret SGB_ClearVRAM: @@ -1091,24 +1091,24 @@ INCLUDE "data/sgb_ctrl_packets.asm" PredefPals: INCLUDE "gfx/sgb/predef.pal" -IF DEF(_GOLD) -SGBBorderMap: +SGBBorderMapAndPalettes: ; interleaved tile ids and palette ids, without the center 20x18 screen area +IF DEF(_GOLD) INCBIN "gfx/sgb/gold_border.sgb.tilemap" -SGBBorderPalettes: -; assumed to come after SGBBorderMap -INCLUDE "gfx/sgb/gold_border.pal" -SGBBorderGFX: -INCBIN "gfx/sgb/gold_border.2bpp" - ELIF DEF(_SILVER) -SGBBorderMap: -; interleaved tile ids and palette ids, without the center 20x18 screen area INCBIN "gfx/sgb/silver_border.sgb.tilemap" -SGBBorderPalettes: -; assumed to come after SGBBorderMap +ENDC +; four SGB palettes of 16 colors each; only the first 4 colors are used +IF DEF(_GOLD) +INCLUDE "gfx/sgb/gold_border.pal" +ELIF DEF(_SILVER) INCLUDE "gfx/sgb/silver_border.pal" +ENDC + SGBBorderGFX: +IF DEF(_GOLD) +INCBIN "gfx/sgb/gold_border.2bpp" +ELIF DEF(_SILVER) INCBIN "gfx/sgb/silver_border.2bpp" ENDC @@ -1225,7 +1225,7 @@ INCLUDE "gfx/diploma/diploma.pal" PartyMenuOBPals: INCLUDE "gfx/stats/party_menu_ob.pal" -UnusedBattleObjectPals: +UnusedBattleObjectPals: ; unreferenced INCLUDE "gfx/battle_anims/unused_battle_anims.pal" GSTitleBGPals: diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm index f8289ded..b41badc2 100644 --- a/engine/gfx/load_font.asm +++ b/engine/gfx/load_font.asm @@ -94,7 +94,7 @@ LoadStatsScreenPageTilesGFX: call Get2bpp ret -LoadFontsBattleLevel: +LoadFontsBattleLevel: ; unreferenced ld de, FontBattleExtra + 14 tiles ld hl, vTiles2 tile "<LV>" ; $6e lb bc, BANK(FontBattleExtra), 1 diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index 9109a7f9..563c0d8b 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -69,7 +69,6 @@ GetFrontpic: cp EGG + 1 ret nc -.is_a_pokemon push de call GetBaseData ld a, [wBasePicSize] @@ -133,7 +132,6 @@ GetMonBackpic: cp EGG + 1 ret nc -.is_a_pokemon push de ld a, BANK(sDecompressBuffer) call OpenSRAM |