diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index b62fa9ef..f7fb64bb 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -901,18 +901,22 @@ segments: - [0x10334C0, .data, bs/carry] - [0x10334D0, .data, bs/croc] - [0x1033500, .data, bs/drone] - - [0x1033580, bin, data_DDC20] #.data, bs/dronexform] + - [0x1033580, .data, bs/dronexform] - [0x10336A0, .data, bs/jump] - [0x10336C0, .data, bs/pumpkin] - [0x10336F0, .data, bs/stand] - [0x1033710, .data, bs/swim] - [0x1033740, .data, bs/walk] - [0x1033790, .data, bs/walrus] - - [0x10337D0, bin, data_DDE70] + - [0x10337D0, .data, code_33F90] + - [0x1034160, .data, code_34310] + - [0x10341B0, .data, code_34790] - [0x1034200, .data, code_35520] - - [0x10346A0, bin, data_DED40] + - [0x10346A0, .data, code_356B0] - [0x1034730, .data, code_37E50] - - [0x1034760, bin, data_DEE00] + - [0x1034760, .data, code_382E0] + - [0x1034770, .data, code_3AE10] + - [0x1034790, .data, code_3BB80] - [0x10347A0, .data, ch/gameSelect] - [0x1034900, .data, code_3EAD0] - [0x1034980, .data, code_3EC30] @@ -926,7 +930,7 @@ segments: - [0x1034E30, .data, code_41FB0] - [0x1035620, .data, ch/musicnote] - [0x1035650, .data, code_42CB0] - - [0x10356A0, bin, data_DFD40] + - [0x10356A0, .data, code_43250] - [0x1035870, .data, ch/trainers] - [0x10358C0, .data, code_43800] - [0x10358F0, .data, code_43A40] diff --git a/src/core2/bs/dronexform.c b/src/core2/bs/dronexform.c index 52d5d75d..b07e4547 100644 --- a/src/core2/bs/dronexform.c +++ b/src/core2/bs/dronexform.c @@ -10,14 +10,6 @@ extern f32 cosf(f32); extern f32 func_802588B0(f32, f32); extern f32 func_80257AD4(f32, f32); - -extern struct41s D_80364BB0; -extern struct41s D_80364BE0; -extern struct41s D_80364C10; -extern struct41s D_80364C40; -extern struct41s D_80364C70; -extern struct41s D_80364CA0; - /* .bss */ struct { ParticleEmitter *unk0; @@ -119,6 +111,34 @@ void func_802AFBAC(f32 arg0){ } void func_802AFBB8(f32 (* arg0)[3]){ + static struct41s D_80364BB0 = { + {{-150.0f, 10.0f, -150.0f}, { 150.0f, 50.0f, 150.0f}}, + {{ 0.0f, -50.0f, 0.0f}, { 0.0f, -50.0f, 0.0f}} + }; + + static struct41s D_80364BE0 = { + {{-300.0f, 150.0f, -300.0f}, { 300.0f, 200.0f, 300.0f}}, + {{ 0.0f, -150.0f, 0.0f}, { 0.0f, -150.0f, 0.0f}} + }; + + + static struct41s D_80364C10 = { + {{-100.0f, 10.0f, -100.0f}, { 100.0f, 15.0f, 100.0f}}, + {{ 0.0f, -700.0f, 0.0f}, { 0.0f, -700.0f, 0.0f}} + }; + + static struct41s D_80364C40 = { + {{ -50.0f, 60.0f, -50.0f}, { 50.0f, 150.0f, 50.0f}}, + {{ 0.0f, -50.0f, 0.0f}, { 0.0f, -50.0f, 0.0f}} + }; + static struct41s D_80364C70 = { + {{-400.0f, 150.0f, -400.0f}, { 400.0f, 200.0f, 400.0f}}, + {{ 0.0f, -200.0f, 0.0f}, { 0.0f, -200.0f, 0.0f}} + }; + static struct41s D_80364CA0 = { + {{-200.0f, 10.0f, -200.0f}, { 200.0f, 20.0f, 200.0f}}, + {{ 0.0f, -850.0f, 0.0f}, { 0.0f, -850.0f, 0.0f}} + }; ParticleEmitter* s0 = partEmitList_pushNew(1); particleEmitter_setSprite(s0, ASSET_6C4_SPRITE_SMOKE_YELLOW); //yellow blast func_802EFA5C(s0, 0.7f, 0.8f); diff --git a/src/core2/code_33F90.c b/src/core2/code_33F90.c index 40ba1fdf..d359dbe9 100644 --- a/src/core2/code_33F90.c +++ b/src/core2/code_33F90.c @@ -27,9 +27,371 @@ void func_802BB360(s32 arg0, f32 arg1); void func_802BB3AC(s32 arg0, f32 arg1); /* .data */ -extern s32 D_80364E00; -extern s32 D_80364E04; -extern s16 *D_803654B8[]; +extern s32 D_80364E00 = 0; +extern s32 D_80364E04 = -1; +s16 D_80364E08[] = { 0, -1, 0, 1, 0x13, 0, -1, 0x32}; +s16 D_80364E18[] = { 0xF, -1, 0xF, 2, 0x1B, 3, -1, 0x2A}; +s16 D_80364E28[] = { 0x3, -1, 0xF, 4, 0x20, 5, -1, 0x37}; +s16 D_80364E38[] = { 0x9, 6, 0x9, -1, 0x14, 7, -1, 0x2E}; +s16 D_80364E48[] = { 0, 9, 0, -1, -1, 0x32}; +s16 D_80364E54[] = { 4, 0xE, 4, -1, -1, 0x1E}; +s16 D_80364E60[] = { 4, 0xF, 4, -1, -1, 0x1E}; +s16 D_80364E6C[] = { 4, 0x10, 4, -1, -1, 0x1E}; +s16 D_80364E78[] = { 4, 0x11, 4, -1, -1, 0x1E}; +s16 D_80364E84[] = { 0xC, 0xF, 0xC, -1, 0x28, 0x12, -1, 0x3C}; +s16 D_80364E94[] = { 0, 0x10, 0, -1, 0x1C, 0x11, -1, 0x32}; +s16 D_80364EA4[] = { 0, 4, 0, -1, -1, 0x5A}; +s16 D_80364EB0[] = { 8, 0, 0, -1, -1, 0x32}; +s16 D_80364EBC[] = { 0, 1, 0, -1, -1, 0x28}; +s16 D_80364EC8[] = { 0, 0x13, 0, -1, -1, 0x1E}; +s16 D_80364ED4[] = { 0, 0x14, 0, -1, -1, 0x1E}; +s16 D_80364EE0[] = { 0, 0x15, 0, -1, -1, 0x1E}; +s16 D_80364EEC[] = { 0, -1, 0, 2, -1, 0x2D}; +s16 D_80364EF8[] = { 0, -1, 0, 0, -1, 0x2D}; +s16 D_80364F04[] = { 0, -1, 0, 0x18, -1, 0x19}; +s16 D_80364F10[] = { 0xB, 0x13, 0xB, -1, -1, 0x22}; +s16 D_80364F1C[] = { 8, 9, 8, -1, -1, 0x22}; +s16 D_80364F28[] = { 8, 0xA, 8, -1, -1, 0x22}; +s16 D_80364F34[] = { 8, 0xB, 8, -1, -1, 0x22}; +s16 D_80364F40[] = { 8, 0xC, 8, -1, -1, 0x22}; +s16 D_80364F4C[] = { 0, 0xC, 0, -1, -1, 0x28}; +s16 D_80364F58[] = { 0, -1, 0, 8, -1, 0x23}; +s16 D_80364F64[] = { -1, 1}; +s16 D_80364F68[] = { 0, -1, 0, 0xA, -1, 0x1A}; +s16 D_80364F74[] = { 8, 0xE, 0, -1, -1, 0x32}; +s16 D_80364F80[] = { 0, 0xF, 0, -1, -1, 0x28}; +s16 D_80364F8C[] = { 0, 0xD, 0, -1, -1, 0x28}; +s16 D_80364F98[] = {0x50, 4, 0, -1, -1, 0x78}; +s16 D_80364FA4[] = { 8, 0xF, 0, -1, -1, 0x32}; +s16 D_80364FB0[] = { 0, 0x10, 0, -1, -1, 0x28}; +s16 D_80364FBC[] = { 0, 0x11, 0, -1, -1, 0x1E}; +s16 D_80364FC8[] = { -1, 1}; +s16 D_80364FCC[] = { 0, -1, 0, 1, -1, 0x28}; +s16 D_80364FD8[] = { 0, -1, 0, 0, -4, 0x28}; +s16 D_80364FE4[] = { 0, -1, 0, 0, -4, 0x28}; +s16 D_80364FF0[] = { 0, -1, 0, 0, 8, 1, -4, 0x19}; +s16 D_80365000[] = { 0, -1, 0, 0, -4, 0x28}; +s16 D_8036500C[] = { 0, -1, 0, 0, 0xB, 1, -1, 0x2D}; +s16 D_8036501C[] = { 0, -1, 0, 3, 0x14, 2, -1, 0x2D}; +s16 D_8036502C[] = { 0, -1, 0, 4, 0x12, 5, -1, 0x29}; +s16 D_8036503C[] = { 0, -1, 0, 0, -4, 0x1E}; +s16 D_80365048[] = { 0, -1, 0, 2, 0x23, 1, 0x46, -6, -1, 0x46}; +s16 D_8036505C[] = { 0, -1, 0, 1, 0x1A, -6, -1, 0x1A}; +s16 D_8036506C[] = { 0, -1, 0, 0xC, 0xD, 0xD, 0x20, 0x3, 0x34, -6, -1, 0x39}; +s16 D_80365084[] = { 0, -1, 0, 0, 0x13, 1, 0x30, 0xD, -4, 0x53}; +s16 D_80365098[] = { 0, -1, 0, 6, 0xD, 7, 0x20, 0x14, -4, 0x39}; +s16 D_803650AC[] = { 0, -1, 0, 2, 0xD, 3, 0x20, 0xB, -4, 0x39}; +s16 D_803650C0[] = { 0, -1, 0, 0, 0xD, 1, 0x20, 0xC, -4, 0x39}; +s16 D_803650D4[] = { 0, -1, 0, 3, 0xD, 4, 0x20, 0x13, -4, 0x39}; +s16 D_803650E8[] = { 0, -1, 0, 0, 0xD, 1, 0x20, 0x4, -4, 0x39}; +s16 D_803650FC[] = { 0, -1, 0, 0, 0xD, 1, 0x20, 0xD, -4, 0x41}; +s16 D_80365110[] = { 0, -1, 0, 3, 0xD, 4, 0x20, 0x20, -4, 0x39}; +s16 D_80365124[] = { 0, -1, 0, 2, 0xF, 3, -4, 0x28}; +s16 D_80365134[] = { 0, -1, 0, 5, 0xC, 6, -4, 0x21}; +s16 D_80365144[] = { 0, -1, 0, 0, 0xC, 1, -4, 0x21}; +s16 D_80365154[] = { 0, -1, 0, 0, 0x2D, -6, -1, 0x2D}; +s16 D_80365164[] = { 0, -1, 0, 1, -4, 0x2D}; +s16 D_80365170[] = { 0, -1, 0, 2, -4, 0x2D}; +s16 D_8036517C[] = { 0, -1, 0, 3, -4, 0x2D}; +s16 D_80365188[] = { 0, -1, 0, 6, 0xD, 0x10, 0x32, -6, -1, 0x32}; +s16 D_8036519C[] = {-1, 1}; +s16 D_803651A0[] = {-1, 1}; +s16 D_803651A4[] = {-1, 1}; +s16 D_803651A8[] = {-1, 1}; +s16 D_803651AC[] = {-1, 1}; +s16 D_803651B0[] = {-1, 1}; +s16 D_803651B4[] = {-1, 1}; +s16 D_803651B8[] = {-1, 1}; +s16 D_803651BC[] = {-1, 1}; +s16 D_803651C0[] = {-1, 1}; +s16 D_803651C4[] = {-1, 1}; +s16 D_803651C8[] = {-1, 1}; +s16 D_803651CC[] = {-1, 1}; +s16 D_803651D0[] = {-1, 1}; +s16 D_803651D4[] = {-1, 1}; +s16 D_803651D8[] = {-1, 1}; +s16 D_803651DC[] = {-1, 1}; +s16 D_803651E0[] = {-1, 1}; +s16 D_803651E4[] = {-1, 1}; +s16 D_803651E8[] = {-1, 1}; +s16 D_803651EC[] = {-1, 1}; +s16 D_803651F0[] = {-1, 1}; +s16 D_803651F4[] = {-1, 1}; +s16 D_803651F8[] = {-1, 1}; +s16 D_803651FC[] = {-1, 1}; +s16 D_80365200[] = {-1, 0}; +s16 D_80365204[] = {-1, 0}; +s16 D_80365208[] = {-1, 0}; +s16 D_8036520C[] = {-1, 0}; +s16 D_80365210[] = {-1, 0}; +s16 D_80365214[] = {-1, 0}; +s16 D_80365218[] = {-1, 0}; +s16 D_8036521C[] = {-1, 0}; +s16 D_80365220[] = { 0, -1, 0, 4, -4, 0x17}; +s16 D_8036522C[] = { 0, -1, 0, 0x1E, -4, 0x17}; +s16 D_80365238[] = { 0, -1, 0, 0x1F, -4, 0x17}; +s16 D_80365244[] = { 0, -1, 0, 0xF, -4, 0x17}; +s16 D_80365250[] = { 0, -1, 0, 6, -4, 0x17}; +s16 D_8036525C[] = { 0, -1, 0, 0xA, -4, 0x17}; +s16 D_80365268[] = { 0, -1, 0, 0xD, -4, 0x17}; +s16 D_80365274[] = { 0, -1, -4, 0x17}; +s16 D_8036527C[] = { 0, -1, -1, 0x23}; +s16 D_80365284[] = { 0, -1, -1, 0x23}; +s16 D_8036528C[] = { 0, -1, -1, 0x23}; +s16 D_80365294[] = { 0, -1, -1, 0x23}; +s16 D_8036529C[] = { 0, -1, -1, 0x23}; +s16 D_803652A4[] = { 0, -1, -1, 0x23}; +s16 D_803652AC[] = { 0, -1, -1, 0x23}; +s16 D_803652B4[] = { 0, -1, -1, 0x23}; +s16 D_803652BC[] = { 0, -1, 0, 0xB, -1, 0x1E}; +s16 D_803652C8[] = { 0, -1, 0, 1, -1, 0x1E}; +s16 D_803652D4[] = { 0, -1, 0, 2, -1, 0x1E}; +s16 D_803652E0[] = { 0, -1, 0, 5, -1, 0x1E}; +s16 D_803652EC[] = { 0, -1, 0, 4, -1, 0x1E}; +s16 D_803652F8[] = { 0, -1, 0, 4, -1, 0x1E}; +s16 D_80365304[] = { 0, -1, -1, 0x1E}; +s16 D_8036530C[] = { 0, -1, -1, 0x1E}; +s16 D_80365314[] = { 0, -1, 0, 0xD, -4, 0xD}; +s16 D_80365320[] = { 0, -1, 0, 0xE, -1, 0x19}; +s16 D_8036532C[] = { 0, -1, 0, 0xB, 0x8, 0xC, -4, 0x20}; +s16 D_8036533C[] = { 0, -1, 0, 2, 0x8, 0x3, -4, 0x1E}; +s16 D_8036534C[] = { 0xB, 0x1, 0xB, -1, -1, 0x22}; +s16 D_80365358[] = { 0, -1, 0, 0, 0xF, 1, 0x1E, -6, -1, 0x1E}; +s16 D_8036536C[] = { 0, -1, 8, 0x1A, -1, 0x1E}; +s16 D_80365378[] = { 0, -1, 0, 4, 0x1E, -6, -1, 0x1E}; +s16 D_80365388[] = { 0, 3, 5, 4, -1, 0x32}; +s16 D_80365394[] = { 0, -1, 0, 1, -4, 0x1E}; +s16 D_803653A0[] = { 0, -1, 0, 1, -4, 0x1E}; +s16 D_803653AC[] = { 0, -1, 0, 2, -4, 0x1E}; +s16 D_803653B8[] = { 0, -1, 0, 0x2E, -4, 0x1E}; +s16 D_803653C4[] = { 0, -1, 0, 0x1B, -4, 0x1E}; +s16 D_803653D0[] = { 0, -1, 0, 9, -4, 0x1E}; +s16 D_803653DC[] = { 0, -1, 0, 5, -4, 0x1E}; +s16 D_803653E8[] = {-1, 0}; +s16 D_803653EC[] = {-1, 0}; +s16 D_803653F0[] = { 0, -1, 0, 8, -4, 0x17}; +s16 D_803653FC[] = { 0, -1, 0, 8, -4, 0x17}; +s16 D_80365408[] = { 0, -1, -1, 0x23}; +s16 D_80365410[] = { 0, -1, -1, 0x23}; +s16 D_80365418[] = { 0, -1, 0, 6, -1, 0x1E}; +s16 D_80365424[] = { 0, -1, 0, 0xC, -1, 0x1E}; +s16 D_80365430[] = {-1, 1}; +s16 D_80365434[] = {-1, 1}; +s16 D_80365438[] = {-1, 1}; +s16 D_8036543C[] = {-1, 1}; +s16 D_80365440[] = {-1, 1}; +s16 D_80365444[] = {-1, 1}; +s16 D_80365448[] = {-1, 1}; +s16 D_8036544C[] = {-1, 1}; +s16 D_80365450[] = {-1, 1}; +s16 D_80365454[] = {-1, 1}; +s16 D_80365458[] = {-1, 1}; +s16 D_8036545C[] = {-1, 1}; +s16 D_80365460[] = {-1, 1}; +s16 D_80365464[] = {-1, 1}; +s16 D_80365468[] = {-1, 1}; +s16 D_8036546C[] = {-1, 1}; +s16 D_80365470[] = {-1, 1}; +s16 D_80365474[] = {-1, 1}; +s16 D_80365478[] = {-1, 1}; +s16 D_8036547C[] = {-1, 1}; +s16 D_80365480[] = {-1, 1}; +s16 D_80365484[] = {-1, 1}; +s16 D_80365488[] = {-1, 1}; +s16 D_8036548C[] = {-1, 1}; +s16 D_80365490[] = {-1, 1}; +s16 D_80365494[] = {-1, 1}; +s16 D_80365498[] = {-1, 1}; +s16 D_8036549C[] = {-1, 1}; +s16 D_803654A0[] = {-1, 1}; +s16 D_803654A4[] = {-1, 1}; +s16 D_803654A8[] = {-1, 1}; +s16 D_803654AC[] = {-1, 1}; +s16 D_803654B0[] = {-1, 1}; +s16 D_803654B4[] = {-1, 1}; + +s16 *D_803654B8[] = { + D_80364E08, + D_80364E18, + D_80364E28, + D_80364E38, + D_80364E48, + D_80364E54, + D_80364E60, + D_80364E6C, + D_80364E78, + D_80364E84, + D_80364E94, + D_80364EA4, + D_80364EB0, + D_80364EBC, + D_80364EC8, + D_80364ED4, + D_80364EE0, + D_80364EEC, + D_80364EF8, + D_80364F04, + D_80364F10, + D_80364F1C, + D_80364F28, + D_80364F34, + D_80364F40, + D_80364F4C, + D_80364F58, + D_80364F64, + D_80364F68, + D_80364F74, + D_80364F80, + D_80364F8C, + D_80364F98, + D_80364FA4, + D_80364FB0, + D_80364FBC, + D_80364FC8, + D_80364FCC, + D_80364FD8, + D_80364FE4, + D_80364FF0, + D_80365000, + D_8036500C, + D_8036501C, + D_8036502C, + D_8036503C, + D_80365048, + D_8036505C, + D_8036506C, + D_80365084, + D_80365098, + D_803650AC, + D_803650C0, + D_803650D4, + D_803650E8, + D_803650FC, + D_80365110, + D_80365124, + D_80365134, + D_80365144, + D_80365154, + D_80365164, + D_80365170, + D_8036517C, + D_80365188, + D_8036519C, + D_803651A0, + D_803651A4, + D_803651A8, + D_803651AC, + D_803651B0, + D_803651B4, + D_803651B8, + D_803651BC, + D_803651C0, + D_803651C4, + D_803651C8, + D_803651CC, + D_803651D0, + D_803651D4, + D_803651D8, + D_803651DC, + D_803651E0, + D_803651E4, + D_803651E8, + D_803651EC, + D_803651F0, + D_803651F4, + D_803651F8, + D_803651FC, + D_80365200, + D_80365204, + D_80365208, + D_8036520C, + D_80365210, + D_80365214, + D_80365218, + D_8036521C, + D_80365220, + D_8036522C, + D_80365238, + D_80365244, + D_80365250, + D_8036525C, + D_80365268, + D_80365274, + D_8036527C, + D_80365284, + D_8036528C, + D_80365294, + D_8036529C, + D_803652A4, + D_803652AC, + D_803652B4, + D_803652BC, + D_803652C8, + D_803652D4, + D_803652E0, + D_803652EC, + D_803652F8, + D_80365304, + D_8036530C, + D_80365314, + D_80365320, + D_8036532C, + D_8036533C, + D_8036534C, + D_80365358, + D_8036536C, + D_80365378, + D_80365388, + D_80365394, + D_803653A0, + D_803653AC, + D_803653B8, + D_803653C4, + D_803653D0, + D_803653DC, + D_803653E8, + D_803653EC, + D_803653F0, + D_803653FC, + D_80365408, + D_80365410, + D_80365418, + D_80365424, + D_80365430, + D_80365434, + D_80365438, + D_8036543C, + D_80365440, + D_80365444, + D_80365448, + D_8036544C, + D_80365450, + D_80365454, + D_80365458, + D_8036545C, + D_80365460, + D_80365464, + D_80365468, + D_8036546C, + D_80365470, + D_80365474, + D_80365478, + D_8036547C, + D_80365480, + D_80365484, + D_80365488, + D_8036548C, + D_80365490, + D_80365494, + D_80365498, + D_8036549C, + D_803654A0, + D_803654A4, + D_803654A8, + D_803654AC, + D_803654B0, + D_803654B4 +}; /* .code */ void func_802BAF20(void){ diff --git a/src/core2/code_34310.c b/src/core2/code_34310.c index 6489bdc2..c4b1eccb 100644 --- a/src/core2/code_34310.c +++ b/src/core2/code_34310.c @@ -27,6 +27,9 @@ void func_802BB318(s32 arg0); void func_802BB360(s32 arg0, f32 arg1); void func_802BB3AC(s32 arg0, f32 arg1); +/* .data */ +u8 D_80365790[0x50] = {0}; + /* .bss */ Struct_core2_33F90_0 D_8037D840[4]; diff --git a/src/core2/code_34790.c b/src/core2/code_34790.c index 67db148f..28ffd1a6 100644 --- a/src/core2/code_34790.c +++ b/src/core2/code_34790.c @@ -11,7 +11,13 @@ f32 func_802BBD48(void); f32 func_802BBEA4(f32 arg0[3], f32 arg1[3], f32 arg2, s32 arg3, s32 arg4); /* .data */ -extern s16 D_803657E0[]; +s16 D_803657E0[] = { + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x71, 0x70, + 0x6F, 0x6E, 0x10F, 0x110, 0x111, 0x112, 0x113, 0x159, + 0x15B, 0x15D, 0x378, 0x378, 0x378, 0x378, 0x378, 0x378, + 0x378, 0x378, 0x378 +}; /* .bss */ s32 D_8037D8C0; diff --git a/src/core2/code_356B0.c b/src/core2/code_356B0.c index 2ad131d4..d0f539b2 100644 --- a/src/core2/code_356B0.c +++ b/src/core2/code_356B0.c @@ -28,10 +28,12 @@ void func_802BD870(f32 arg0, f32 arg1, f32 arg2, f32 arg3); f32 func_802BD8C8(void); void func_802BD8EC(f32 arg0); - -extern Struct_core2_356B0_0 D_80365D48; -extern Struct_core2_356B0_0 D_80365D50; -extern Struct_core2_356B0_0 D_80365D58; +f32 D_80365CD0[] = {0.0f}; +f32 D_80365CD4[] = {0.0f, -25.0f, 25.0f, -50.0f, 50.0f, -80.0f, 80.0f, -120.0f, 120.0f, -140.0f, 140.0f}; +f32 D_80365D00[] = {0.0f, 20.0f, 40.0f, 60.0f, 80.0f, 100.0f, 120.0f, 140.0f, 160.0f, 180.0f, 200.0f, 220.0f, 240.0f, 260.0f, 280.0f, 300.0f, 320.0f, 340.0f}; +Struct_core2_356B0_0 D_80365D48 = {D_80365CD0, 1}; +Struct_core2_356B0_0 D_80365D50 = {D_80365CD4, 11}; +Struct_core2_356B0_0 D_80365D58 = {D_80365D00, 18}; /* .bss */ diff --git a/src/core2/code_382E0.c b/src/core2/code_382E0.c index 30e038c7..fac44a79 100644 --- a/src/core2/code_382E0.c +++ b/src/core2/code_382E0.c @@ -3,7 +3,7 @@ #include "variables.h" /* .data */ -extern f32 D_80365D90; +f32 D_80365D90 = 30.0f; /* .code */ void func_802BF270(void){ diff --git a/src/core2/code_3AE10.c b/src/core2/code_3AE10.c index 53acd252..b87b8c7c 100644 --- a/src/core2/code_3AE10.c +++ b/src/core2/code_3AE10.c @@ -9,12 +9,12 @@ extern void func_802589E4(f32[3], f32, f32); extern void func_802BD0D8(s32); /* .data */ -extern f32 D_80365DA0; -extern f32 D_80365DA4; -extern f32 D_80365DA8; -extern f32 D_80365DAC; -extern u8 D_80365DB0; -extern f32 D_80365DB4; +f32 D_80365DA0 = 0.0f; +f32 D_80365DA4 = 0.0f; +f32 D_80365DA8 = 0.0f; +f32 D_80365DAC = 100.0f; +u8 D_80365DB0 = 0; +f32 D_80365DB4 = 0.0f; /* .code */ void func_802C1DA0(void){} diff --git a/src/core2/code_3BB80.c b/src/core2/code_3BB80.c index e8f891a1..87cf0811 100644 --- a/src/core2/code_3BB80.c +++ b/src/core2/code_3BB80.c @@ -173,9 +173,9 @@ typedef struct function_queue_s{ }FunctionQueue; /* .data */ -extern u8 D_80365DC0; -extern u8 D_80365DC4; -extern FunctionQueue *D_80365DC8; +u8 D_80365DC0 = 0; +u8 D_80365DC4 = 0; +FunctionQueue *D_80365DC8 = NULL; /* .code */ void func_802C2B10(void){ diff --git a/src/core2/code_43250.c b/src/core2/code_43250.c index 3d679481..dd958937 100644 --- a/src/core2/code_43250.c +++ b/src/core2/code_43250.c @@ -11,7 +11,7 @@ typedef struct { typedef struct { Struct_Core2_43250_1 *unk0; s16 unk4; - u8 pad6[2]; + // u8 pad6[2]; }Struct_Core2_43250_0; @@ -19,14 +19,14 @@ typedef struct { void func_802CA1E0(Actor *this); /* .data */ -extern ActorInfo D_80366CD0 = { +ActorInfo D_80366CD0 = { 0x3D, 0x183, 0, 0, NULL, func_802CA1E0, func_80326224, func_80325340, 0, 0, 0.0f, 0 }; -extern Struct_Core2_43250_1 D_80366CF4 [16]= { +Struct_Core2_43250_1 D_80366CF4 [16]= { {SFX_6B_LOCKUP_OPENING, 0x40, 0xFF}, {SFX_6C_LOCKUP_CLOSING, 0x80, 0xFA}, {SFX_3F_CAULDRON_SQEAK_1, 0x99, 0x65}, @@ -45,14 +45,14 @@ extern Struct_Core2_43250_1 D_80366CF4 [16]= { {SFX_20_METAL_CLANK_1, 0x79, 0x75} }; -extern Struct_Core2_43250_1 D_80366D34[4] = { +Struct_Core2_43250_1 D_80366D34[4] = { {SFX_EA_GRUNTY_LAUGH_1, 0x80, 0xFA}, {SFX_6B_LOCKUP_OPENING, 0x73, 0xFF}, {SFX_6C_LOCKUP_CLOSING, 0x80, 0xFA}, {SFX_C_TAKING_FLIGHT_LIFTOFF, 0x66, 0xFA} }; -extern Struct_Core2_43250_1 D_80366D44[13] = { +Struct_Core2_43250_1 D_80366D44[13] = { {SFX_C6_SHAKING_MOUTH, 0x80, 0xFF}, {SFX_2C_PULLING_NOISE, 0x80, 0xFF}, {SFX_C5_TWINKLY_POP, 0x80, 0xFF}, @@ -68,7 +68,7 @@ extern Struct_Core2_43250_1 D_80366D44[13] = { {SFX_6F_BANJO_HEADSCRATCH, 0x80, 0x4E} }; -extern Struct_Core2_43250_1 D_80366D78[8] = { +Struct_Core2_43250_1 D_80366D78[8] = { {SFX_5D_BANJO_RAAOWW, 0x59, 0xC3}, {SFX_5E_BANJO_PHEWWW, 0x59, 0xC3}, {SFX_5D_BANJO_RAAOWW, 0x59, 0xC3}, @@ -79,7 +79,7 @@ extern Struct_Core2_43250_1 D_80366D78[8] = { {SFX_5D_BANJO_RAAOWW, 0x59, 0xC3}, }; -extern Struct_Core2_43250_1 D_80366D98[14] = { +Struct_Core2_43250_1 D_80366D98[14] = { {SFX_EA_GRUNTY_LAUGH_1, 0x86, 0xFA}, {SFX_C_TAKING_FLIGHT_LIFTOFF, 0x59, 0xFA}, {SFX_6F_BANJO_HEADSCRATCH, 0x80, 0x4E}, @@ -96,7 +96,7 @@ extern Struct_Core2_43250_1 D_80366D98[14] = { {SFX_C_TAKING_FLIGHT_LIFTOFF, 0x59, 0xFA} }; -extern Struct_Core2_43250_1 D_80366DD0[37] = { +Struct_Core2_43250_1 D_80366DD0[37] = { {SFX_15_METALLIC_HIT_2, 0x80, 0xFA}, {SFX_E_SHOCKSPRING_BOING, 0x80, 0xFA}, {SFX_8F_SNOWBALL_FLYING, 0x80, 0xFA}, @@ -136,13 +136,13 @@ extern Struct_Core2_43250_1 D_80366DD0[37] = { {SFX_9B_BOULDER_BREAKING_1, 0x80, 0x9C} }; -extern Struct_Core2_43250_0 D_80366E64[] = { - {D_80366CF4, 0x10, {00, 00}}, - {D_80366D34, 0x04, {00, 00}}, - {D_80366D44, 0x0D, {00, 00}}, - {D_80366D78, 0x08, {00, 00}}, - {D_80366D98, 0x0E, {00, 00}}, - {D_80366DD0, 0x25, {00, 00}}, +Struct_Core2_43250_0 D_80366E64[] = { + {D_80366CF4, 0x10}, + {D_80366D34, 0x04}, + {D_80366D44, 0x0D}, + {D_80366D78, 0x08}, + {D_80366D98, 0x0E}, + {D_80366DD0, 0x25}, }; /* .code */