Game-Decompilation/fireemblem8u
1
0
Fork 0
mirror of https://github.com/FireEmblemUniverse/fireemblem8u.git synced 2024-11-27 07:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(worldmap_main) Decompile more main world map proc

Browse Source
This commit is contained in:
Eebit 2023-08-30 21:49:50 -04:00
parent d9ccd20b99
commit cd36fe6cea
10 changed files with 1109 additions and 2083 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2039
asm/code_80B5730.s
View File

File diff suppressed because it is too large Load Diff

70
include/functions.h
View File

@ -1485,7 +1485,7 @@ void sub_80920C4(void); // StartUnitListMenu
void sub_80920DC(ProcPtr);
void sub_8092134(ProcPtr);
// ??? sub_8092164(???);
// ??? sub_8092194(???);
void sub_8092194(ProcPtr);
// ??? sub_80921CC(???);
// ??? sub_8092298(???);
// ??? sub_80922F0(???);
@ -2026,12 +2026,12 @@ void ComputeChapterRankings(void);
// ??? sub_80B843C(???);
// ??? WMFaceCtrl_Loop(???);
// ??? nullsub_57(???);
// ??? StartWMFaceCtrl(???);
// ??? EndWMFaceCtrl(???);
ProcPtr StartWMFaceCtrl(ProcPtr parent);
void EndWMFaceCtrl(void);
// ??? GetWMFaceBlendAmt(???);
// ??? sub_80B86CC(???);
// ??? sub_80B8844(???);
// ??? sub_80B895C(???);
void sub_80B86CC(int faceSlot, int faceId, u16 config);
void sub_80B8844(int faceSlot, u16 config);
void sub_80B895C(void);
// ??? WorldMap_Destruct(???);
// ??? sub_80B8A7C(???);
// ??? sub_80B8B3C(???);
@ -2041,18 +2041,18 @@ void ComputeChapterRankings(void);
// ??? sub_80B8E14(???);
// ??? sub_80B8E60(???);
// ??? DeployEveryUnit(???);
// ??? nullsub_22(???);
void nullsub_22(void);
// ??? sub_80B8FD4(???);
// ??? sub_80B8FEC(???);
// ??? sub_80B9028(???);
// ??? sub_80B90CC(???);
// ??? sub_80B9114(???);
// ??? sub_80B9154(???);
// ??? sub_80B9218(???);
// ??? sub_80B92D0(???);
// ??? sub_80B93E0(???);
void sub_80B9218(ProcPtr);
s8 sub_80B92D0(ProcPtr);
int sub_80B93E0(ProcPtr);
// ??? sub_80B955C(???);
// ??? sub_80B95B0(???);
int sub_80B95B0(void);
// ??? sub_80B961C(???);
// ??? sub_80B96DC(???);
// ??? sub_80B96F8(???);
@ -2096,7 +2096,7 @@ void ComputeChapterRankings(void);
// ??? sub_80B9F54(???);
void sub_80B9FC0(void);
// ??? sub_80B9FD4(???);
// ??? sub_80BA008(???);
void sub_80BA008(int);
void EndWM(ProcPtr);
s8 sub_80BA054(void); // gmap something
// ??? sub_80BA06C(???);
@ -2107,7 +2107,7 @@ s8 sub_80BA054(void); // gmap something
// ??? sub_80BA288(???);
// ??? NewWorldMap(???);
// ??? WorldMap_SetupChapterStuff(???);
// ??? CallChapterWMIntroEvents(???);
void CallChapterWMIntroEvents(ProcPtr);
void sub_80BA424(void); // gmap something
// ??? sub_80BA458(???);
// ??? sub_80BA490(???);
@ -2163,8 +2163,8 @@ ProcPtr NewGmapUnitContainer(ProcPtr, int, int);
// ??? sub_80BB4C0(???);
// ??? sub_80BB538(???);
int WMLoc_GetChapterId(int);
// ??? WMLoc_GetNextLocId(???);
int sub_80BB628(int unused, int arg1, int arg2, int arg3, int arg4);
int WMLoc_GetNextLocId(int idx);
int sub_80BB628(void * unused, int arg1, int arg2, int arg3, int arg4);
// ??? sub_80BB6FC(???);
// ??? sub_80BB708(???);
// ??? GmapScreen2_Destruct(???);
@ -2173,7 +2173,7 @@ int sub_80BB628(int unused, int arg1, int arg2, int arg3, int arg4);
// ??? GmapScreen2_Loop(???);
ProcPtr sub_80BB9A4(ProcPtr, int, int, int, ProcPtr);
const char* GetWorldMapNodeName(u32);
// ??? sub_80BBA4C(???);
int sub_80BBA4C(int nodeId);
// ??? nullsub_59(???);
// ??? GmapCursor_Init(???);
// ??? GmapCursor_Loop(???);
@ -2226,7 +2226,7 @@ bool AddGmPath(struct GMapData*, struct OpenPaths*, int);
// ??? RemoveGmPath(???);
// ??? sub_80BC970(???);
void sub_80BCA0C(struct GMapData*);
int sub_80BCA1C(void);
int sub_80BCA1C(int);
// ??? sub_80BCA54(???);
// ??? sub_80BCA90(???);
// ??? sub_80BCAB8(???);
@ -2283,7 +2283,7 @@ s8 sub_80BE12C(ProcPtr, int);
// ??? sub_80BE194(???);
// ??? sub_80BE330(???);
void sub_80BE35C(ProcPtr, int, s16, s16);
// ??? sub_80BE3A0(???);
void sub_80BE3A0(ProcPtr, int, s16*, s16*);
// ??? sub_80BE3C8(???);
// ??? sub_80BE3E8(???);
// ??? sub_80BE40C(???);
@ -2328,7 +2328,7 @@ void sub_80BF15C(void);
// ??? sub_80BF2D0(???);
// ??? sub_80BF2D8(???);
// ??? sub_80BF370(???);
// ??? sub_80BF3F4(???);
s8 sub_80BF3F4(void);
void sub_80BF404(int, int, int, int, s16, int);
// ??? sub_80BF490(???);
// ??? sub_80BF4A8(???);
@ -2370,8 +2370,8 @@ void sub_80BF404(int, int, int, int, s16, int);
// ??? sub_80BFFD0(???);
// ??? sub_80C0080(???);
// ??? sub_80C0144(???);
// ??? NewMapMuEntry(???);
// ??? sub_80C0200(???);
void NewMapMuEntry(int);
void sub_80C0200(void);
// ??? sub_80C0210(???);
// ??? sub_80C0228(???);
// ??? sub_80C0240(???);
@ -2391,10 +2391,10 @@ void sub_80BF404(int, int, int, int, s16, int);
// ??? sub_80C0610(???);
// ??? sub_80C06F0(???);
// ??? sub_80C07B8(???);
// ??? sub_80C07D4(???);
void sub_80C07D4(int, int, ProcPtr);
// ??? sub_80C080C(???);
// ??? sub_80C081C(???);
int sub_80C0834(s16, s16, s16, s16, int);
s8 sub_80C081C(void);
int sub_80C0834(int, int, s16, s16, int);
void GetWMCenteredCameraPosition(int, int, s16*, s16*);
int sub_80C089C(int, int, int, int);
int sub_80C0960(int chIndex);
@ -2428,8 +2428,8 @@ int sub_80C0960(int chIndex);
// ??? sub_80C1480(???);
// ??? sub_80C1524(???);
// ??? sub_80C1624(???);
// ??? sub_80C168C(???);
// ??? sub_80C16DC(???);
void sub_80C168C(int, int);
s8 sub_80C16DC(void);
// ??? sub_80C16F4(???);
// ??? sub_80C1724(???);
// ??? sub_80C1774(???);
@ -2437,11 +2437,11 @@ int sub_80C0960(int chIndex);
// ??? sub_80C18EC(???);
// ??? sub_80C1920(???);
// ??? sub_80C1A58(???);
// ??? sub_80C1A74(???);
// ??? sub_80C1AB0(???);
// ??? sub_80C1ADC(???);
// ??? sub_80C1AF8(???);
// ??? sub_80C1BE0(???);
void sub_80C1A74(int, int*);
void sub_80C1AB0(void);
void sub_80C1ADC(void);
void sub_80C1AF8(void);
s8 sub_80C1BE0(void);
// ??? sub_80C1BF8(???);
void sub_80C1D00(void);
void sub_80C1D70(void);
@ -2457,7 +2457,7 @@ void sub_80C1D70(void);
// ??? sub_80C1E70(???);
// ??? sub_80C1E8C(???);
// ??? sub_80C1F18(???);
// ??? sub_80C1F5C(???);
void sub_80C1F5C(void);
// ??? sub_80C1F6C(???);
// ??? sub_80C1FDC(???);
// ??? sub_80C1FE0(???);
@ -2473,7 +2473,7 @@ void sub_80C1D70(void);
// ??? sub_80C2320(???);
// ??? sub_80C2398(???);
// ??? Make6C_Gmap_RM(???);
// ??? sub_80C2460(???);
void sub_80C2460(void);
// ??? sub_80C2470(???);
// ??? sub_80C2488(???);
// ??? GetWMDisplayPosition(???);
@ -2541,7 +2541,7 @@ void sub_80C1D70(void);
// ??? sub_80C35C4(???);
// ??? sub_80C35EC(???);
// ??? sub_80C3624(???);
// ??? sub_80C3660(???);
void sub_80C3660(void);
void sub_80C368C(ProcPtr);
// ??? sub_80C36A0(???);
// ??? sub_80C36E8(???);
@ -2568,7 +2568,7 @@ void sub_80C3E94(void);
// ??? sub_80C3F88(???);
// ??? sub_80C3FB4(???);
// ??? sub_80C3FE0(???);
// ??? sub_80C400C(???);
void sub_80C400C(int, ProcPtr);
// ??? sub_80C4038(???);
// ??? sub_80C4048(???);
// ??? sub_80C4058(???);

2
include/uiconfig.h
View File

@ -50,6 +50,6 @@ enum {
// extern ??? gProcScr_DrawConfigUiSprites
extern struct ProcCmd CONST_DATA gProcScr_Config1[];
extern struct ProcCmd CONST_DATA gProcScr_Config2[];
// extern ??? gProcScr_Config3
extern struct ProcCmd CONST_DATA gProcScr_Config3[];
#endif // GUARD_UI_CONFIG_H

4
include/variables.h
View File

@ -1425,7 +1425,7 @@ extern u16 gUnknown_08A37300[]; // pal
// extern ??? gUnknown_08A3E6E4
// extern ??? gUnknown_08A3E78C
// extern ??? gUnknown_08A3E888
// extern ??? gUnknown_08A3E8B8
extern struct ProcCmd gUnknown_08A3E8B8[];
// extern ??? gUnknown_08A3E9A0
// extern ??? gUnknown_08A3EA00
// extern ??? gUnknown_08A3EA38
@ -1802,7 +1802,7 @@ extern u16 gPal_TitleSmallLightBubbles[];
// extern ??? gUnknown_08B12C14
// extern ??? gUnknown_08B12C3C
extern struct ProcCmd CONST_DATA ProcScr_E_Guide1[];
// extern ??? ProcScr_E_Guide2
extern struct ProcCmd CONST_DATA ProcScr_E_Guide2[];
extern u8 Img_CommGameBgScreen[]; // gfx
extern u16 gUnknown_08B1754C[]; // pal
extern u16 gUnknown_08B1756C[]; // pal, used in opsubtitle

2
include/worldmap.h
View File

@ -221,4 +221,6 @@ extern struct ProcCmd gProcScr_WorldMapMain[];
void MapRoute_80BC2DC(struct GmRouteProc * proc);
ProcPtr StartGMapRoute(ProcPtr parent, struct OpenPaths * pPaths, int c, int d);
void MapUnitC_SetGfxNeedsUpdate(struct GMapUnitContainerProc * container, int index);
#endif // GUARD_WORLDMAP_H

1
ldscript.txt
View File

@ -270,6 +270,7 @@ SECTIONS
src/worldmap_face.o(.text);
src/worldmap_main.o(.text);
asm/code_80B5730.o(.text);
src/worldmap_main2.o(.text);
src/worldmap_screen.o(.text);
src/worldmap_gmapunit.o(.text);
src/worldmap_screen2.o(.text);

6
src/worldmap_main.c
View File

@ -172,9 +172,7 @@ void sub_80B8BA4(struct WorldMapMainProc * proc)
}
else
{
sub_80BD28C(proc->unk_40 + 1);
if (sub_80BCA1C() >= 0)
if (sub_80BCA1C(sub_80BD28C(proc->unk_40 + 1)) >= 0)
{
Proc_Goto(proc, 17);
return;
@ -503,7 +501,7 @@ void sub_80B9154(struct WorldMapMainProc * proc)
}
//! FE8U = 0x080B9218
void sub_80B9218(void)
void sub_80B9218(ProcPtr proc)
{
s16 a, b, c, d;
s16 cough;

1064
src/worldmap_main2.c Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/worldmap_player_interface.c
View File

@ -12,7 +12,7 @@ struct UnkParentProc
{
/* 00 */ PROC_HEADER;
/* 29 */ STRUCT_PAD(0x29, 0x48);
/* 48 */ int unk_48;
/* 48 */ void * unk_48;
};
struct GMapPIProc

2
src/worldmap_screen2.c
View File

@ -49,7 +49,7 @@ int WMLoc_GetNextLocId(int idx)
}
//! FE8U = 0x080BB628
int sub_80BB628(int unused, int arg1, int arg2, int arg3, int arg4)
int sub_80BB628(void * unused, int arg1, int arg2, int arg3, int arg4)
{
const struct NodeIcon * icon;
int i;