mirror of
https://github.com/pret/pokediamond.git
synced 2026-08-28 11:44:56 -05:00
Merge pull request #368 from remicalixte/unk_02031734
decompile unk_02031734.s
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,9 @@
|
||||
#include "global.h"
|
||||
#include "poke_overlay.h"
|
||||
#include "FS_overlay.h"
|
||||
#include "unk_02031734.h"
|
||||
|
||||
|
||||
extern u32 FUN_02033590(void);
|
||||
FS_EXTERN_OVERLAY(MODULE_16);
|
||||
|
||||
THUMB_FUNC static void MOD11_0222F284(void)
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
#include "global.h"
|
||||
#include "error_handling.h"
|
||||
#include "error_message_reset.h"
|
||||
#include "unk_02031734.h"
|
||||
|
||||
|
||||
extern u32 FUN_02031810(void);
|
||||
|
||||
THUMB_FUNC void ErrorHandling(void)
|
||||
{
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
#include "error_message_reset.h"
|
||||
#include "GX_layers.h"
|
||||
#include "unk_02031734.h"
|
||||
#include "unk_0202F150.h"
|
||||
|
||||
|
||||
|
||||
const u32 UNK_020FF49C[2] = { 0x1a030300, 0x00230112 };
|
||||
|
||||
@@ -27,9 +31,6 @@ extern void FUN_020196F4(u32 *, u8, u16, u16, u16, u16);
|
||||
extern void FUN_0200CCA4(u32 *param0, u32 param1, u32 param2, u32 param3);
|
||||
extern void FUN_0200E394(u32 param0);
|
||||
extern void FUN_0200A274(u32 param0, u32 param1, u32 param2);
|
||||
extern BOOL FUN_02032DAC(void);
|
||||
extern BOOL FUN_0202FB80(void);
|
||||
extern BOOL FUN_02033678(void);
|
||||
extern void FUN_02019178(u32 *param0);
|
||||
|
||||
THUMB_FUNC void VBlankHandler()
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
#include "heap.h"
|
||||
#include "error_message_reset.h"
|
||||
#include "unk_02031734.h"
|
||||
|
||||
|
||||
extern void *tempName_NNS_FndCreateExpHeapEx(void *param0, u32 param1, u32 param2);
|
||||
extern void *tempName_NNS_FndAllocFromExpHeapEx(void *param0, u32 param1, s32 param2);
|
||||
extern void thunk_FUN_020adc8c();
|
||||
extern void FUN_020ADDF0(void *ptr1, void *ptr2);
|
||||
extern u32 FUN_02031810(void);
|
||||
extern u32 FUN_020ADDC8(void *param0);
|
||||
extern void FUN_020AE82C(u32 param0, void *param1, u32 param2);
|
||||
extern u32 FUN_020ADDC0(void *param0);
|
||||
|
||||
@@ -12,6 +12,10 @@
|
||||
#include "player_data.h"
|
||||
#include "sound.h"
|
||||
#include "timer3.h"
|
||||
#include "unk_02031734.h"
|
||||
#include "unk_0202F150.h"
|
||||
|
||||
|
||||
|
||||
FS_EXTERN_OVERLAY(MODULE_52);
|
||||
FS_EXTERN_OVERLAY(MODULE_63);
|
||||
@@ -23,9 +27,6 @@ struct Unk2106FA0 gBacklightTop;
|
||||
extern BOOL OverlayManager_new(struct Unk21DBE18 *, s32 *, int);
|
||||
extern BOOL OverlayManager_Run(int);
|
||||
extern void OverlayManager_delete(int);
|
||||
extern BOOL FUN_02033678(void);
|
||||
extern u32 FUN_020335B8(void);
|
||||
extern BOOL FUN_0202FB80(void);
|
||||
|
||||
extern void InitSystemForTheGame(void);
|
||||
extern void InitGraphicMemory(void);
|
||||
@@ -218,7 +219,6 @@ THUMB_FUNC void FUN_02000EE8(void)
|
||||
}
|
||||
|
||||
extern void FUN_0200E3A0(PMLCDTarget, int);
|
||||
extern BOOL FUN_02032DAC(void);
|
||||
|
||||
// No Return
|
||||
THUMB_FUNC void DoSoftReset(u32 parameter)
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#include "unk_0202F150.h"
|
||||
#include "unk_02031480.h"
|
||||
#include "unk_02031734.h"
|
||||
|
||||
struct
|
||||
{
|
||||
u8 unk00;
|
||||
@@ -9,7 +11,6 @@ struct
|
||||
vu8 UNK_02105D58 = 4;
|
||||
vu8 UNK_02105D59 = 4;
|
||||
|
||||
extern int FUN_02033534();
|
||||
extern void FUN_0202D7D8(u8 *param0, u32 param1, struct UnkStruct0202F150_sub1 *param2);
|
||||
extern u32 FUN_0200CA60(void (*param0)(), u32 param1, u32 param2);
|
||||
extern void FUN_0202D394(struct UnkStruct0202F150_sub1 *param0, u8 *param1, u32 param2);
|
||||
@@ -25,10 +26,8 @@ extern void FUN_0202D824(u8 *param0);
|
||||
extern u32 FUN_0202E9E8(u32 param0);
|
||||
extern u32 FUN_0202F03C();
|
||||
extern u32 FUN_0202EE24();
|
||||
extern void FUN_02031CDC();
|
||||
extern void FUN_0202EBD0(u16 param0);
|
||||
extern void FUN_0202ED70(u32 param0);
|
||||
extern void FUN_020335F4(u32 param0);
|
||||
extern void FUN_0202E538();
|
||||
extern u32 MOD04_021D78FC(void *param0, u32 param1);
|
||||
extern u32 FUN_0202CBD4();
|
||||
@@ -52,7 +51,6 @@ extern void *FUN_0202DA40(u32 param0, u32 param1, u16 param2);
|
||||
extern u32 MOD04_021D8018();
|
||||
extern u32 FUN_0202EDF8();
|
||||
extern u16 FUN_0202D19C();
|
||||
extern void FUN_020334E8(u32 param0, u32 param1);
|
||||
extern u32 FUN_0202EE60();
|
||||
extern void FUN_0202F05C();
|
||||
extern void GF_RTC_CopyDateTime(RTCDate *, RTCTime *);
|
||||
@@ -537,7 +535,7 @@ THUMB_FUNC void FUN_0202FB58()
|
||||
}
|
||||
}
|
||||
|
||||
THUMB_FUNC u32 FUN_0202FB80()
|
||||
THUMB_FUNC BOOL FUN_0202FB80()
|
||||
{
|
||||
FUN_02031CDC();
|
||||
|
||||
@@ -587,7 +585,7 @@ THUMB_FUNC u32 FUN_0202FB80()
|
||||
FUN_020335F4(0);
|
||||
FUN_020315A4();
|
||||
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
THUMB_FUNC void FUN_0202FC60()
|
||||
@@ -2021,9 +2019,9 @@ THUMB_FUNC u32 FUN_02030E7C(u16 param0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
THUMB_FUNC u32 FUN_02030F20()
|
||||
THUMB_FUNC s32 FUN_02030F20()
|
||||
{
|
||||
u32 r4 = 0;
|
||||
s32 r4 = 0;
|
||||
for (int i = 0; i < 8; i++)
|
||||
{
|
||||
if (FUN_02030E7C((u16)i) != 0)
|
||||
|
||||
2190
arm9/src/unk_02031734.c
Normal file
2190
arm9/src/unk_02031734.c
Normal file
File diff suppressed because it is too large
Load Diff
@@ -105,7 +105,7 @@ THUMB_FUNC void FUN_0202FA5C();
|
||||
THUMB_FUNC u32 FUN_0202FB18(u32 param0);
|
||||
THUMB_FUNC void FUN_0202FB20();
|
||||
THUMB_FUNC void FUN_0202FB58();
|
||||
THUMB_FUNC u32 FUN_0202FB80();
|
||||
THUMB_FUNC BOOL FUN_0202FB80();
|
||||
THUMB_FUNC void FUN_0202FC60();
|
||||
THUMB_FUNC void FUN_0202FC80();
|
||||
THUMB_FUNC void FUN_0202FCA8();
|
||||
@@ -145,7 +145,7 @@ THUMB_FUNC void FUN_02030C8C(struct UnkStruct0202F150_sub1 *param0,
|
||||
THUMB_FUNC void FUN_02030DA4();
|
||||
THUMB_FUNC void FUN_02030DFC();
|
||||
THUMB_FUNC u32 FUN_02030E7C(u16 param0);
|
||||
THUMB_FUNC u32 FUN_02030F20();
|
||||
THUMB_FUNC s32 FUN_02030F20();
|
||||
THUMB_FUNC u32 FUN_02030F40();
|
||||
THUMB_FUNC void FUN_02030F60(u8 param0);
|
||||
THUMB_FUNC u8 FUN_02030F74(u32 param0);
|
||||
|
||||
215
include/unk_02031734.h
Normal file
215
include/unk_02031734.h
Normal file
@@ -0,0 +1,215 @@
|
||||
#ifndef POKEDIAMOND_UNK_02031734_H
|
||||
#define POKEDIAMOND_UNK_02031734_H
|
||||
|
||||
#include "global.h"
|
||||
|
||||
struct UnkStruct_02031734_const1
|
||||
{
|
||||
u32 unk00[3];
|
||||
};
|
||||
|
||||
struct UnkStruct_02031734_const2
|
||||
{
|
||||
u32 unk00[2];
|
||||
};
|
||||
|
||||
struct UnkStruct_02031734
|
||||
{
|
||||
void *unk00;
|
||||
u8 unk04[6];
|
||||
s64 unk0C[3];
|
||||
void (*unk24)();
|
||||
struct SaveBlock2 *unk28;
|
||||
struct PlayerData *unk2C;
|
||||
u32 unk30;
|
||||
u32 unk34;
|
||||
u16 unk38;
|
||||
u16 unk3A;
|
||||
u8 unk3C;
|
||||
u8 unk3D;
|
||||
u8 unk3E;
|
||||
u8 unk3F;
|
||||
u8 unk40;
|
||||
u8 unk41;
|
||||
u8 unk42;
|
||||
u8 unk43;
|
||||
u8 unk44;
|
||||
u8 unk45;
|
||||
u8 unk46;
|
||||
u8 unk47;
|
||||
u8 unk48;
|
||||
u8 unk49;
|
||||
u8 unk4A;
|
||||
u8 unk4B;
|
||||
u8 unk4C;
|
||||
u8 unk4D;
|
||||
u8 unk4E;
|
||||
u8 unk4F;
|
||||
};
|
||||
|
||||
inline u32 compute(s64 *param0, u32 param1)
|
||||
{
|
||||
param0[0] = param0[1] * param0[0] + param0[2];
|
||||
|
||||
return (u32)(((s64)((u64)(param0[0]) >> 32) * param1) >> 32);
|
||||
}
|
||||
|
||||
void FUN_02031734(struct SaveBlock2 *sav2, u8 param1);
|
||||
void FUN_020317C0();
|
||||
BOOL FUN_02031810();
|
||||
void FUN_02031824(struct SaveBlock2 *sav2);
|
||||
void FUN_02031860();
|
||||
void FUN_02031880();
|
||||
void FUN_020318A4(u8 param0);
|
||||
void FUN_020318B4();
|
||||
BOOL FUN_020318C4();
|
||||
void FUN_02031914();
|
||||
void FUN_02031924();
|
||||
void FUN_02031934();
|
||||
void FUN_02031948(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3);
|
||||
void FUN_02031990(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3);
|
||||
void FUN_020319D8(u8 param0);
|
||||
void FUN_020319F4();
|
||||
void FUN_02031A08();
|
||||
void FUN_02031A24();
|
||||
BOOL FUN_02031A2C();
|
||||
void FUN_02031A7C(struct SaveBlock2 *sav2);
|
||||
void FUN_02031AC8(u8 param0);
|
||||
s32 FUN_02031AF4();
|
||||
BOOL FUN_02031B2C();
|
||||
void FUN_02031B50();
|
||||
u32 FUN_02031BD0();
|
||||
void FUN_02031BF4();
|
||||
void FUN_02031C10();
|
||||
void FUN_02031C2C();
|
||||
void FUN_02031C54();
|
||||
void FUN_02031C64();
|
||||
void FUN_02031C74(struct SaveBlock2 *sav2, u8 param1);
|
||||
void FUN_02031CA8(struct SaveBlock2 *sav2, u8 param1);
|
||||
void FUN_02031CDC();
|
||||
void FUN_02031D20(void (*param0)(), u32 param1);
|
||||
void FUN_02031D30();
|
||||
void FUN_02031E08();
|
||||
void FUN_02031E8C();
|
||||
void FUN_02031EE0();
|
||||
void FUN_02031F60();
|
||||
void FUN_02031FC8();
|
||||
void FUN_02032028();
|
||||
void FUN_02032040();
|
||||
void FUN_02032058();
|
||||
void FUN_020320C4();
|
||||
void FUN_02032118();
|
||||
void FUN_02032138();
|
||||
void FUN_0203213C();
|
||||
void FUN_02032140();
|
||||
void FUN_02032178();
|
||||
void FUN_02032194();
|
||||
void FUN_020321B8();
|
||||
void FUN_020321D0();
|
||||
void FUN_02032218();
|
||||
void FUN_02032234();
|
||||
void FUN_0203224C();
|
||||
void FUN_02032290();
|
||||
void FUN_02032298();
|
||||
void FUN_020322C0();
|
||||
void FUN_020322F8();
|
||||
void FUN_0203230C();
|
||||
void FUN_0203234C();
|
||||
void FUN_02032364();
|
||||
void FUN_02032378();
|
||||
void FUN_020323B8();
|
||||
void FUN_020323BC();
|
||||
void FUN_020323CC();
|
||||
void FUN_020323DC();
|
||||
void FUN_02032424();
|
||||
void FUN_02032440();
|
||||
void FUN_02032478();
|
||||
void FUN_020324C8();
|
||||
void FUN_020324F8();
|
||||
void FUN_02032510();
|
||||
void FUN_02032578();
|
||||
void FUN_020325D0();
|
||||
void FUN_02032628();
|
||||
void FUN_02032640();
|
||||
void FUN_0203266C();
|
||||
void FUN_020326D0();
|
||||
void FUN_02032738();
|
||||
void FUN_0203279C();
|
||||
void FUN_020327B4();
|
||||
void FUN_020327B8();
|
||||
void FUN_020327FC();
|
||||
void FUN_02032850();
|
||||
void FUN_02032888();
|
||||
void FUN_020328C0(u8 param0);
|
||||
void FUN_020328E4();
|
||||
void FUN_020328F4(u8 param0);
|
||||
void FUN_02032924();
|
||||
void FUN_0203293C();
|
||||
void FUN_02032978();
|
||||
void FUN_020329F4();
|
||||
void FUN_02032A8C(u8 param0, u32 param1, u8 *param2);
|
||||
void FUN_02032AEC(u32 param0, u32 param1, u8 *param2);
|
||||
u32 FUN_02032B68();
|
||||
void FUN_02032B6C(u8 param0);
|
||||
void FUN_02032B84();
|
||||
void FUN_02032B8C();
|
||||
void FUN_02032BD0(struct SaveBlock2 *sav2);
|
||||
void FUN_02032C0C();
|
||||
u32 FUN_02032C28();
|
||||
void FUN_02032C6C(u32 param0, u32 param1);
|
||||
void FUN_02032CF4();
|
||||
void FUN_02032D44(struct SaveBlock2 *sav2);
|
||||
void FUN_02032D80();
|
||||
u8 FUN_02032D9C();
|
||||
BOOL FUN_02032DAC();
|
||||
void FUN_02032E00();
|
||||
void FUN_02032E48();
|
||||
void FUN_02032E8C();
|
||||
void FUN_02032E90();
|
||||
void FUN_02032EA8();
|
||||
void FUN_02032EAC();
|
||||
void FUN_02032EB0();
|
||||
void FUN_02032F20(u32 param0);
|
||||
void FUN_02032F34();
|
||||
void FUN_02032F98();
|
||||
u32 FUN_02032FDC(u8 param0);
|
||||
u32 FUN_0203300C();
|
||||
void FUN_02033060();
|
||||
void FUN_020330A0();
|
||||
void FUN_020330E4();
|
||||
u8 FUN_02033128();
|
||||
u32 FUN_02033138();
|
||||
u32 FUN_02033154();
|
||||
u32 FUN_02033180();
|
||||
void FUN_0203318C();
|
||||
void FUN_020331C4();
|
||||
void FUN_020331E8();
|
||||
void FUN_02033208();
|
||||
void FUN_0203323C();
|
||||
u32 FUN_02033250();
|
||||
void FUN_02033288(struct SaveBlock2 *sav2);
|
||||
void FUN_020332DC();
|
||||
void FUN_02033310(struct SaveBlock2 *sav2);
|
||||
void FUN_02033364();
|
||||
u32 FUN_02033398();
|
||||
void FUN_020333F0();
|
||||
void FUN_0203341C();
|
||||
void *FUN_0203346C(struct SaveBlock2 *sav2, u32 param1);
|
||||
void *FUN_020334DC();
|
||||
void FUN_020334E8(u8 param0, u8 param1);
|
||||
u8 FUN_02033510();
|
||||
s32 FUN_02033534();
|
||||
u8 FUN_0203354C();
|
||||
void FUN_02033564(void *src);
|
||||
void FUN_02033578(void *dst);
|
||||
u32 FUN_02033590();
|
||||
void FUN_020335A4(u8 param0);
|
||||
u8 FUN_020335B8();
|
||||
void FUN_020335D0(s32 param0);
|
||||
void FUN_020335E0();
|
||||
void FUN_020335F0();
|
||||
void FUN_020335F4();
|
||||
BOOL FUN_02033678();
|
||||
u32 FUN_020336A0(u8 param0);
|
||||
|
||||
#endif // POKEDIAMOND_UNK_0202F150_H
|
||||
Reference in New Issue
Block a user