Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronize function names with pokeemerald #859

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Synchronize function names with pokeemerald #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad4c9c
Synchronize function names with pokeemerald
AreaZeroArven Jan 7, 2023
e1eeb88
Merge branch 'master' into work9
luckytyphlosion Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/text.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ u8 Text_PrintWindow8002F44(struct Window *win);
u8 Text_PrintWindowSimple(struct Window *win);
u8 Text_InitWindowAndPrintText(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 top);
void sub_80034D4(u8 *tileData, const u8 *text);
void RenderTextHandleBold(u8 *tileData, const u8 *text);
u8 sub_80034EC(u8 *str);
u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType);
u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType);
Expand Down
108 changes: 53 additions & 55 deletions src/battle_interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ u8 *const gUnknown_0820A85C[2] =
OBJ_VRAM0 + 32 * 50,
};

const u8 gUnknown_0820A864[] = _("{COLOR DARK_GREY}{HIGHLIGHT RED} /");
const u8 sEmptyWhiteText_GrayHighlight[] = _("{COLOR DARK_GREY}{HIGHLIGHT RED} /");

u8 *const gUnknown_0820A87C[6] =
{
Expand Down Expand Up @@ -435,7 +435,7 @@ extern const u16 gBattleInterfaceStatusIcons_DynPal[];
#define MACRO1(n) ((n) - (n) / 8 * 8) + 64 * ((n) / 8)

static void sub_8043D5C(struct Sprite *);
static const void *sub_8043CDC(u8);
static const void *GetHealthboxElementGfxPtr(u8);
/*static*/ void sub_8044210(u8, s16, u8);
/*static*/ void draw_status_ailment_maybe(u8);
extern void sub_8045180(struct Sprite *);
Expand Down Expand Up @@ -603,7 +603,7 @@ u8 battle_make_oam_normal_battle(u8 a)
SetSubspriteTables(sprite, &gSubspriteTables_820A684[GetBattlerSide(a)]);
sprite->subspriteMode = 2;
sprite->oam.priority = 1;
CpuCopy32(sub_8043CDC(1), OBJ_VRAM0 + sprite->oam.tileNum * 32, 64);
CpuCopy32(GetHealthboxElementGfxPtr(1), OBJ_VRAM0 + sprite->oam.tileNum * 32, 64);

gSprites[spriteId1].data[5] = spriteId3;
gSprites[spriteId1].data[6] = a;
Expand All @@ -630,7 +630,7 @@ u8 battle_make_oam_safari_battle(void)
return spriteId1;
}

static const void *sub_8043CDC(u8 a)
static const void *GetHealthboxElementGfxPtr(u8 a)
{
return gHealthboxElementsGfxTable[a];
}
Expand Down Expand Up @@ -826,7 +826,7 @@ void sub_8043F44(u8 a)
*(ptr++) = EXT_CTRL_CODE_CLEAR_TO;
*(ptr++) = 15;
*(ptr++) = EOS;
sub_80034D4(eBattleInterfaceGfxBuffer, str);
RenderTextHandleBold(eBattleInterfaceGfxBuffer, str);

two = 2;
for (i = 0; i < two; i++)
Expand All @@ -843,7 +843,7 @@ void sub_80440EC(u8 a, s16 b, u8 c)
u8 r8;

// TODO: make this a local variable
memcpy(str, gUnknown_0820A864, sizeof(str));
memcpy(str, sEmptyWhiteText_GrayHighlight, sizeof(str));
foo = gSprites[a].data[6];

if (IsDoubleBattle() == TRUE || GetBattlerSide(foo) == 1)
Expand Down Expand Up @@ -875,7 +875,7 @@ void sub_80440EC(u8 a, s16 b, u8 c)
r8 = 2;
ptr = sub_8003504(ptr, b, 15, 1);
}
sub_80034D4(eBattleInterfaceGfxBuffer, str);
RenderTextHandleBold(eBattleInterfaceGfxBuffer, str);
//asm(""::"r"(a));
//_080441B6
for (i = 0; i < r8; i++) // _080440BC
Expand Down Expand Up @@ -919,82 +919,80 @@ void sub_80440EC(u8 a, s16 b, u8 c)
sub_8003504(ptr, b, 0xF, 1);
if (GetBattlerSide(r4) == 0)
{
CpuCopy32(sub_8043CDC(0x74), OBJ_VRAM0 + (gSprites[a].oam.tileNum + 0x34) * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0x74), OBJ_VRAM0 + (gSprites[a].oam.tileNum + 0x34) * 32, 32);
}
}
r4 = gSprites[a].data[5];
sub_80034D4(eBattleInterfaceGfxBuffer, str);
RenderTextHandleBold(eBattleInterfaceGfxBuffer, str);
for (i = 0; i < r10; i++)
{
CpuCopy32((void *)(&eBattleInterfaceGfxBuffer[i * 64 + 32]), r7[i] + gSprites[r4].oam.tileNum * 32, 32);
}
}

void sub_8044338(u8 a, struct Pokemon *pkmn)
void PrintSafariMonInfo(u8 a, struct Pokemon *pkmn)
{
u8 text[20];
s32 j, spriteTileNum;
s32 j;
u8* spriteTileNum;
u8 *barFontGfx;
u8 i, var, nature, healthBarSpriteId;

// TODO: make this a local variable
memcpy(text, gUnknown_0820A864, sizeof(text));
memcpy(text, sEmptyWhiteText_GrayHighlight, sizeof(text));
barFontGfx = &eBattleInterfaceGfxBuffer[0x520 + GetBattlerPosition(gSprites[a].data[6]) * 0x180];
var = 5;
nature = GetNature(pkmn);
StringCopy(text + 6, gNatureNames[nature]);
sub_80034D4(barFontGfx, text);
RenderTextHandleBold(barFontGfx, text);

for (j = 6, i = 0; i < var; i++, j++) //_080443AA
for (j = 6, i = 0; i < var; i++, j++)
{
u8 elementId;

if ((text[j] >= 0x37 && text[j] <= 0x4A) || (text[j] >= 0x87 && text[j] <= 0x9A))
elementId = 0x2C;
//_080443DC
else if ((text[j] >= 0x4B && text[j] <= 0x4F) || (text[j] >= 0x9B && text[j] <= 0x9F))
elementId = 0x2D;
if ((text[j] >= 55 && text[j] <= 74) || (text[j] >= 135 && text[j] <= 154))
elementId = 44;
else if ((text[j] >= 75 && text[j] <= 79) || (text[j] >= 155 && text[j] <= 159))
elementId = 45;
else
elementId = 0x2B;
elementId = 43;

CpuCopy32(sub_8043CDC(elementId), barFontGfx + i * 64, 32);
CpuCopy32(GetHealthboxElementGfxPtr(elementId), &barFontGfx[i * 64], 0x20);
}
//j = 1;
//sp18 = a * 16;

for (j = 1; j < var + 1; j++)
{
spriteTileNum = (gSprites[a].oam.tileNum + MACRO1(j)) * 32;
CpuCopy32(barFontGfx, (u8 *)(OBJ_VRAM0) + spriteTileNum, 32);
spriteTileNum = (gSprites[a].oam.tileNum + MACRO1(j)) * TILE_SIZE_4BPP + (void *)OBJ_VRAM0;
CpuCopy32(barFontGfx, spriteTileNum, 32);
barFontGfx += 32;

spriteTileNum = (8 + gSprites[a].oam.tileNum + MACRO1(j)) * 32;
CpuCopy32(barFontGfx, (u8 *)(OBJ_VRAM0) + spriteTileNum, 32);
spriteTileNum = (8 + gSprites[a].oam.tileNum + MACRO1(j)) * TILE_SIZE_4BPP + (void *)OBJ_VRAM0;
CpuCopy32(barFontGfx, spriteTileNum, 32);
barFontGfx += 32;
}
//_08044486

healthBarSpriteId = gSprites[a].data[5];
ConvertIntToDecimalStringN(text + 6, gBattleStruct->safariCatchFactor, 1, 2);
ConvertIntToDecimalStringN(text + 9, gBattleStruct->safariFleeRate, 1, 2);
text[5] = CHAR_SPACE;
text[8] = CHAR_SLASH;
sub_80034D4(eBattleInterfaceGfxBuffer, text);
RenderTextHandleBold(eBattleInterfaceGfxBuffer, text);

j = healthBarSpriteId; // Needed to match for some reason
for (j = 0; j < 5; j++)
{
if (j <= 1)
if (j < 2)
{
CpuCopy32(
&eBattleInterfaceGfxBuffer[j * 64 + 32],
(u8 *)(OBJ_VRAM0) + (gSprites[healthBarSpriteId].oam.tileNum + 2 + j) * 32,
((gSprites[healthBarSpriteId].oam.tileNum + 2 + j) * TILE_SIZE_4BPP) + (void*)(OBJ_VRAM0),
32
);
}
else
{
CpuCopy32(
&eBattleInterfaceGfxBuffer[j * 64 + 32],
(u8 *)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthBarSpriteId].oam.tileNum) * 32,
(void*)(OBJ_VRAM0) + (gSprites[healthBarSpriteId].oam.tileNum + 8 + j - 2) * TILE_SIZE_4BPP, // Must be written as "8 + j - 2" to match
32
);
}
Expand Down Expand Up @@ -1042,7 +1040,7 @@ void sub_804454C(void)
{
draw_status_ailment_maybe(gHealthboxSpriteIds[i]);
sub_8045A5C(gHealthboxSpriteIds[i], &gPlayerParty[gBattlerPartyIndexes[i]], 5);
CpuCopy32(sub_8043CDC(0x75), OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0x75), OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * 32, 32);
}
}
else
Expand All @@ -1051,7 +1049,7 @@ void sub_804454C(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
{
sub_8044338(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]]);
PrintSafariMonInfo(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]]);
}
else
{
Expand Down Expand Up @@ -1545,7 +1543,7 @@ void sub_8045180(struct Sprite *sprite)
ptr[2] = 0x37;
ptr[3] = EOS;
ptr = &eBattleInterfaceGfxBuffer[0x520 + GetBattlerPosition(gSprites[a].data[6]) * 0x180];
sub_80034D4(ptr, gDisplayedStringBattle);
RenderTextHandleBold(ptr, gDisplayedStringBattle);

i = 0;
_7 = 7;
Expand All @@ -1571,15 +1569,15 @@ void sub_8045180(struct Sprite *sprite)
else
r0 = 0x2B;

CpuCopy32(sub_8043CDC(r0), ptr + 0x40 * i, 32);
CpuCopy32(GetHealthboxElementGfxPtr(r0), ptr + 0x40 * i, 32);
i++;
p++;
}
}
}

for (; i < _7; i++)
CpuCopy32(sub_8043CDC(0x2B), ptr + 64 * i, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0x2B), ptr + 64 * i, 32);

if (GetBattlerSide(gSprites[a].data[6]) == 0 && !IsDoubleBattle())
{
Expand Down Expand Up @@ -1635,7 +1633,7 @@ static void sub_8045458(u8 a, u8 b)
{
r4 = gSprites[a].data[5];
if (b != 0)
CpuCopy32(sub_8043CDC(0x46), OBJ_VRAM0 + (gSprites[r4].oam.tileNum + 8) * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0x46), OBJ_VRAM0 + (gSprites[r4].oam.tileNum + 8) * 32, 32);
else
CpuFill32(0, OBJ_VRAM0 + (gSprites[r4].oam.tileNum + 8) * 32, 32);
}
Expand Down Expand Up @@ -1670,38 +1668,38 @@ static void sub_8045458(u8 a, u8 b)
}
if (r4 & 7)
{
r6 = sub_8043CDC(sub_80457E8(0x1B, r7));
r6 = GetHealthboxElementGfxPtr(sub_80457E8(0x1B, r7));
r0 = 2;
}
else if (r4 & 0x88)
{
r6 = sub_8043CDC(sub_80457E8(0x15, r7));
r6 = GetHealthboxElementGfxPtr(sub_80457E8(0x15, r7));
r0 = 0;
}
else if (r4 & 0x10)
{
r6 = sub_8043CDC(sub_80457E8(0x21, r7));
r6 = GetHealthboxElementGfxPtr(sub_80457E8(0x21, r7));
r0 = 4;
}
else if (r4 & 0x20)
{
r6 = sub_8043CDC(sub_80457E8(0x1E, r7));
r6 = GetHealthboxElementGfxPtr(sub_80457E8(0x1E, r7));
r0 = 3;
}
else if (r4 & 0x40)
{
r6 = sub_8043CDC(sub_80457E8(0x18, r7));
r6 = GetHealthboxElementGfxPtr(sub_80457E8(0x18, r7));
r0 = 1;
}
else
{
r6 = sub_8043CDC(0x27);
r6 = GetHealthboxElementGfxPtr(0x27);

for (i = 0; i < 3; i++)
CpuCopy32(r6, OBJ_VRAM0 + (gSprites[a].oam.tileNum + r8 + i) * 32, 32);

if (!gBattleSpriteInfo[r7].hpNumbersNoBars)
CpuCopy32(sub_8043CDC(1), OBJ_VRAM0 + gSprites[r10].oam.tileNum * 32, 64);
CpuCopy32(GetHealthboxElementGfxPtr(1), OBJ_VRAM0 + gSprites[r10].oam.tileNum * 32, 64);

sub_8045458(a, 1);
return;
Expand All @@ -1717,8 +1715,8 @@ static void sub_8045458(u8 a, u8 b)
{
if (!gBattleSpriteInfo[r7].hpNumbersNoBars)
{
CpuCopy32(sub_8043CDC(0), OBJ_VRAM0 + gSprites[r10].oam.tileNum * 32, 32);
CpuCopy32(sub_8043CDC(0x41), OBJ_VRAM0 + (gSprites[r10].oam.tileNum + 1) * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0), OBJ_VRAM0 + gSprites[r10].oam.tileNum * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0x41), OBJ_VRAM0 + (gSprites[r10].oam.tileNum + 1) * 32, 32);
}
}
sub_8045458(a, 0);
Expand Down Expand Up @@ -1794,9 +1792,9 @@ static u8 sub_80457E8(u8 a, u8 b)

r6 = &eBattleInterfaceGfxBuffer[0x520 + GetBattlerPosition(gSprites[a].data[6]) * 0x180];
r8 = 7;
sub_80034D4(r6, BattleText_SafariBalls);
RenderTextHandleBold(r6, BattleText_SafariBalls);
for (i = 0; i < r8; i++)
CpuCopy32(sub_8043CDC(0x2B), r6 + i * 64, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0x2B), r6 + i * 64, 32);
for (r7 = 3; r7 < 3 + r8; r7++)
{
addr = OBJ_VRAM0 + (gSprites[a].oam.tileNum + MACRO1(r7)) * 32;
Expand All @@ -1823,7 +1821,7 @@ static u8 sub_80457E8(u8 a, u8 b)
status = GetBattlerPosition(gSprites[a].data[6]);
r7 = &eBattleInterfaceGfxBuffer[0x520 + status * 0x180];
r6 = 5;
sub_80034D4(r7, gDisplayedStringBattle);
RenderTextHandleBold(r7, gDisplayedStringBattle);
r7 = &eBattleInterfaceGfxBuffer[0x520 + status * 0x180 + 32];
for (i = 6; i < 6 + r6; i++)
{
Expand Down Expand Up @@ -1965,9 +1963,9 @@ static void sub_8045D58(u8 a, u8 b)
{
u8 r4 = gSprites[eBattleBars[a].healthboxSpriteId].data[5];
if (i < 2)
CpuCopy32(sub_8043CDC(r8) + sp8[i] * 32, OBJ_VRAM0 + (gSprites[r4].oam.tileNum + 2 + i) * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(r8) + sp8[i] * 32, OBJ_VRAM0 + (gSprites[r4].oam.tileNum + 2 + i) * 32, 32);
else
CpuCopy32(sub_8043CDC(r8) + sp8[i] * 32, OBJ_VRAM0 + 64 + (i + gSprites[r4].oam.tileNum) * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(r8) + sp8[i] * 32, OBJ_VRAM0 + 64 + (i + gSprites[r4].oam.tileNum) * 32, 32);
}
break;
case 1:
Expand All @@ -1986,9 +1984,9 @@ static void sub_8045D58(u8 a, u8 b)
for (i = 0; i < 8; i++)
{
if (i < 4)
CpuCopy32(sub_8043CDC(0xC) + sp8[i] * 32, OBJ_VRAM0 + (gSprites[eBattleBars[a].healthboxSpriteId].oam.tileNum + 0x24 + i) * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0xC) + sp8[i] * 32, OBJ_VRAM0 + (gSprites[eBattleBars[a].healthboxSpriteId].oam.tileNum + 0x24 + i) * 32, 32);
else
CpuCopy32(sub_8043CDC(0xC) + sp8[i] * 32, OBJ_VRAM0 + 0xB80 + (i + gSprites[eBattleBars[a].healthboxSpriteId].oam.tileNum) * 32, 32);
CpuCopy32(GetHealthboxElementGfxPtr(0xC) + sp8[i] * 32, OBJ_VRAM0 + 0xB80 + (i + gSprites[eBattleBars[a].healthboxSpriteId].oam.tileNum) * 32, 32);
}
break;
}
Expand Down
4 changes: 2 additions & 2 deletions src/contest_link_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ void sub_80C3158(const u8 *string, u8 spriteId)
displayedStringBattle[2] = width;
displayedStringBattle[3] = EOS;

sub_80034D4(eContestLink80C2020Struct2018068, gDisplayedStringBattle);
RenderTextHandleBold(eContestLink80C2020Struct2018068, gDisplayedStringBattle);

CpuCopy32(&gUnknown_083D1624[0x0], (void *)(VRAM + 0x10000) + 32 * sp00[0], 32);
CpuCopy32(&gUnknown_083D1624[0x40], (void *)(VRAM + 0x10000) + 32 * sp00[0] + 0x100, 32);
Expand Down Expand Up @@ -1061,7 +1061,7 @@ void sub_80C3158(const u8 * string, u8 spriteId)
"\tldr r0, _080C32DC @ =gSharedMem + 0x18068\n"
"\tmov r10, r0\n"
"\tldr r1, _080C32D4 @ =gDisplayedStringBattle\n"
"\tbl sub_80034D4\n"
"\tbl RenderTextHandleBold\n"
"\tmov r0, sp\n"
"\tldrh r4, [r0]\n"
"\tlsls r4, 5\n"
Expand Down
4 changes: 2 additions & 2 deletions src/debug/matsuda_debug_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ static void sub_80A9FE4(void)
{
u8 ptr[] = _("{HIGHLIGHT WHITE2} ");
DmaFill32Large(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000);
sub_80034D4((void *)VRAM, ptr);
RenderTextHandleBold((void *)VRAM, ptr);
LoadFontDefaultPalette(&gWindowTemplate_81E6C3C);
}

Expand Down Expand Up @@ -906,7 +906,7 @@ void sub_80AAD84(u8 *string, u8 b, u8 c, u8 d)
{
str2[0] = string[i];
str2[1] = EOS;
sub_80034D4(sp0, str2);
RenderTextHandleBold(sp0, str2);
DmaCopy32Defvars(3, sp20, (void *)(VRAM + 0x18000 - (d + 1) * 256 + i * 32), sizeof(sp0));
}

Expand Down
2 changes: 1 addition & 1 deletion src/text.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2369,7 +2369,7 @@ u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 to
return retVal;
}

void sub_80034D4(u8 *tileData, const u8 *text)
void RenderTextHandleBold(u8 *tileData, const u8 *text)
{
Text_InitWindow8004E3C(&gWindowTemplate_81E6C74, tileData, text);
}
Expand Down