dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc symbol roundup

Browse Source
This commit is contained in:
GriffinR
2022-11-18 21:45:42 -05:00
parent 519443e214
commit e872033fdd
6 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/object_events/palettes/unk_835B988.pal → graphics/object_events/palettes/player_unused.pal
View File
src/data/object_events/object_event_graphics.h
+3 -3
View File
@@ -1,5 +1,5 @@
const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/player.gbapal"); const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/player.gbapal");
const u16 gUnknown_835B988[] = INCBIN_U16("graphics/object_events/palettes/unk_835B988.gbapal"); const u16 gObjectEventPal_PlayerUnused[] = INCBIN_U16("graphics/object_events/palettes/player_unused.gbapal"); // Identical except for the transparency
const u16 gObjectEventPaletteNull1[16] = {}; const u16 gObjectEventPaletteNull1[16] = {};
const u16 gObjectEventPaletteNull2[16] = {}; const u16 gObjectEventPaletteNull2[16] = {};
const u16 gObjectEventPaletteNull3[16] = {}; const u16 gObjectEventPaletteNull3[16] = {};
@@ -190,7 +190,7 @@ const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/field_effec
const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp"); const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp");
const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp"); const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp");
const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_extra_large.4bpp"); const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_extra_large.4bpp");
const u16 filler_8398188[0x90] = {}; const u16 sFiller1[0x90] = {};
const u16 gFieldEffectObjectPic_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gFieldEffectObjectPic_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp");
const u16 gFieldEffectObjectPic_CutGrass2[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); // Unused const u16 gFieldEffectObjectPic_CutGrass2[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); // Unused
const u16 gFieldEffectPal_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal"); const u16 gFieldEffectPal_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal");
@@ -199,7 +199,7 @@ const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/field_effects/pics/
const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/field_effects/pics/arrow.4bpp"); const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/field_effects/pics/arrow.4bpp");
const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal"); const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal");
const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal");
const u16 filler_8398FE8[16] = {0}; const u16 sFiller2[0x10] = {};
const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/field_effects/pics/ground_impact_dust.4bpp"); const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/field_effects/pics/ground_impact_dust.4bpp");
const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_3.4bpp"); // Unused const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_3.4bpp"); // Unused
const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/field_effects/pics/jump_tall_grass.4bpp"); const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/field_effects/pics/jump_tall_grass.4bpp");
src/event_object_movement.c
+1 -1
View File
@@ -4686,7 +4686,7 @@ u8 GetAcroWheelieDirectionAnimNum(u8 direction)
return sAcroBunnyHopBackWheelDirectionAnimNums[direction]; return sAcroBunnyHopBackWheelDirectionAnimNums[direction];
} }
u8 Unref_GetAnimNums_080634A0(u8 direction) u8 GetAcroBunnyHopFrontWheelDirectionAnimNum(u8 direction)
{ {
return sAcroBunnyHopFrontWheelDirectionAnimNums[direction]; return sAcroBunnyHopFrontWheelDirectionAnimNums[direction];
} }
src/menu.c
+12 -12
View File
@@ -34,7 +34,7 @@ static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLef
static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum); static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY); static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY);
static const u8 gUnknown_8456618[3] = {15, 1, 2}; static const u8 sTopBarWindowTextColors[3] = {15, 1, 2};
void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum) void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum)
{ {
@@ -193,7 +193,7 @@ void TopBarWindowPrintString(const u8 *string, u8 unused, bool8 copyToVram)
PutWindowTilemap(sTopBarWindowId); PutWindowTilemap(sTopBarWindowId);
FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15)); FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15));
width = GetStringWidth(FONT_0, string, 0); width = GetStringWidth(FONT_0, string, 0);
AddTextPrinterParameterized3(sTopBarWindowId, FONT_0, -20 - width, 1, gUnknown_8456618, 0, string); AddTextPrinterParameterized3(sTopBarWindowId, FONT_0, -20 - width, 1, sTopBarWindowTextColors, 0, string);
if (copyToVram) if (copyToVram)
CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL);
} }
@@ -287,8 +287,8 @@ u8 Menu_InitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8
return Menu_InitCursorInternal(windowId, fontId, left, top, cursorHeight, numChoices, initialCursorPos, 0); return Menu_InitCursorInternal(windowId, fontId, left, top, cursorHeight, numChoices, initialCursorPos, 0);
} }
// not used // Unused
static u8 sub_810F818(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8 initialCursorPos) static u8 InitMenuDefaultCursorHeight(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8 initialCursorPos)
{ {
return Menu_InitCursor(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, initialCursorPos); return Menu_InitCursor(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, initialCursorPos);
} }
@@ -501,8 +501,8 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
CopyWindowToVram(windowId, COPYWIN_GFX); CopyWindowToVram(windowId, COPYWIN_GFX);
} }
// not used // Unused
static void sub_810FDE4(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *orderArray) static void PrintMenuActionTextsAtTopById(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *orderArray)
{ {
AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH), 0, GetFontAttribute(fontId, FONTATTR_LETTER_SPACING), lineHeight, itemCount, strs, orderArray); AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH), 0, GetFontAttribute(fontId, FONTATTR_LETTER_SPACING), lineHeight, itemCount, strs, orderArray);
} }
@@ -705,8 +705,8 @@ static u8 MultichoiceGrid_MoveCursorIfValid(s8 deltaX, s8 deltaY)
} }
} }
// not used // Unused
static s8 sub_81105A0(void) static s8 Menu_ProcessGridInput_NoSoundLimit(void)
{ {
if (JOY_NEW(A_BUTTON)) if (JOY_NEW(A_BUTTON))
{ {
@@ -784,8 +784,8 @@ s8 Menu_ProcessInputGridLayout(void)
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
// not used // Unused
static s8 sub_81106F4(void) static s8 Menu_ProcessGridInputRepeat_NoSoundLimit(void)
{ {
if (JOY_NEW(A_BUTTON)) if (JOY_NEW(A_BUTTON))
{ {
@@ -824,8 +824,8 @@ static s8 sub_81106F4(void)
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
// not used // Unused
static s8 sub_81107A0(void) static s8 Menu_ProcessGridInputRepeat(void)
{ {
u8 oldPos = sMenu.cursorPos; u8 oldPos = sMenu.cursorPos;
src/text_printer.c
+25 -24
View File
@@ -275,46 +275,47 @@ void CopyGlyphToWindow(struct TextPrinter *textPrinter)
} }
} }
void sub_8003614(void *tileData, u16 currentX, u16 currentY, u16 width, u16 height) // Unused
static void CopyGlyphToWindow_Parameterized(void *tileData, u16 currentX, u16 currentY, u16 width, u16 height)
{ {
int r0, r1; int glyphWidth, glyphHeight;
u8 r2; u8 sizeType;
u16 r3; u16 sizeX;
if (width - currentX < gGlyphInfo.width) if (width - currentX < gGlyphInfo.width)
r0 = width - currentX; glyphWidth = width - currentX;
else else
r0 = gGlyphInfo.width; glyphWidth = gGlyphInfo.width;
if (height - currentY < gGlyphInfo.height) if (height - currentY < gGlyphInfo.height)
r1 = height - currentY; glyphHeight = height - currentY;
else else
r1 = gGlyphInfo.height; glyphHeight = gGlyphInfo.height;
r2 = 0; sizeType = 0;
r3 = (width + (width & 7)) >> 3; sizeX = (width + (width & 7)) >> 3;
if (r0 > 8) if (glyphWidth > 8)
r2 |= 1; sizeType |= 1;
if (r1 > 8) if (glyphHeight > 8)
r2 |= 2; sizeType |= 2;
switch (r2) switch (sizeType)
{ {
case 0: case 0:
GLYPH_COPY(0, 0, r0, r1, tileData, currentX, currentY, r3); GLYPH_COPY(0, 0, glyphWidth, glyphHeight, tileData, currentX, currentY, sizeX);
return; return;
case 1: case 1:
GLYPH_COPY(0, 0, 8, r1, tileData, currentX, currentY, r3); GLYPH_COPY(0, 0, 8, glyphHeight, tileData, currentX, currentY, sizeX);
GLYPH_COPY(8, 0, r0 - 8, r1, tileData, currentX, currentY, r3); GLYPH_COPY(8, 0, glyphWidth - 8, glyphHeight, tileData, currentX, currentY, sizeX);
return; return;
case 2: case 2:
GLYPH_COPY(0, 0, r0, 8, tileData, currentX, currentY, r3); GLYPH_COPY(0, 0, glyphWidth, 8, tileData, currentX, currentY, sizeX);
GLYPH_COPY(0, 8, r0, r1 - 8, tileData, currentX, currentY, r3); GLYPH_COPY(0, 8, glyphWidth, glyphHeight - 8, tileData, currentX, currentY, sizeX);
return; return;
case 3: case 3:
GLYPH_COPY(0, 0, 8, 8, tileData, currentX, currentY, r3); GLYPH_COPY(0, 0, 8, 8, tileData, currentX, currentY, sizeX);
GLYPH_COPY(8, 0, r0 - 8, 8, tileData, currentX, currentY, r3); GLYPH_COPY(8, 0, glyphWidth - 8, 8, tileData, currentX, currentY, sizeX);
GLYPH_COPY(0, 8, 8, r1 - 8, tileData, currentX, currentY, r3); GLYPH_COPY(0, 8, 8, glyphHeight - 8, tileData, currentX, currentY, sizeX);
GLYPH_COPY(8, 8, r0 - 8, r1 - 8, tileData, currentX, currentY, r3); GLYPH_COPY(8, 8, glyphWidth - 8, glyphHeight - 8, tileData, currentX, currentY, sizeX);
return; return;
} }
} }
src/trainer_tower_sets.c
+4 -4
View File
@@ -322,7 +322,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_7 = {
.checksum = 0x00016456 .checksum = 0x00016456
}; };
static const struct TrainerTowerFloor gUnknown_847B36C = { static const struct TrainerTowerFloor sTrainerTowerFloor_Single_Unused = {
.id = 3, .id = 3,
.floorIdx = MAX_TRAINER_TOWER_FLOORS, .floorIdx = MAX_TRAINER_TOWER_FLOORS,
.challengeType = CHALLENGE_TYPE_SINGLE, .challengeType = CHALLENGE_TYPE_SINGLE,
@@ -5539,7 +5539,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_8 = {
.checksum = 0x000160f4 .checksum = 0x000160f4
}; };
static const struct TrainerTowerFloor gUnknown_847FD0C = { static const struct TrainerTowerFloor sTrainerTowerFloor_Double_Unused1 = {
.id = 22, .id = 22,
.floorIdx = MAX_TRAINER_TOWER_FLOORS, .floorIdx = MAX_TRAINER_TOWER_FLOORS,
.challengeType = CHALLENGE_TYPE_DOUBLE, .challengeType = CHALLENGE_TYPE_DOUBLE,
@@ -7179,7 +7179,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_2 = {
.checksum = 0x0001624b .checksum = 0x0001624b
}; };
static const struct TrainerTowerFloor gUnknown_848144C = { static const struct TrainerTowerFloor sTrainerTowerFloor_Double_Unused2 = {
.id = 28, .id = 28,
.floorIdx = MAX_TRAINER_TOWER_FLOORS, .floorIdx = MAX_TRAINER_TOWER_FLOORS,
.challengeType = CHALLENGE_TYPE_DOUBLE, .challengeType = CHALLENGE_TYPE_DOUBLE,
@@ -7773,7 +7773,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_7 = {
.checksum = 0x00015272 .checksum = 0x00015272
}; };
static const struct TrainerTowerFloor gUnknown_8481C0C = { static const struct TrainerTowerFloor sTrainerTowerFloor_Double_Unused3 = {
.id = 30, .id = 30,
.floorIdx = MAX_TRAINER_TOWER_FLOORS, .floorIdx = MAX_TRAINER_TOWER_FLOORS,
.challengeType = CHALLENGE_TYPE_DOUBLE, .challengeType = CHALLENGE_TYPE_DOUBLE,