Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-27 19:24:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match sub_80078A4()

Browse Source
This commit is contained in:
Kermalis
2023-08-07 08:26:38 -04:00
parent 175400074e
commit 5327e536bb
10 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
asm/text.s
View File

@@ -5,41 +5,6 @@
.text
thumb_func_start sub_80078A4
sub_80078A4:
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x4
adds r5, r0, 0
adds r6, r1, 0
adds r4, r2, 0
mov r8, r3
ldr r0, [sp, 0x18]
str r0, [sp]
adds r0, r5, 0
bl sub_800792C
adds r4, 0x1
ldr r0, _080078E4
ldr r0, [r0]
movs r1, 0xF
ands r0, r1
str r0, [sp]
adds r0, r5, 0
adds r1, r6, 0
adds r2, r4, 0
mov r3, r8
bl sub_800792C
add sp, 0x4
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080078E4: .4byte gUnknown_202B030
thumb_func_end sub_80078A4
thumb_func_start sub_80078E8
sub_80078E8:
push {r4-r6,lr}

1
include/text1.h
View File

@@ -5,6 +5,7 @@
extern EWRAM_DATA struct UnkTextStruct1 gUnknown_2027370[4];
extern EWRAM_DATA struct UnkTextStruct2 gUnknown_202AFC0[4];
extern EWRAM_DATA u32 gUnknown_202B030;
extern EWRAM_DATA u16 gUnknown_202B038[4][32][32];
void LoadCharmaps(void);

3
include/text2.h
View File

@@ -26,10 +26,13 @@ void sub_8006518(struct UnkTextStruct2 *);
void sub_8006554(struct UnkTextStruct1 *, u32 *, u32 *, u16 *, u32, const struct UnkTextStruct2 *, u8, u32, struct UnkTextStruct2_sub *, u8);
void sub_80073B8(s32);
void sub_80073E0(s32);
void sub_80078A4(u32, s32, s32, u32, u32);
// text.s
extern struct unkChar *GetCharacter(u32);
extern void InitGraphics(void);
extern void xxx_call_draw_string(s32 x, u32 y, const u8 *str, u32 , u32);
extern void sub_800792C(u32, s32, s32, u32, u32);
#endif // GUARD_TEXT2_H

1
src/code_8021774.c
View File

@@ -50,7 +50,6 @@ extern u8 *gUnknown_80D49BC[];
extern u8 gUnknown_80DC524[];
extern void sub_8008C54(u32);
extern void sub_8092578(u8 *buffer, u8 index, u8 r2);
void sub_800792C(u32, u32, u32, u32, u32);
void sub_8007A78(u32, u32, u32, u32, u32);
extern void sub_8021878(void);

1
src/code_8031D70.c
View File

@@ -48,7 +48,6 @@ ALIGNED(4) const u8 gUnknown_80E1FDC[] = "Password";
ALIGNED(4) static const u8 fill0[] = "pksdir0";
extern void sub_8008C54(u32);
extern void sub_80078A4(u32, u32, u32, u32, u32);
extern void sub_803D2C0(u8 *, struct unkStruct_203B480 *);
extern void PlayMenuSoundEffect(u32);

1
src/items.c
View File

@@ -40,7 +40,6 @@ EWRAM_DATA_2 struct TeamInventory *gTeamInventoryRef = {0};
extern s32 sub_8090FEC(s32 a1, u8* a2, u8 a3);
extern u32 sub_8097DF0(char *, struct subStruct_203B240 **);
extern void sub_80078A4(u32, u32, u32, u32, u32);
extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32);
extern s32 sub_8091E94(s32 a1, s32 a2, s32 a3);
extern void SortKecleonShopInventory();

1
src/moves.c
View File

@@ -62,7 +62,6 @@ extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32);
extern void unk_MovePrintData(struct Move*, int); // print something
extern u32 sub_8097DF0(char *, struct subStruct_203B240 **);
extern void sub_80078A4(u32, u32, u32, u32, u32);
extern u8 sub_8092B00(struct Move*);
extern u32 sub_8092BC0(struct Move*);
extern u32 gUnknown_202DE30;

1
src/options_menu.c
View File

@@ -55,7 +55,6 @@ extern const char *gUnknown_80D4928[];
extern void sub_8008C54(u32);
extern s32 sub_8008ED0(u8 *);
extern void CreateOthersMenu(void);
extern void sub_80078A4(u32, u32, u32, u32, u32);
void PlayMenuSoundEffect(u32);
void CreateOptionsMenu(void);
void nullsub_38(void);

2
src/text1.c
View File

@@ -17,7 +17,7 @@ EWRAM_DATA struct UnkTextStruct2 gUnknown_202AFC0[4];
EWRAM_DATA u32 gUnknown_202B020;
EWRAM_DATA u32 gUnknown_202B024;
EWRAM_DATA u32 gUnknown_202B028[2];
EWRAM_DATA u32 gUnknown_202B030;
EWRAM_DATA u32 gUnknown_202B030; // Some text color info is stored; retrieve via "& 0xF"
EWRAM_DATA u8 gUnknown_202B034;
EWRAM_DATA u16 gUnknown_202B038[4][32][32];

6
src/text2.c
View File

@@ -1897,4 +1897,10 @@ u32 xxx_draw_char(struct UnkTextStruct1 *a0, s32 x, s32 y, u32 a3, u32 color, u3
"_08007898: .4byte 0x11111111\n"
"_0800789C: .4byte gUnknown_202B030\n"
"_080078A0: .4byte gCharacterSpacing");
}
void sub_80078A4(u32 a0, s32 x, s32 y, u32 a3, u32 color)
{
sub_800792C(a0, x, y, a3, color);
sub_800792C(a0, x, y + 1, a3, gUnknown_202B030 & 0xF);
}