Skip to content

Commit d50e6b6

Browse files
authored
MAP0_S00: Match several functions (#398)
* MAP0_S00: match func_800DCC54 * clean * MAP0_S00: match func_800DBE68 * func_800DBE68 => Map_WorldObjectsInit * MAP0_S00: match func_800D9D98 * clean * MAP0_S00: match func_800D9610 * clean * MAP0_S00: match func_800DA028 * MAP0_S00: match func_800DA254 * MAP0_S00: match func_800DA454 * MAP0_S00_func_800DAA68 * MAP0_S00: match func_800DAB8C * MAP0_S00: match func_800DACB0 * MAP0_S00: match func_800DADD4 * fix
1 parent e5d406c commit d50e6b6

4 files changed

Lines changed: 365 additions & 10 deletions

File tree

configs/maps/sym.map0_s00.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,5 @@ sharedData_800E3A20_0_s00 = 0x800E3A20; // type:s32
176176
sharedData_800E3A24_0_s00 = 0x800E3A24; // type:s32
177177
sharedData_800E3A28_0_s00 = 0x800E3A28; // type:s32
178178
sharedData_800E3A2C_0_s00 = 0x800E3A2C; // type:s32
179+
Map_WorldObjectsInit = 0x800DBE68; // type:func
180+

include/maps/map0/map0_s00.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,20 @@ extern q19_12 D_800DFAD0;
2929

3030
extern s32 D_800DFAD4;
3131

32+
extern s32 D_800DFADC;
33+
3234
extern s8 D_800E34EC;
3335

3436
extern s8 D_800E39AC;
3537

38+
extern s_WorldObject_0 D_800E3A5C[2];
39+
40+
extern VECTOR3 D_800E3A9C;
41+
42+
extern SVECTOR3 D_800E3AAC;
43+
44+
extern s32 D_800DFAB8;
45+
3646
void func_800CBFB0(void);
3747

3848
void func_800D0124();
@@ -92,4 +102,12 @@ void func_800DC694(void);
92102

93103
void func_800DC8D8(void);
94104

105+
s32 func_800DCDA8();
106+
107+
s32 func_800DCF38(s32);
108+
109+
void Map_WorldObjectsInit(void);
110+
111+
void func_800DA454();
112+
95113
#endif

include/maps/shared.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2207,6 +2207,8 @@ typedef struct
22072207
MATRIX* matrices_C;
22082208
} s_sharedData_800E21D0_0_s01;
22092209

2210+
extern s_AreaLoadParams g_MapAreaLoadParams[];
2211+
22102212
extern s_SfxVolume g_SfxVolumes[46];
22112213

22122214
/** Scale. */

0 commit comments

Comments
 (0)