Match sub_80073B8

This commit is contained in:
Kermalis 2023-08-06 22:20:16 -04:00
parent 60b498f072
commit 3ee8225409
42 changed files with 25 additions and 71 deletions

View File

@ -5,33 +5,6 @@
.text
thumb_func_start sub_80073B8
sub_80073B8:
lsls r1, r0, 3
adds r1, r0
lsls r1, 3
ldr r0, _080073D8
adds r1, r0
ldr r0, [r1, 0x2C]
lsrs r0, 2
lsls r0, 2
ldr r2, [r1, 0x1C]
adds r0, r2, r0
str r0, [r1, 0x3C]
str r2, [r1, 0x40]
adds r1, 0x46
movs r0, 0x1
strb r0, [r1]
bx lr
.align 2, 0
_080073D8: .4byte gUnknown_2027370
thumb_func_end sub_80073B8
thumb_func_start nullsub_155
nullsub_155:
bx lr
thumb_func_end nullsub_155
thumb_func_start sub_80073E0
sub_80073E0:
push {r4,lr}

View File

@ -17,11 +17,13 @@ struct UnkTextStruct1
s32 unk20;
s32 unk24;
void *unk28; // Somewhere in VRAM
s32 unk2C;
u32 unk2C;
s32 unk30;
s32 unk34;
s32 unk38;
u8 fill3C[0x45 - 0x3C];
u8 *unk3C;
u8 *unk40;
u8 fill44;
bool8 unk45;
u8 unk46;
};

View File

@ -5,6 +5,7 @@
void sub_8006518(struct UnkTextStruct2 *);
void sub_8006554(struct UnkTextStruct1 *, void *, u8 *, u16 *, u32, const struct UnkTextStruct2 *, u8, u32, struct UnkTextStruct2_sub *, u8);
void sub_80073B8(s32);
// text.s
extern void InitGraphics(void);

View File

@ -52,7 +52,6 @@ extern s16 sub_8097870();
extern s32 sub_80977B8();
extern s32 sub_80977F8();
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void xxx_format_and_draw(u32, u32, const char *, u32, u32);
const u8 *GetAdventureLogLine(u8 index);

View File

@ -86,7 +86,6 @@ extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern void sub_801B748(u32);
extern void sub_8008C54(u32);
extern void sub_80073E0(u32);
extern void sub_80073B8(u32);
extern void xxx_format_and_draw(u32, u32, u8 *, u32, u32);
extern void PlayMenuSoundEffect(u32);
extern void sub_8013F84(void);

View File

@ -146,7 +146,6 @@ extern u32 sub_801CE58(void);
extern void sub_801CC38(void);
extern void sub_80140B4(struct UnkTextStruct2 *);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern u32 sub_8097DF0(char *, struct subStruct_203B240 **);
extern void sub_8013F84(void);

View File

@ -58,7 +58,6 @@ extern const char *sub_8098FB4();
extern void xxx_format_string(const char *, u8 *, u32 **, u32);
extern s32 sub_8008ED0(u8 *);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
void LoadTeamRankBadge(u32, u32, u32);
extern void SetBGPaletteBufferColorArray(s32 index, u8 *colorArray);

View File

@ -57,7 +57,6 @@ extern u8 gUnknown_80DC2DC[];
extern void PlayMenuSoundEffect(u32);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_80140B4(struct UnkTextStruct2 *);
extern void sub_801F918(s32);

View File

@ -49,7 +49,6 @@ extern u8 gUnknown_80DC4F0[];
extern u8 *gUnknown_80D49BC[];
extern u8 gUnknown_80DC524[];
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_8092578(u8 *buffer, u8 index, u8 r2);
void sub_800792C(u32, u32, u32, u32, u32);

View File

@ -464,7 +464,6 @@ void sub_8023420(void)
extern u8 gUnknown_80DC934[];
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
bool8 HasRecruitedMon(s16 species_);
extern u8 gUnknown_80DC93C[];

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_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_80078A4(u32, u32, u32, u32, u32);
extern void sub_803D2C0(u8 *, struct unkStruct_203B480 *);

View File

@ -5,6 +5,7 @@
#include "moves.h"
#include "dungeon_global_data.h"
#include "text_util.h"
#include "text2.h"
struct unkStruct_8113080
{
@ -39,7 +40,6 @@ extern struct unkStruct_8113080 gUnknown_8113080[];
void sub_80928C0(u8 *buffer, struct Move *move, struct unkStruct_80928C0 *param_3);
extern void xxx_format_string(const char *, u8 *, void *, u32);
void PrintYellowDungeonNametoBuffer(u8 *buffer, struct DungeonLocation *dungeonLocation);
extern void sub_80073B8(u32);
extern void xxx_format_and_draw(s32, s32, const u8 *, ...);
extern s32 sub_8008ED0(u8 *);
extern void sub_80073E0(u32);

View File

@ -40,7 +40,6 @@ extern u16 gUnknown_80E5990[];
extern void sub_80015C0(u32, u32);
extern s32 sub_8001658(u32, u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_8099690(u32);
extern void sub_8099A5C(u32, u32, u32);

View File

@ -48,7 +48,6 @@ extern u32 sub_8023A94(u32);
extern s16 sub_8023B44(void);
extern void sub_8023C60(void);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_8013C68(u32 *);
extern void sub_80073E0(u32);
extern void sub_8023DA4(void);

View File

@ -102,7 +102,6 @@ extern void sub_801C8C4(u32, u32, u32, u32);
extern void sub_801CB5C(u32);
extern void sub_801CCD8();
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_8013C68(u32 *);
extern u32 sub_801CA08(u32);

View File

@ -30,7 +30,6 @@ extern u8 gFelicityMoney[];
extern u8 gUnknown_80DB738;
extern void PlaySound(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_8008C54(u32);
extern void sub_8013AA0(u32 *);

View File

@ -1,7 +1,7 @@
#include "global.h"
#include "constants/dungeon.h"
#include "memory.h"
#include "text.h"
#include "text2.h"
#include "input.h"
#include "menu.h"
#include "item.h"
@ -34,7 +34,6 @@ extern u32 sub_801F890(void);
extern void sub_801F8D0(void);
extern void xxx_format_and_draw(u32, u32, const u8 *, ...);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern u8 gUnknown_202DE58[];
extern u32 sub_801F194(void);

View File

@ -114,7 +114,6 @@ ALIGNED(4) const u8 gFriendListItem[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0
ALIGNED(4) static const u8 fill0[] = "pksdir0";
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void xxx_format_and_draw(s32, s32, const u8 *, ...);
extern u32 sub_8023A94(u32);

View File

@ -49,7 +49,6 @@ extern void sub_801E714(void);
extern void sub_801E76C(void);
extern void DisplayChosenHint(void);
extern void sub_80073E0(u32);
extern void sub_80073B8(u32);
extern void sub_8008C54(u32);
void DrawHintSelectionMenu(void);
void sub_801E594(void);

View File

@ -11,7 +11,7 @@
#include "team_inventory.h"
#include "code_800D090.h"
#include "text_util.h"
#include "text2.h"
#include <stddef.h>
extern struct FileArchive gSystemFileArchive;
@ -39,7 +39,6 @@ EWRAM_DATA struct TeamInventory gTeamInventory = {0};
EWRAM_DATA_2 struct TeamInventory *gTeamInventoryRef = {0};
extern s32 sub_8090FEC(s32 a1, u8* a2, u8 a3);
extern void sub_80073B8(u32);
extern u32 sub_8097DF0(char *, struct subStruct_203B240 **);
extern void sub_80078A4(u32, u32, u32, u32, u32);
extern void sub_80073E0(u32);

View File

@ -38,7 +38,6 @@ extern const u8 gUnknown_80DB830[]; // "Number?\0"
extern const u8 *gKangaskhanStorageDialogue[2][20];
// text.s
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_8008C54(u32);
// code_80130A8.s

View File

@ -54,7 +54,6 @@ extern const u8 gTeamToolboxA[];
extern const u8 gTeamToolboxB[];
// text.s
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_8007B7C(s32, s32, s32, s32, s32);
extern void sub_8008C54(u32);

View File

@ -56,7 +56,6 @@ extern u32 sub_8001658(u32, u32);
extern void sub_80073E0(u32);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void xxx_format_string(u8 *, u8 *, u8 *, u32);
extern void SetBGPaletteBufferColorArray(s32, s32);

View File

@ -88,7 +88,6 @@ extern void sub_802B640(u32, u32, u32);
extern void sub_802B7D0(u32);
extern void sub_802B9FC(u8);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern u32 sub_802BA8C(void);
extern void sub_802BACC(void);

View File

@ -66,7 +66,6 @@ ALIGNED(4) const u8 gUnknown_80E0824[] = _("{STAR_BULLET}");
ALIGNED(4) const u8 gMakuhitaCoursePlaceholder[] = _("{COLOR_2}%c%s{END_COLOR_TEXT_2}");
static const u8 makuhita_dojo_fill3[] = "pksdir0";
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_8008C54(u32);
extern u32 sub_80095E4(s16, u32);

View File

@ -17,7 +17,6 @@ struct unkChar
extern u8 gUnknown_80D4828[];
extern void PlayMenuSoundEffect(u32);
extern void sub_80073B8(u32);
extern s32 sub_8008ED0(const u8 *);
extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32);
extern void sub_80073E0(u32);

View File

@ -6,7 +6,7 @@
#include "subStruct_203B240.h"
#include "code_809447C.h"
#include "text_util.h"
#include "text2.h"
#include "constants/colors.h"
#include "constants/monster.h"
#include "file_system.h"
@ -57,7 +57,6 @@ bool8 DoesMoveCharge(u16 move);
int unk_PrintMoveDescription(int, struct Move*, int, struct subStruct_203B240**);
extern void sub_80073B8(u32);
void sub_80928C0(u8 *buffer, struct Move *move, struct unkStruct_80928C0 *param_3);
extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32);
extern void unk_MovePrintData(struct Move*, int); // print something

View File

@ -53,7 +53,6 @@ extern const char *gUnknown_80D4920[];
extern const char *gUnknown_80D4928[];
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern s32 sub_8008ED0(u8 *);
extern void CreateOthersMenu(void);

View File

@ -172,7 +172,6 @@ extern void sub_801F214(void);
extern u32 sub_801F194(void);
extern u32 sub_801EF38(u32);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern s32 sub_8008ED0(u8 *);
extern void xxx_format_and_draw(s32, s32, const u8 *, ...);

View File

@ -81,7 +81,6 @@ extern void sub_802DE84(struct unkStruct_802C39C *);
extern void InitializeJobListMenu(u32);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern u32 sub_802C898(void);
extern void sub_802C8F4(void);

View File

@ -56,7 +56,6 @@ extern void sub_80160D8(void);
extern void sub_8099690(u32);
extern void sub_80073E0(u32);
extern void sub_80073B8(u32);
extern void sub_8008C54(u32);
extern void sub_800836C(u32, u8 *r0, u32);
extern void SetBGPaletteBufferColorArray(s32 index, u8 *colorArray);

View File

@ -170,7 +170,6 @@ extern void sub_8013E54(void);
extern char gUnknown_202E5D8[0x50];
extern char gAvailablePokemonNames[0x50];
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_802BC7C(void);
extern void sub_80073E0(u32);
extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32);

View File

@ -189,7 +189,6 @@ extern u8 *sub_80975DC(u32 r0);
extern u8 sub_8099360(u8 *);
extern u8 sub_8099394(volatile u8 *);
extern struct WonderMail *GetJobSlotInfo(u8);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_803B6B0(u32, u32, u32, u32);
extern s16 sub_80A2688(u8 r0);

View File

@ -1268,4 +1268,20 @@ void sub_8007334(s32 a0)
// Unused?
void nullsub_154(void)
{
}
void sub_80073B8(s32 a0)
{
struct UnkTextStruct1 *r1;
r1 = &gUnknown_2027370[a0];
r1->unk3C = r1->unk1C + (r1->unk2C >> 2 << 2);
r1->unk40 = r1->unk1C;
r1->unk46 = 1;
}
// Unused?
void nullsub_155(void)
{
}

View File

@ -100,7 +100,6 @@ extern u32 sub_8013BBC(u32 *);
extern void sub_80141B4(const u8 *, u32, u32, u32);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_8013C68(u32 *);
extern void sub_80073E0(u32);
extern u8 sub_801CF14(u32);

View File

@ -98,7 +98,6 @@ static const u8 wonder_mail_fill1[] = "pksdir0";
extern void sub_802CAA4(void);
extern u8 IsJobSlotEmpty(u8);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern struct WonderMail* GetJobSlotInfo(u8);
extern void sub_803B35C(struct WonderMail *, struct unkStruct_802C39C *);

View File

@ -18,7 +18,6 @@ extern void DrawPelipperBoardJobMenu(void);
extern void PlayMenuSoundEffect(u32);
extern u8 HasNoPelipperBoardJobs(void);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern struct WonderMail *GetPelipperBoardSlotInfo(u32);

View File

@ -2,7 +2,6 @@
#include "global.h"
#include "constants/dungeon.h"
#include "constants/input.h"
#include "memory.h"
#include "text1.h"
#include "text2.h"
@ -151,7 +150,6 @@ extern void AcceptJob(struct unkSubStruct_203B2F8 *);
extern void sub_8014248(const char *text, u32, u32, struct MenuItem *r0, u32, u32, u32, u32, u32);
struct unkStruct_803B344 *sub_803B344(u8);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void CreateRescueTitle(struct unkStruct_802C39C *);
extern u8 gUnknown_80DFDBC[];

View File

@ -132,7 +132,6 @@ extern u32 sub_801B60C(u32, u8, u8);
extern void sub_8092578(u8 *buffer, u8 index, u8 r2);
void HandleMissionReward(void);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
const u8 *sub_80974A0(s16 index);

View File

@ -82,7 +82,6 @@ extern void sub_803092C(void);
extern void PlayMenuSoundEffect(u32);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void CreateRescueTitle(struct unkStruct_802C39C *);

View File

@ -52,7 +52,6 @@ extern void sub_8030DD4(void);
extern void PlayMenuSoundEffect(u32);
extern void CreateRescueDescription(struct unkStruct_802C39C *);
extern void sub_80073E0(u32);
extern void sub_80073B8(u32);
void sub_8030E2C(void);
void sub_8030E48(void);

View File

@ -103,7 +103,6 @@ const struct UnkTextStruct2 gUnknown_80E0264 =
static const u8 wonder_mail_802DF88_fill1[] = "pksdir0";
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void CreateRescueDescription(struct unkStruct_802C39C *);
extern void PlayMenuSoundEffect(u32);