Merge pull request #612 from cbt6/graphics

Rename "undocumented" graphics
This commit is contained in:
GriffinR
2023-03-16 11:24:45 -04:00
committed by GitHub
103 changed files with 270 additions and 466 deletions

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 339 B

Before

Width:  |  Height:  |  Size: 167 B

After

Width:  |  Height:  |  Size: 167 B

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 164 164
106 106 106
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
255 213 82
189 148 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
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Before

Width:  |  Height:  |  Size: 828 B

After

Width:  |  Height:  |  Size: 828 B

-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
255 24 0
0 131 213
32 205 255
115 106 164
74 156 49
16 106 65
238 8 8
16 164 16
32 32 205
74 65 90
139 0 74
90 32 49
0 115 0
255 90 65
24 172 164
246 106 49

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 152 B

Before

Width:  |  Height:  |  Size: 160 B

After

Width:  |  Height:  |  Size: 160 B

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 226 B

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
255 255 255
230 230 255
213 213 255
197 197 255
180 180 255
164 164 255
148 148 255
131 131 255
115 115 255
98 98 255
82 82 255
65 65 255
49 49 255
32 32 255
16 16 255
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
98 90 8
197 189 24
246 246 0
148 139 16
246 238 32
222 213 0
213 197 0
180 164 0
49 41 0
172 148 32
189 164 49
0 0 0
0 0 0
0 0 0
0 0 0
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
65 106 255
255 255 255
230 230 230
213 213 213
197 197 197
180 180 180
164 164 164
148 148 148
131 131 131
115 115 115
98 98 98
82 82 82
65 65 65
49 49 49
32 32 32
16 16 16

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 230 B

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 227 B

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 202 B

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 202 B

Before

Width:  |  Height:  |  Size: 147 B

After

Width:  |  Height:  |  Size: 147 B

Before

Width:  |  Height:  |  Size: 164 B

After

Width:  |  Height:  |  Size: 164 B

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 450 B

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 513 B

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 244 B

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 189 B

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 190 B

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 320 B

Before

Width:  |  Height:  |  Size: 159 B

After

Width:  |  Height:  |  Size: 159 B

+7 -114
View File
@@ -2751,113 +2751,6 @@ extern const u16 gFireRedMenuElements2_Pal[];
extern const u8 gItemIcon_QuestionMark[];
extern const u8 gItemIconPalette_QuestionMark[];
extern const u8 gUnknown_08DB7AA0[];
extern const u8 gUnknown_08DB7B34[];
extern const u8 gUnknown_08DB7B5C[];
extern const u8 gUnknown_08DB7BEC[];
extern const u8 gUnknown_08DB7C08[];
extern const u8 gUnknown_08DB7CE8[];
extern const u8 gUnknown_08DB7D08[];
extern const u8 gUnknown_08DB7DCC[];
extern const u8 gUnknown_08DB7DF4[];
extern const u8 gUnknown_08DB7EA0[];
extern const u8 gUnknown_08DB7EC4[];
extern const u8 gUnknown_08DB7F60[];
extern const u8 gUnknown_08DB7F7C[];
extern const u8 gUnknown_08DB8070[];
extern const u8 gUnknown_08DB808C[];
extern const u8 gUnknown_08DB8138[];
extern const u8 gUnknown_08DB8160[];
extern const u8 gUnknown_08DB8218[];
extern const u8 gUnknown_08DB823C[];
extern const u8 gUnknown_08DB8300[];
extern const u8 gUnknown_08DB8328[];
extern const u8 gUnknown_08DB8430[];
extern const u8 gUnknown_08DB8458[];
extern const u8 gUnknown_08DB8528[];
extern const u8 gUnknown_08DB854C[];
extern const u8 gUnknown_08DB862C[];
extern const u8 gUnknown_08DB8654[];
extern const u8 gUnknown_08DB86C4[];
extern const u8 gUnknown_08DB86E0[];
extern const u8 gUnknown_08DB8750[];
extern const u8 gUnknown_08DB876C[];
extern const u8 gUnknown_08DB87DC[];
extern const u8 gUnknown_08DB87F8[];
extern const u8 gUnknown_08DB88D8[];
extern const u8 gUnknown_08DB8900[];
extern const u8 gUnknown_08DB89E0[];
extern const u8 gUnknown_08DB8A08[];
extern const u8 gUnknown_08DB8A68[];
extern const u8 gUnknown_08DB8A84[];
extern const u8 gUnknown_08DB8B40[];
extern const u8 gUnknown_08DB8B68[];
extern const u8 gUnknown_08DB8C40[];
extern const u8 gUnknown_08DB8C5C[];
extern const u8 gUnknown_08DB8CF4[];
extern const u8 gUnknown_08DB8D18[];
extern const u8 gUnknown_08DB8DB0[];
extern const u8 gUnknown_08DB8DD4[];
extern const u8 gUnknown_08DB8E80[];
extern const u8 gUnknown_08DB8EA0[];
extern const u8 gUnknown_08DB8F58[];
extern const u8 gUnknown_08DB8F7C[];
extern const u8 gUnknown_08DB9038[];
extern const u8 gUnknown_08DB9058[];
extern const u8 gUnknown_08DB9130[];
extern const u8 gUnknown_08DB9154[];
extern const u8 gUnknown_08DB9218[];
extern const u8 gUnknown_08DB9234[];
extern const u8 gUnknown_08DB92FC[];
extern const u8 gUnknown_08DB931C[];
extern const u8 gUnknown_08DB93E8[];
extern const u8 gUnknown_08DB940C[];
extern const u8 gUnknown_08DB94CC[];
extern const u8 gUnknown_08DB94E8[];
extern const u8 gUnknown_08DB95AC[];
extern const u8 gUnknown_08DB95D0[];
extern const u8 gUnknown_08DB96C4[];
extern const u8 gUnknown_08DB96EC[];
extern const u8 gUnknown_08DB97F4[];
extern const u8 gUnknown_08DB981C[];
extern const u8 gUnknown_08DB9908[];
extern const u8 gUnknown_08DB9930[];
extern const u8 gUnknown_08DB9A54[];
extern const u8 gUnknown_08DB9A7C[];
extern const u8 gUnknown_08DB9B7C[];
extern const u8 gUnknown_08DB9BA4[];
extern const u8 gUnknown_08DB9CB0[];
extern const u8 gUnknown_08DB9CD8[];
extern const u8 gUnknown_08DB9DAC[];
extern const u8 gUnknown_08DB9DD4[];
extern const u8 gUnknown_08DB9EE4[];
extern const u8 gUnknown_08DB9F08[];
extern const u8 gUnknown_08DB9FFC[];
extern const u8 gUnknown_08DBA020[];
extern const u8 gUnknown_08DBA12C[];
extern const u8 gUnknown_08DCC05C[];
extern const u16 gUnknown_08DCC01C[];
extern const u16 gUnknown_08DCC03C[];
extern const u8 gUnknown_08DCC648[];
extern const u8 gUnknown_08DCC908[];
extern const u8 gUnknown_08DD87C0[];
extern const u8 gUnknown_08DD8EE0[];
extern const u16 gUnknown_08DD8780[];
extern const u8 gUnknown_08DD90E0[];
extern const u8 gUnknown_08DD9718[];
extern const u16 gUnknown_08DD9080[];
extern const u8 gUnknown_08DD98B4[];
extern const u8 gUnknown_08DD9E58[];
extern const u16 gUnknown_08DD9874[];
extern const u8 gUnknown_08DDA02C[];
extern const u8 gUnknown_08DDA63C[];
extern const u16 gUnknown_08DD9FEC[];
extern const u8 gUnknown_08DDA840[];
extern const u8 gUnknown_08DDAE40[];
extern const u16 gUnknown_08DDA800[];
extern const u8 gUnknown_08DDB020[];
extern const u8 gUnknown_08DDB2C4[];
extern const u16 gUnknown_08DDAFE0[];
// fame_checker
extern const u16 gFameCheckerBgPals[0x30];
@@ -4873,15 +4766,15 @@ extern const u32 gBagBgPalette[];
extern const u32 gBagBgPalette_FemaleOverride[];
// union_room_chat_display
extern const u16 gUnionRoomChatPanelBgPal_7[];
extern const u32 gUnionRoomChatPanelBgTiles[];
extern const u32 gUnionRoomChatPanelBgMap[];
extern const u16 gLinkMiscMenu_Pal[];
extern const u32 gLinkMiscMenu_Gfx[];
extern const u32 gLinkMiscMenu_Tilemap[];
extern const u16 gUnionRoomChat_Panel_Pal[];
extern const u32 gUnionRoomChat_Panel_Gfx[];
extern const u32 gUnionRoomChat_Panel_Tilemap[];
extern const u16 gUnionRoomChat_Bg_Pal[];
extern const u32 gUnionRoomChat_Bg_Gfx[];
extern const u32 gUnionRoomChat_Bg_Tilemap[];
// union_room_chat_objects
extern const u32 gUnionRoomChatIcons[];
extern const u32 gUnionRoomChat_Icons_Gfx[];
// battle_bg
extern const u32 gFile_graphics_battle_transitions_vs_frame_sheet[];
+1 -1
View File
@@ -706,7 +706,7 @@ const struct SpriteTemplate gSweetScentPetalSpriteTemplate =
.callback = AnimSweetScentPetal,
};
static const u16 sUnusedPalette[] = INCBIN_U16("graphics/battle_anims/unk_83FF33C.gbapal"); //Unused
static const u16 sUnusedPalette[] = INCBIN_U16("graphics/battle_anims/unused/unknown.gbapal");
static const union AnimCmd sPainSplitAnimCmds[] =
{
+1 -1
View File
@@ -177,7 +177,7 @@ const struct SpriteTemplate gFallingFeatherSpriteTemplate =
.callback = AnimFallingFeather,
};
static const u16 sUnusedPal[] = INCBIN_U16("graphics/battle_anims/unk_83E6C18.gbapal");
static const u16 sUnusedPal[] = INCBIN_U16("graphics/battle_anims/unused/flying.gbapal");
static const struct SpriteTemplate sUnusedBubbleThrowSpriteTemplate =
{
+2 -2
View File
@@ -53,8 +53,8 @@ static void AnimTask_WaterSport_Step(u8);
static void CreateWaterSportDroplet(struct Task *);
static void CreateWaterPulseRingBubbles(struct Sprite *, s32, s32);
static const u8 sUnusedWater_Gfx[] = INCBIN_U8("graphics/battle_anims/unk_83E44F4.4bpp");
static const u8 sUnusedWater[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.bin");
static const u8 sUnusedWater_Gfx[] = INCBIN_U8("graphics/battle_anims/unused/water.4bpp");
static const u8 sUnusedWater[] = INCBIN_U8("graphics/battle_anims/unused/water.bin");
static const union AnimCmd sAnim_RainDrop[] =
{
+2 -2
View File
@@ -29,8 +29,8 @@ static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId);
static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskId);
static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskId);
static const u16 sEvolutionSparklesPalData[] = INCBIN_U16("graphics/misc/evolution_sprite_841EEA4.gbapal");
static const u32 sEvolutionSparklesTileData[] = INCBIN_U32("graphics/misc/evolution_sprite_841EEA4.4bpp.lz");
static const u16 sEvolutionSparklesPalData[] = INCBIN_U16("graphics/evolution_scene/sparkle.gbapal");
static const u32 sEvolutionSparklesTileData[] = INCBIN_U32("graphics/evolution_scene/sparkle.4bpp.lz");
static const struct CompressedSpriteSheet sSpriteSheet_EvolutionSparkles[] = {
{ sEvolutionSparklesTileData, 0x20, 1001 },
+32 -32
View File
@@ -2077,30 +2077,30 @@ void DaisyMassageServices(void)
}
static const u16 sEliteFourLightingPalettes[][16] = {
INCBIN_U16("graphics/field_specials/unk_83F5F50.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5F70.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5F90.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5FB0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5FD0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5FF0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6010.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6030.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6050.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6070.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6090.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F60B0.gbapal")
INCBIN_U16("graphics/field_specials/elite_four_lighting_0.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_1.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_2.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_3.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_4.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_5.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_6.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_7.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_8.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_9.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_10.gbapal"),
INCBIN_U16("graphics/field_specials/elite_four_lighting_11.gbapal")
};
static const u16 sChampionRoomLightingPalettes[][16] = {
INCBIN_U16("graphics/field_specials/unk_83F60D0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F60F0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6110.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6130.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6150.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6170.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6190.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F61B0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F61D0.gbapal")
INCBIN_U16("graphics/field_specials/champion_room_lighting_0.gbapal"),
INCBIN_U16("graphics/field_specials/champion_room_lighting_1.gbapal"),
INCBIN_U16("graphics/field_specials/champion_room_lighting_2.gbapal"),
INCBIN_U16("graphics/field_specials/champion_room_lighting_3.gbapal"),
INCBIN_U16("graphics/field_specials/champion_room_lighting_4.gbapal"),
INCBIN_U16("graphics/field_specials/champion_room_lighting_5.gbapal"),
INCBIN_U16("graphics/field_specials/champion_room_lighting_6.gbapal"),
INCBIN_U16("graphics/field_specials/champion_room_lighting_7.gbapal"),
INCBIN_U16("graphics/field_specials/champion_room_lighting_8.gbapal")
};
static const u8 sEliteFourLightingTimers[] = {
@@ -2319,17 +2319,17 @@ void CutMoveOpenDottedHoleDoor(void)
}
static const u16 sDeoxysObjectPals[][16] = {
INCBIN_U16("graphics/field_specials/unk_83F6206.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6226.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6246.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6266.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6286.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F62A6.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F62C6.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F62E6.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6306.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6326.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6346.gbapal")
INCBIN_U16("graphics/field_specials/deoxys_rock_0.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_1.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_2.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_3.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_4.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_5.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_6.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_7.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_8.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_9.gbapal"),
INCBIN_U16("graphics/field_specials/deoxys_rock_10.gbapal")
};
static const u8 sDeoxysCoords[][2] = {
+19 -21
View File
@@ -1191,24 +1191,22 @@ const u16 gEasyChatButtonWindow_Pal[] = INCBIN_U16("graphics/easy_chat/button_wi
const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/button_window.4bpp.lz");
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 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");
const u16 gPokeSummary_ExpBarPals[] = INCBIN_U16("graphics/interface/summary_exp_bar.gbapal"); // hp bar uses this too
const u32 gBgTilemap_TrainerMemo_Details[] = INCBIN_U32("graphics/interface/trainer_memo.bin.lz");
const u32 gBgTilemap_TrainerMemo_Stats[] = INCBIN_U32("graphics/interface/trainer_memo_2.bin.lz");
const u32 gBgTilemap_PokeSum_MovesListForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_3.bin.lz");
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 u32 gSummaryScreen_Bg_Gfx[] = INCBIN_U32("graphics/summary_screen/bg.4bpp.lz");
const u32 gSummaryScreen_Bg_Pal[] = INCBIN_U32("graphics/summary_screen/bg.gbapal");
const u32 gSummaryScreen_ExpBar_Gfx[] = INCBIN_U32("graphics/summary_screen/exp_bar.4bpp.lz");
const u32 gSummaryScreen_HpBar_Gfx[] = INCBIN_U32("graphics/summary_screen/hp_bar.4bpp.lz");
const u16 gSummaryScreen_HpExpBar_Pal[] = INCBIN_U16("graphics/summary_screen/exp_bar.gbapal"); // hp bar uses this too
const u32 gSummaryScreen_PageInfo_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_info.bin.lz");
const u32 gSummaryScreen_PageSkills_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_skills.bin.lz");
const u32 gSummaryScreen_PageMoves_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_moves.bin.lz");
const u32 gSummaryScreen_PageMovesInfo_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_moves_info.bin.lz");
const u32 gSummaryScreen_PageEgg_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_egg.bin.lz");
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");
const u32 gPokeSummary_StatusAilmentIconTiles[] = INCBIN_U32("graphics/interface/status_ailment_icons.4bpp.lz");
const u16 gSummaryScreen_StatusAilmentIcon_Pal[] = INCBIN_U16("graphics/summary_screen/status_ailment_icons.gbapal");
const u32 gSummaryScreen_StatusAilmentIcon_Gfx[] = INCBIN_U32("graphics/summary_screen/status_ailment_icons.4bpp.lz");
const u16 gDexScreen_TopMenuIconPals_AtoZ[] = INCBIN_U16("graphics/pokedex/cat_icon_abc.gbapal");
const u32 gDexScreen_TopMenuIconTiles_AtoZ[] = INCBIN_U32("graphics/pokedex/cat_icon_abc.4bpp.lz");
@@ -1234,10 +1232,10 @@ const u16 gFameCheckerBgTiles[] = INCBIN_U16("graphics/fame_checker/bg.4bpp");
const u16 gFameCheckerBg3Tilemap[] = INCBIN_U16("graphics/fame_checker/tilemap3.bin");
const u16 gFameCheckerBg2Tilemap[] = INCBIN_U16("graphics/fame_checker/tilemap2.bin");
const u16 gLinkMiscMenu_Pal[] = INCBIN_U16("graphics/interface/union_room_chat.gbapal");
const u32 gLinkMiscMenu_Gfx[] = INCBIN_U32("graphics/interface/union_room_chat.4bpp.lz");
const u32 gLinkMiscMenu_Tilemap[] = INCBIN_U32("graphics/interface/union_room_chat.bin.lz");
const u32 gUnionRoomChatIcons[] = INCBIN_U32("graphics/interface/union_room_chat_icons.4bpp.lz");
const u16 gUnionRoomChat_Bg_Pal[] = INCBIN_U16("graphics/union_room_chat/bg.gbapal");
const u32 gUnionRoomChat_Bg_Gfx[] = INCBIN_U32("graphics/union_room_chat/bg.4bpp.lz");
const u32 gUnionRoomChat_Bg_Tilemap[] = INCBIN_U32("graphics/union_room_chat/bg.bin.lz");
const u32 gUnionRoomChat_Icons_Gfx[] = INCBIN_U32("graphics/union_room_chat/icons.4bpp.lz");
const u16 gTilesetPalettes_General[][16] =
{
@@ -1324,9 +1322,9 @@ const u16 gTilesetPalettes_DepartmentStore[][16] =
const u32 gTilesetTiles_DepartmentStore[] = INCBIN_U32("data/tilesets/secondary/department_store/tiles.4bpp.lz");
const u16 gUnionRoomChatPanelBgPal_7[] = INCBIN_U16("graphics/interface/union_room_chat_panel.gbapal");
const u32 gUnionRoomChatPanelBgTiles[] = INCBIN_U32("graphics/interface/union_room_chat_panel.4bpp.lz");
const u32 gUnionRoomChatPanelBgMap[] = INCBIN_U32("graphics/interface/union_room_chat_panel.bin.lz");
const u16 gUnionRoomChat_Panel_Pal[] = INCBIN_U16("graphics/union_room_chat/panel.gbapal");
const u32 gUnionRoomChat_Panel_Gfx[] = INCBIN_U32("graphics/union_room_chat/panel.4bpp.lz");
const u32 gUnionRoomChat_Panel_Tilemap[] = INCBIN_U32("graphics/union_room_chat/panel.bin.lz");
const u16 gCreditsMonPokeball_Pals[][16] =
{
+4 -4
View File
@@ -120,8 +120,8 @@ static const struct WindowTemplate sWindowTemplate[] = {
[MAIN_MENU_WINDOW_COUNT] = DUMMY_WIN_TEMPLATE
};
static const u16 sBgPal00[] = INCBIN_U16("graphics/main_menu/unk_8234648.gbapal");
static const u16 sBgPal15[] = INCBIN_U16("graphics/main_menu/unk_8234668.gbapal");
static const u16 sBg_Pal[] = INCBIN_U16("graphics/main_menu/bg.gbapal");
static const u16 sTextbox_Pal[] = INCBIN_U16("graphics/main_menu/textbox.gbapal");
static const u8 sTextColor1[] = { 10, 11, 12 };
@@ -196,8 +196,8 @@ static bool32 MainMenuGpuInit(u8 a0)
ChangeBgY(2, 0, 0);
InitWindows(sWindowTemplate);
DeactivateAllTextPrinters();
LoadPalette(sBgPal00, 0x00, 0x20);
LoadPalette(sBgPal15, 0xF0, 0x20);
LoadPalette(sBg_Pal, 0x00, 0x20);
LoadPalette(sTextbox_Pal, 0xF0, 0x20);
SetGpuReg(REG_OFFSET_WIN0H, 0);
SetGpuReg(REG_OFFSET_WIN0V, 0);
SetGpuReg(REG_OFFSET_WININ, 0);
+2 -2
View File
@@ -210,8 +210,8 @@ static void SpriteCB_Start(struct Sprite *sprite)
}
}
static const u16 sSpritePal_321Start[] = INCBIN_U16("graphics/link_games/unk_847a348.gbapal");
static const u16 sSpriteSheet_321Start[] = INCBIN_U16("graphics/link_games/unk_847a348.4bpp.lz");
static const u16 sSpritePal_321Start[] = INCBIN_U16("graphics/misc/minigame_countdown.gbapal");
static const u16 sSpriteSheet_321Start[] = INCBIN_U16("graphics/misc/minigame_countdown.4bpp.lz");
static void Load321StartGfx(u16 tilesTag, u16 palTag)
{
+1 -1
View File
@@ -130,7 +130,7 @@ static const struct BgTemplate sOptionMenuBgTemplates[] =
},
};
static const u16 sOptionMenuPalette[] = INCBIN_U16("graphics/misc/unk_83cc2e4.gbapal");
static const u16 sOptionMenuPalette[] = INCBIN_U16("graphics/misc/option_menu.gbapal");
static const u16 sOptionMenuItemCounts[MENUITEM_COUNT] = {3, 2, 2, 2, 3, 10, 0};
static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] =
+21 -21
View File
@@ -49,16 +49,16 @@ static void Task_LevelUpVerticalSprites(u8 taskId);
static void CreateLevelUpVerticalSprite(u8 taskId, s16 *data);
static void SpriteCB_LevelUpVertical(struct Sprite *sprite);
static const u16 sBgPals_PSA_Any[] = INCBIN_U16("graphics/pokemon_special_anim/unk_845963C.gbapal");
static const u16 sBgPals_PSA_Anim4[] = INCBIN_U16("graphics/pokemon_special_anim/unk_845965C.gbapal");
static const u32 sBg3Tiles_PSA[] = INCBIN_U32("graphics/pokemon_special_anim/unk_845967C.4bpp.lz");
static const u32 sBg3Map_PSA[] = INCBIN_U32("graphics/pokemon_special_anim/unk_845973C.bin.lz");
static const u16 sSpritePals_LevelUpVertical[] = INCBIN_U16("graphics/pokemon_special_anim/unk_8459868.gbapal");
static const u32 sSpriteTiles_LevelUpVertical[] = INCBIN_U32("graphics/pokemon_special_anim/unk_8459888.4bpp.lz");
static const u16 sSpritePals_Star[] = INCBIN_U16("graphics/pokemon_special_anim/unk_84598A4.gbapal");
static const u32 sSpriteTiles_Star[] = INCBIN_U32("graphics/pokemon_special_anim/unk_84598C4.4bpp.lz");
static const u16 sSpritePals_UseItem_OutwardSpiralDots[] = INCBIN_U16("graphics/pokemon_special_anim/unk_8459940.gbapal");
static const u32 sSpriteTiles_UseItem_OutwardSpiralDots[] = INCBIN_U32("graphics/pokemon_special_anim/unk_8459960.4bpp.lz");
static const u16 sBg_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/bg.gbapal");
static const u16 sBg_TmHm_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/bg_tm_hm.gbapal");
static const u32 sBg_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/bg.4bpp.lz");
static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/pokemon_special_anim/bg.bin.lz");
static const u16 sLevelUp_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/level_up.gbapal");
static const u32 sLevelUp_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/level_up.4bpp.lz");
static const u16 sStar_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/star.gbapal");
static const u32 sStar_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/star.4bpp.lz");
static const u16 sOutwardSpiralDots_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/outward_spiral_dots.gbapal");
static const u32 sOutwardSpiralDots_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/outward_spiral_dots.4bpp.lz");
static const struct BgTemplate sBgTemplates[] = {
{
@@ -116,24 +116,24 @@ static const s8 sStarCoordOffsets[][2] = {
};
static const struct CompressedSpriteSheet sSpriteSheet_Star = {
sSpriteTiles_Star,
sStar_Gfx,
0x80,
2
};
static const struct SpritePalette sSpritePalette_Star = {
sSpritePals_Star,
sStar_Pal,
2
};
static const struct CompressedSpriteSheet sSpriteSheet_UseItem_OutwardSpiralDots = {
sSpriteTiles_UseItem_OutwardSpiralDots,
sOutwardSpiralDots_Gfx,
0x60,
5
};
static const struct SpritePalette sSpritePalette_UseItem_OutwardSpiralDots = {
sSpritePals_UseItem_OutwardSpiralDots,
sOutwardSpiralDots_Pal,
5
};
@@ -633,12 +633,12 @@ bool8 PSA_IsCopyingLevelUpWindowToVram(void)
static void LoadBgGfxByAnimType(u16 animType)
{
CopyToBgTilemapBuffer(3, sBg3Map_PSA, 0, 0x000);
DecompressAndCopyTileDataToVram(3, sBg3Tiles_PSA, 0, 0x000, 0);
CopyToBgTilemapBuffer(3, sBg_Tilemap, 0, 0x000);
DecompressAndCopyTileDataToVram(3, sBg_Gfx, 0, 0x000, 0);
if (animType != 4)
LoadPalette(sBgPals_PSA_Any, 0x00, 0x20);
LoadPalette(sBg_Pal, 0x00, 0x20);
else
LoadPalette(sBgPals_PSA_Anim4, 0x00, 0x20);
LoadPalette(sBg_TmHm_Pal, 0x00, 0x20);
}
void PSA_CreateMonSpriteAtCloseness(u8 closeness)
@@ -1382,9 +1382,9 @@ void CreateLevelUpVerticalSpritesTask(u16 x, u16 y, u16 tileTag, u16 paletteTag,
static struct SpritePalette spritePalette;
u8 taskId;
spriteSheet.tag = tileTag;
spriteSheet.data = sSpriteTiles_LevelUpVertical;
spriteSheet.size = sSpriteTiles_LevelUpVertical[0] >> 8;
spritePalette.data = sSpritePals_LevelUpVertical;
spriteSheet.data = sLevelUp_Gfx;
spriteSheet.size = sLevelUp_Gfx[0] >> 8;
spritePalette.data = sLevelUp_Pal;
spritePalette.tag = paletteTag;
LoadCompressedSpriteSheet(&spriteSheet);
LoadSpritePalette(&spritePalette);

Some files were not shown because too many files have changed in this diff Show More