diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-28 15:09:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-28 15:09:14 -0400 |
| commit | bc09f81a9a6a8280480a08e0daf33541ba255fb4 (patch) | |
| tree | e520f5c382fa2b3bac99508a0b795b135317dec7 | |
| parent | c9bf136d8a3b77e4c3fd9749112b641e7332bbe7 (diff) | |
| parent | 5b12c6f1e7f1d02c4a47d0069c87b795bf5c2ccc (diff) | |
Merge pull request #747 from camthesaxman/graphics_fix
combine graphics data that should be in the same object
| -rw-r--r-- | graphics/birch_speech/bg2.pal | 10 | ||||
| -rw-r--r-- | graphics/birch_speech/blank_pal.pal | 11 | ||||
| -rw-r--r-- | misc.mk | 7 | ||||
| -rw-r--r-- | src/data/graphics.c | 11 | ||||
| -rw-r--r-- | src/main_menu.c | 3 |
5 files changed, 18 insertions, 24 deletions
diff --git a/graphics/birch_speech/bg2.pal b/graphics/birch_speech/bg2.pal index 3457f9b45..33f619ee4 100644 --- a/graphics/birch_speech/bg2.pal +++ b/graphics/birch_speech/bg2.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -8 +16 255 255 164 255 255 106 222 222 90 @@ -9,3 +9,11 @@ JASC-PAL 123 123 49 90 90 32 57 57 16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/birch_speech/blank_pal.pal b/graphics/birch_speech/blank_pal.pal deleted file mode 100644 index 7dc528e38..000000000 --- a/graphics/birch_speech/blank_pal.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 @@ -111,6 +111,13 @@ $(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbe @cat $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp >$@ +#### Battle Interface #### + +BATTLEINTERFACEDIR := graphics/battle_interface + +$(BATTLEINTERFACEDIR)/healthbox_elements.4bpp: $(BATTLEINTERFACEDIR)/hpbar.4bpp $(BATTLEINTERFACEDIR)/expbar.4bpp $(BATTLEINTERFACEDIR)/status_psn.4bpp $(BATTLEINTERFACEDIR)/status_par.4bpp $(BATTLEINTERFACEDIR)/status_slp.4bpp $(BATTLEINTERFACEDIR)/status_frz.4bpp $(BATTLEINTERFACEDIR)/status_brn.4bpp $(BATTLEINTERFACEDIR)/misc.4bpp $(BATTLEINTERFACEDIR)/hpbar_anim.4bpp $(BATTLEINTERFACEDIR)/misc_frameend.4bpp + cat $^ > $@ + #### PokeNav #### PKNAVGFXDIR := graphics/pokenav diff --git a/src/data/graphics.c b/src/data/graphics.c index 7aa3a4384..ce2f02b2c 100644 --- a/src/data/graphics.c +++ b/src/data/graphics.c @@ -289,16 +289,7 @@ const u8 unused_basic_frame_bin[] = INCBIN_U8("graphics/unused/basic_frame.bin.l const u8 gUnknown_08D1212C[] = INCBIN_U8("graphics/battle_interface/window.gbapal"); const u8 gUnknown_08D1214C[] = INCBIN_U8("graphics/battle_interface/hpbar.gbapal"); -const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpbar.4bpp"); -const u8 gHealthboxElementsGfxTable_ExpBar[] = INCBIN_U8("graphics/battle_interface/expbar.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusPsn[] = INCBIN_U8("graphics/battle_interface/status_psn.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusPar[] = INCBIN_U8("graphics/battle_interface/status_par.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusSlp[] = INCBIN_U8("graphics/battle_interface/status_slp.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusFrz[] = INCBIN_U8("graphics/battle_interface/status_frz.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusBrn[] = INCBIN_U8("graphics/battle_interface/status_brn.4bpp"); -const u8 gHealthboxElementsGfxTable_Misc[] = INCBIN_U8("graphics/battle_interface/misc.4bpp"); -const u8 gHealthboxElementsGfxTable_HpBarAnim[] = INCBIN_U8("graphics/battle_interface/hpbar_anim.4bpp"); -const u8 gHealthboxElementsGfxTable_MiscFrameEnd[] = INCBIN_U8("graphics/battle_interface/misc_frameend.4bpp"); +const u8 gHealthboxElementsGfxTable[][32] = INCBIN_U8("graphics/battle_interface/healthbox_elements.4bpp"); const u8 Tiles_D129AC[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp"); diff --git a/src/main_menu.c b/src/main_menu.c index 93d9be77a..13fdf9f7f 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -138,7 +138,6 @@ static const u16 gUnknown_081E764C[][16] = static const u8 gBirchIntroShadowGfx[] = INCBIN_U8("graphics/birch_speech/shadow.4bpp.lz"); static const u8 gUnknown_081E7834[] = INCBIN_U8("graphics/birch_speech/map.bin.lz"); static const u16 gUnknown_081E795C[] = INCBIN_U16("graphics/birch_speech/bg2.gbapal"); -static const u16 gUnknown_081E796C[] = INCBIN_U16("graphics/birch_speech/blank_pal.gbapal"); static const u16 gMainMenuPalette[] = INCBIN_U16("graphics/misc/main_menu.gbapal"); static const union AffineAnimCmd gSpriteAffineAnim_81E799C[] = @@ -760,7 +759,7 @@ static void Task_NewGameSpeech1(u8 taskId) LZ77UnCompVram(gBirchIntroShadowGfx, (void *)BG_VRAM); LZ77UnCompVram(gUnknown_081E7834, (void *)(BG_VRAM + 0x3800)); LoadPalette(gUnknown_081E764C, 0, 0x40); - LoadPalette(gUnknown_081E796C, 1, 0x10); + LoadPalette(gUnknown_081E795C + 8, 1, 0x10); ScanlineEffect_Stop(); ResetSpriteData(); FreeAllSpritePalettes(); |