Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-04-26 00:13:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeruby into porymap-6

Browse Source
This commit is contained in:
GriffinR 2024-10-11 13:38:51 -04:00
commit 68acbcf740
12 changed files with 85 additions and 681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -38,8 +38,8 @@ jobs:
path: 'agbcc'
- name: Install binutils
run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi
# build-essential, git, and libpng-dev are already installed
run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi libpng-dev
# build-essential and git are already installed
# gcc-arm-none-eabi is only needed for the modern build
# as an alternative to dkP

2
include/battle_interface.h
View File

@ -21,7 +21,7 @@ void nullsub_11();
void UpdateOamPriorityInAllHealthboxes(u8);
void sub_8043F44(u8);
void sub_804454C(void);
u8 sub_8044804(u8, const struct HpAndStatus *, u8, u8);
u8 CreatePartyStatusSummarySprites(u8, const struct HpAndStatus *, u8, u8);
void sub_8044CA0(u8);
void sub_8045A5C(u8, struct Pokemon *, u8);
s32 sub_8045C78(u8, u8, u8, u8);

2
include/text.h
View File

@ -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);

2
src/battle_controller_link_opponent.c
View File

@ -1689,7 +1689,7 @@ void LinkOpponentHandlecmd48(void)
ewram17810[gActiveBattler].unk1_1 = 0;
}
}
gUnknown_02024E68[gActiveBattler] = sub_8044804(
gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(
gActiveBattler,
(struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
gBattleBufferA[gActiveBattler][1],

2
src/battle_controller_link_partner.c
View File

@ -1620,7 +1620,7 @@ void LinkPartnerHandlecmd48(void)
}
ewram17810[gActiveBattler].unk0_0 = 1;
gUnknown_02024E68[gActiveBattler] = sub_8044804(
gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(
gActiveBattler,
(struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
gBattleBufferA[gActiveBattler][1],

2
src/battle_controller_opponent.c
View File

@ -1838,7 +1838,7 @@ void OpponentHandlecmd48(void)
ewram17810[gActiveBattler].unk1_1 = 0;
}
}
gUnknown_02024E68[gActiveBattler] = sub_8044804(
gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(
gActiveBattler,
(struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
gBattleBufferA[gActiveBattler][1],

2
src/battle_controller_player.c
View File

@ -2967,7 +2967,7 @@ void PlayerHandlecmd48(void)
else
{
ewram17810[gActiveBattler].unk0_0 = 1;
gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
ewram17810[gActiveBattler].unk5 = 0;
if (gBattleBufferA[gActiveBattler][2] != 0)
ewram17810[gActiveBattler].unk5 = 0x5D;

2
src/battle_controller_wally.c
View File

@ -1539,7 +1539,7 @@ void WallyHandlecmd48(void)
else
{
ewram17810[gActiveBattler].unk0_0 = 1;
gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
WallyBufferExecCompleted();
}
}

738
src/battle_interface.c
View File

File diff suppressed because it is too large Load Diff

4
src/contest_link_util.c
View File

@ -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);
@ -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"

4
src/debug/matsuda_debug_menu.c
View File

@ -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);
}
@ -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));
}

2
src/text.c
View File

@ -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);
}