Game-Decompilation/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2024-11-23 05:20:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Document more of src/graphics.c

Browse Source
This commit is contained in:
cbt6 2023-03-13 23:09:19 +08:00
parent 242bb41682
commit 7a322ba04e
17 changed files with 60 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/battle_anims/masks/unknown_D2EC24.bin → graphics/battle_anims/masks/unused_level_up.bin
View File

0
graphics/battle_anims/masks/unknown_D2EC24.png → graphics/battle_anims/masks/unused_level_up.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

34
graphics/interface/trainer_memo_pal1.pal → graphics/interface/trainer_memo_pal.pal
View File

@ -1,6 +1,6 @@
JASC-PAL
0100
80
112
255 0 255
0 123 197
230 222 156
@ -81,3 +81,35 @@ JASC-PAL
123 131 148
255 255 255
98 106 123
255 0 255
255 255 255
230 230 238
106 230 230
98 106 123
90 213 213
230 205 255
205 172 238
255 0 255
255 0 255
255 255 255
213 213 213
222 222 222
230 230 230
246 246 246
246 246 246
255 0 255
0 123 197
230 222 156
230 205 255
0 74 148
123 156 156
197 189 115
106 197 205
106 230 230
90 213 213
205 172 238
180 139 213
255 180 0
123 131 148
255 255 255
98 106 123

19
graphics/interface/trainer_memo_pal2.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
255 0 255
255 255 255
230 230 238
106 230 230
98 106 123
90 213 213
230 205 255
205 172 238
255 0 255
255 0 255
255 255 255
213 213 213
222 222 222
230 230 230
246 246 246
246 246 246

19
graphics/interface/trainer_memo_pal3.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
255 0 255
0 123 197
230 222 156
230 205 255
0 74 148
123 156 156
197 189 115
106 197 205
106 230 230
90 213 213
205 172 238
180 139 213
255 180 0
123 131 148
255 255 255
98 106 123

0
graphics/item_menu/bag_tilemap1.bin → graphics/item_menu/bg.bin
View File

0
graphics/item_menu/bag_tiles.png → graphics/item_menu/bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 539 B

After

Width:  |  Height:  |  Size: 539 B

0
graphics/item_menu/bag_tilemap2.bin → graphics/item_menu/bg_item_pc.bin
View File

BIN
graphics/teachy_tv/border.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

BIN
graphics/unknown/unknown_E861A8.bin
View File

Binary file not shown.

0
graphics/unknown/unknown_E87010.pal → graphics/unused/gray_palette.pal
View File

0
graphics/unknown/unknown_E9BD08.pal → graphics/unused/red_palette.pal
View File

4
graphics_file_rules.mk
View File

@ -194,7 +194,7 @@ $(BTLANMSPRGFXDIR)/spark.4bpp: $(BTLANMSPRGFXDIR)/spark_0.4bpp \
$(BTLANMSPRGFXDIR)/spark_1.4bpp
@cat $^ >$@
$(MASKSGFXDIR)/unknown_D2EC24.4bpp: %.4bpp: %.png
$(MASKSGFXDIR)/unused_level_up.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 14 -Wnum_tiles
$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
@ -503,7 +503,7 @@ graphics/pokemon/heracross/unk_icon.4bpp: %.4bpp: %.png
graphics/misc/emoticons.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png
$(ITEMMENUGFXDIR)/bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
$(INTROGFXDIR)/scene_1/grass.4bpp: %.4bpp: %.png

6
include/graphics.h
View File

@ -4866,9 +4866,9 @@ extern const u16 gBattleInterface_Healthbox_Pal[];
extern const u16 gBattleInterface_Healthbar_Pal[];
// item_menu
extern const u32 gUnknown_8E830CC[];
extern const u32 gUnknown_8E832C0[];
extern const u32 gUnknown_8E83444[];
extern const u32 gBagBg_Gfx[];
extern const u32 gBagBg_Tilemap[];
extern const u32 gBagBg_ItemPC_Tilemap[];
extern const u32 gBagBgPalette[];
extern const u32 gBagBgPalette_FemaleOverride[];

23
src/graphics.c
View File

@ -883,8 +883,8 @@ const u32 gBattleAnimSpriteGfx_TagHand[] = INCBIN_U32("graphics/battle_anims/spr
const u32 gBattleAnimSpriteGfx_NoiseLine[] = INCBIN_U32("graphics/battle_anims/sprites/noise_line.4bpp.lz");
const u32 gUnusedLevelupAnimationGfx[] = INCBIN_U32("graphics/battle_anims/masks/unknown_D2EC24.4bpp.lz");
const u32 gUnusedLevelupAnimationTilemap[] = INCBIN_U32("graphics/battle_anims/masks/unknown_D2EC24.bin.lz");
const u32 gUnusedLevelupAnimationGfx[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.4bpp.lz");
const u32 gUnusedLevelupAnimationTilemap[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.bin.lz");
const u32 gBattleAnimSpriteGfx_SmallRedEye[] = INCBIN_U32("graphics/battle_anims/sprites/small_red_eye.4bpp.lz");
const u32 gBattleAnimSpritePal_SmallRedEye[] = INCBIN_U32("graphics/battle_anims/sprites/small_red_eye.gbapal.lz");
@ -1075,11 +1075,9 @@ const u32 gPartyMenuPokeball_Pal[] = INCBIN_U32("graphics/party_menu/pokeball.gb
const u32 gStatusGfx_Icons[] = INCBIN_U32("graphics/interface/status_icons.4bpp.lz");
const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapal.lz");
const u32 gUnknown_8E830CC[] = INCBIN_U32("graphics/item_menu/bag_tiles.4bpp.lz");
const u32 gUnknown_8E832C0[] = INCBIN_U32("graphics/item_menu/bag_tilemap1.bin.lz"); // bag menu
const u32 gUnknown_8E83444[] = INCBIN_U32("graphics/item_menu/bag_tilemap2.bin.lz"); // PC deposit items
const u32 gBagBg_Gfx[] = INCBIN_U32("graphics/item_menu/bg.4bpp.lz");
const u32 gBagBg_Tilemap[] = INCBIN_U32("graphics/item_menu/bg.bin.lz");
const u32 gBagBg_ItemPC_Tilemap[] = INCBIN_U32("graphics/item_menu/bg_item_pc.bin.lz");
const u32 gBagBgPalette[] = INCBIN_U32("graphics/item_menu/bag_pal1.gbapal.lz"); // palette 1 (Boy + misc Pal)
const u32 gBagBgPalette_FemaleOverride[] = INCBIN_U32("graphics/item_menu/bag_pal2.gbapal.lz"); // palette 2 (Girl)
@ -1115,14 +1113,13 @@ const u32 gBuyMenuFrame_Tilemap[] = INCBIN_U32("graphics/shop_menu/shop_tilemap.
const u32 gBuyMenuFrame_TmHmTilemap[] = INCBIN_U32("graphics/shop_menu/shop_tm_hm_tilemap.bin.lz");
const u32 gBuyMenuFrame_Pal[] = INCBIN_U32("graphics/shop_menu/shop_menu.gbapal.lz");
const u32 gUnknown_8E861A8[] = INCBIN_U32("graphics/unknown/unknown_E861A8.bin.lz");
const u8 gTeachyTv_Border_Gfx[] = INCBIN_U8("graphics/teachy_tv/border.4bpp.lz"); // Unused
const u8 gTeachyTv_Gfx[] = INCBIN_U8("graphics/teachy_tv/tiles.4bpp.lz");
const u8 gTeachyTvScreen_Tilemap[] = INCBIN_U8("graphics/teachy_tv/screen.bin.lz");
const u8 gTeachyTvTitle_Tilemap[] = INCBIN_U8("graphics/teachy_tv/title.bin.lz");
const u32 gTeachyTv_Pal[] = INCBIN_U32("graphics/teachy_tv/tiles.gbapal.lz");
const u32 gUnknown_8E87010[] = INCBIN_U32("graphics/unknown/unknown_E87010.gbapal.lz");
const u32 gUnusedGrayPalette[] = INCBIN_U32("graphics/unused/gray_palette.gbapal.lz");
#include "data/graphics/items.h"
@ -1195,9 +1192,7 @@ const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/button_wi
const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/mode.4bpp.lz");
const u32 gPokeSumBgTiles[] = INCBIN_U32("graphics/interface/trainer_memo.4bpp.lz");
const u32 gTrainerMemoPal1[] = INCBIN_U32("graphics/interface/trainer_memo_pal1.gbapal");
const u32 gUnknown_8E9B3B0[] = INCBIN_U32("graphics/interface/trainer_memo_pal2.gbapal");
const u32 gUnknown_8E9B3D0[] = INCBIN_U32("graphics/interface/trainer_memo_pal3.gbapal");
const u32 gTrainerMemoPal[] = INCBIN_U32("graphics/interface/trainer_memo_pal.gbapal");
const u32 gPokeSummary_ExpBarTiles[] = INCBIN_U32("graphics/interface/summary_exp_bar.4bpp.lz");
const u32 gPokeSummary_HpBarTiles[] = INCBIN_U32("graphics/interface/summary_hp_bar.4bpp.lz");
@ -1209,7 +1204,7 @@ const u32 gBgTilemap_PokeSum_MovesListForDelete[] = INCBIN_U32("graphics/interfa
const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_4.bin.lz");
const u32 gBgTilemap_TrainerMemo_Egg[] = INCBIN_U32("graphics/interface/trainer_memo_5.bin.lz");
const u16 gUnknown_8E9BD08[] = INCBIN_U16("graphics/unknown/unknown_E9BD08.gbapal");
const u16 gUnusedRedPalette[] = INCBIN_U16("graphics/unused/red_palette.gbapal");
const u32 gEasyChatRectangleCursor_Gfx[] = INCBIN_U32("graphics/easy_chat/rectangle_cursor.4bpp.lz");
const u16 gPokeSummary_StatusAilmentIconPals[] = INCBIN_U16("graphics/interface/status_ailment_icons.gbapal");

6
src/item_menu.c
View File

@ -562,16 +562,16 @@ static bool8 DoLoadBagGraphics(void)
{
case 0:
ResetTempTileDataBuffers();
DecompressAndCopyTileDataToVram(1, gUnknown_8E830CC, 0, 0, 0);
DecompressAndCopyTileDataToVram(1, gBagBg_Gfx, 0, 0, 0);
sBagMenuDisplay->data[0]++;
break;
case 1:
if (FreeTempTileDataBuffersIfPossible() != TRUE)
{
if (gBagMenuState.location != ITEMMENULOCATION_ITEMPC)
LZDecompressWram(gUnknown_8E832C0, sBagBgTilemapBuffer);
LZDecompressWram(gBagBg_Tilemap, sBagBgTilemapBuffer);
else
LZDecompressWram(gUnknown_8E83444, sBagBgTilemapBuffer);
LZDecompressWram(gBagBg_ItemPC_Tilemap, sBagBgTilemapBuffer);
sBagMenuDisplay->data[0]++;
}
break;

20
src/pokemon_summary_screen.c
View File

@ -332,7 +332,7 @@ extern const u32 gBgTilemap_PokeSum_MovesListForDelete[];
extern const u32 gBgTilemap_TrainerMemo_Details[];
extern const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[];
extern const u32 gBgTilemap_TrainerMemo_Egg[];
extern const u16 gTrainerMemoPal1[];
extern const u16 gTrainerMemoPal[];
extern const u32 gPokeSumBgTiles[];
extern const u16 gPokeSummary_ExpBarPals[];
extern const u32 gPokeSummary_StatusAilmentIconTiles[];
@ -2007,16 +2007,16 @@ static u8 PokeSum_HandleLoadBgGfx(void)
switch (sMonSummaryScreen->loadBgGfxStep)
{
case 0:
LoadPalette(gTrainerMemoPal1, 0, 0x20 * 5);
LoadPalette(gTrainerMemoPal, 0, 0x20 * 5);
if (IsMonShiny(&sMonSummaryScreen->currentMon) == TRUE && !sMonSummaryScreen->isEgg)
{
LoadPalette(&gTrainerMemoPal1[16 * 6], 0, 0x20);
LoadPalette(&gTrainerMemoPal1[16 * 5], 0x10, 0x20);
LoadPalette(&gTrainerMemoPal[16 * 6], 0, 0x20);
LoadPalette(&gTrainerMemoPal[16 * 5], 0x10, 0x20);
}
else
{
LoadPalette(&gTrainerMemoPal1[16 * 0], 0, 0x20);
LoadPalette(&gTrainerMemoPal1[16 * 1], 0x10, 0x20);
LoadPalette(&gTrainerMemoPal[16 * 0], 0, 0x20);
LoadPalette(&gTrainerMemoPal[16 * 1], 0x10, 0x20);
}
break;
@ -5079,13 +5079,13 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId)
if (IsMonShiny(&sMonSummaryScreen->currentMon) == TRUE && !sMonSummaryScreen->isEgg)
{
LoadPalette(&gTrainerMemoPal1[16 * 6], 0, 0x20);
LoadPalette(&gTrainerMemoPal1[16 * 5], 0x10, 0x20);
LoadPalette(&gTrainerMemoPal[16 * 6], 0, 0x20);
LoadPalette(&gTrainerMemoPal[16 * 5], 0x10, 0x20);
}
else
{
LoadPalette(&gTrainerMemoPal1[16 * 0], 0, 0x20);
LoadPalette(&gTrainerMemoPal1[16 * 1], 0x10, 0x20);
LoadPalette(&gTrainerMemoPal[16 * 0], 0, 0x20);
LoadPalette(&gTrainerMemoPal[16 * 1], 0x10, 0x20);
}
sMonSummaryScreen->switchMonTaskState++;