diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index 73715d4f..33f98aaf 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -1028,7 +1028,7 @@ segments: - [0x103C790, .data, code_94A20] - [0x103C7A0, .data, code_956B0] - [0x103C7C0, .data, code_98CB0] - - [0x103C7D0, bin, data_E6E60] + - [0x103C7D0, .data, code_9B180] - [0x103C850, .data, code_9B650] - [0x103CC90, .data, code_9B990] - [0x103CDF0, .data, code_9D640] @@ -1038,20 +1038,33 @@ segments: - [0x103D1D0, .data, code_A5BC0] - [0x103D200, .data, code_ABC00] - [0x103E340, .data, code_AC520] - - [0x103E350, bin, data_E89F0] # .data, code_AD110] - - [0x103EC20, bin, data_E92C0] + - [0x103E350, .data, code_AD110] + - [0x103EC20, .data, code_AD5B0] + - [0x103EC30, .data, code_AEDA0] + - [0x103ED10, .data, code_B1400] + - [0x103F3B0, .data, code_B3A80] + - [0x103F3F0, .data, code_B5040] - [0x103F490, .data, code_B62B0] - [0x10407F0, .data, code_B6CE0] - [0x1040800, .data, code_B6EA0] - [0x1040830, .data, code_B7F40] - - [0x1040840, bin, data_EAEE0] + - [0x1040840, .data, code_B9770] - [0x1040890, .data, code_BD100] - [0x10408A0, .data, code_BE2C0] - [0x10408B0, bin, data_EAF40] + - [0x10408C0, .data, code_C2F30] - [0x10408D0, .data, code_C4320] - [0x1040990, .data, code_C4F40] - [0x1040A00, .data, code_C5440] - - [0x1040A70, bin, data_EB120] + - [0x1040A70, .data, code_C8760] + - [0x1040A80, .data, code_C97F0] + - [0x1040F90, .data, code_C9F00] + - [0x1041040, .data, code_CBD10] + - [0x1041070, .data, code_CC1E0] + - [0x1041090, bin, data_1041090] # .data, code_CD6E0] + - [0x10410C0, .data, code_CECD0] + - [0x10410D0, .data, code_CF090] + - [0x1041100, bin, data_1041100] # .data, code_CF3E0] - [0x10411C0, .data, code_CF3E0] - [0x10411E0, .data, ch/clankerwhipcrack] - [0x1041210, .data, ch/code_CFA60] diff --git a/src/core2/code_9B180.c b/src/core2/code_9B180.c index 10182a64..4d2684e7 100644 --- a/src/core2/code_9B180.c +++ b/src/core2/code_9B180.c @@ -19,9 +19,27 @@ typedef struct struct_core2_9B180_s{ extern void func_8024FE44(u8, f32, f32); extern void func_8030EDAC(f32, f32); +void func_80322298(Struct_core2_9B180_0 *); +void func_803222F4(Struct_core2_9B180_0 *); +void func_80322110(Struct_core2_9B180_0 *); +void func_8032222C(Struct_core2_9B180_0 *); +void func_803221C4(Struct_core2_9B180_0 *); +void func_803221F4(Struct_core2_9B180_0 *); +void func_803222BC(Struct_core2_9B180_0 *); +void func_80322318(Struct_core2_9B180_0 *); +void func_80322130(Struct_core2_9B180_0 *); + /* .data */ -extern Struct_core2_9B180_0 D_8036DE00[6]; -extern u8 D_8036DE78; +Struct_core2_9B180_0 D_8036DE00[6] = { + {0x18A, NULL, func_80322298, func_803222BC, NULL}, + {0x018, NULL, func_803222F4, func_80322318, NULL}, + {0x18B, NULL, func_80322110, func_80322130, NULL}, + {0x194, NULL, func_8032222C, NULL, NULL}, + {0x193, NULL, func_803221C4, NULL, NULL}, + {0x192, NULL, func_803221F4, NULL, NULL} +}; + +u8 D_8036DE78 = 1; /* .bss */ u8 D_80383330; @@ -50,16 +68,16 @@ void func_80322130(Struct_core2_9B180_0 *arg0) { } -void func_803221C4(s32 arg0){ +void func_803221C4(Struct_core2_9B180_0 * arg0){ func_8024FE44(0, 0.2f, 1.25f); } -void func_803221F4(s32 arg0){ +void func_803221F4(Struct_core2_9B180_0 * arg0){ func_8030EDAC(0.50999999f, 1.0f); func_80244A98(0); } -void func_8032222C(s32 arg0) { +void func_8032222C(Struct_core2_9B180_0 * arg0) { s32 phi_s0; for(phi_s0 = 1; phi_s0 < 5; phi_s0++){ @@ -74,7 +92,7 @@ void func_80322298(Struct_core2_9B180_0 *arg0){ } } -void func_803222BC(s32 ag0){ +void func_803222BC(Struct_core2_9B180_0 * ag0){ if(func_8024E698(0) == 1){ func_8031D06C(0,0); } @@ -87,7 +105,7 @@ void func_803222F4(Struct_core2_9B180_0 *arg0){ } } -void func_80322318(s32 arg0){ +void func_80322318(Struct_core2_9B180_0 * arg0){ func_8031D0C0(0, 0); } diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c index 5b6df11d..9b406213 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -64,12 +64,6 @@ extern s16 D_8036E7FC[]; //={-1}; //extern s32 D_8036E800; // extern u32 D_8036E804[8]; -/* .rodata */ -extern f32 D_80378EA0; -extern f32 D_80378EA4; -extern f64 D_80378EA8; -extern f64 D_80378EB0; - /* .bss */ s32 D_803833F0[3]; s32 D_803833FC; @@ -77,6 +71,8 @@ s32 D_80383400; Cube *D_80383404; s32 D_80383408; s32 D_8038340C; + +//BREAK??? f32 D_80383410[3]; ActorMarker *D_8038341C; s32 D_80383420; diff --git a/src/core2/code_AD110.c b/src/core2/code_AD110.c index d456adf7..96925e50 100644 --- a/src/core2/code_AD110.c +++ b/src/core2/code_AD110.c @@ -3,7 +3,6 @@ #include "variables.h" //these funtions include references to overlay functions -/* extern void func_802DC528(s32, s32); extern void func_802DC560(s32, s32); extern void func_802DC748(s32, s32); @@ -72,7 +71,7 @@ extern void func_80388BEC(s32, s32); extern void func_80388C00(s32, s32); extern void func_80388C28(s32, s32); extern void func_80388C50(s32, s32); -extern void func_80388C78(s32, s32); +extern void CC_func_80388C78(s32, s32); extern void func_8038A0E4(s32, s32); extern void func_8038A150(s32, s32); extern void func_8038F10C(s32, s32); @@ -292,7 +291,7 @@ extern void func_8031FB14(s32, s32); extern void func_802C1674(s32, s32); extern void func_802C169C(s32, s32); -extern void core2_func_80389BFC(s32, s32); +extern void TTC_func_80389BFC(s32, s32); extern void func_80389C24(s32, s32); extern void func_80389C4C(s32, s32); extern void func_80389C74(s32, s32); @@ -301,7 +300,7 @@ extern void func_80389CC4(s32, s32); extern void func_802D2B94(s32, s32); extern void func_802D2C24(s32, s32); extern void func_8033443C(s32, s32); -*/ + typedef struct { f32 unk0[3]; @@ -314,7 +313,7 @@ typedef struct { typedef void (*Method_core2_AD110)(s32, s32); /* .data */ -Method_core2_AD110 D_8036F980[]; /*= { +Method_core2_AD110 D_8036F980[] = { func_80388BEC, func_80334430, func_80386744, func_80386744, func_80386744, func_8031DE2C, func_8031DE50, func_8038F10C, func_8038F130, func_8031E83C, func_8031E818, func_8031E938, @@ -327,7 +326,7 @@ Method_core2_AD110 D_8036F980[]; /*= { func_8031F0AC, func_8031F088, func_8031F064, func_8031F01C, func_8031F040, func_8031EC98, func_8031ECBC, func_8031ECE0, func_8031ED04, func_8031ED28, func_8031ED4C, func_80388C00, - func_80388C28, func_80388C50, func_80388C78, func_80334430, + func_80388C28, func_80388C50, CC_func_80388C78, func_80334430, func_80334430, func_80334430, func_802DC748, func_802DC780, func_8031F57C, func_8031F5A0, func_8031EFD4, func_8031EFF8, func_8031EF8C, func_8031EFB0, func_8031EF68, func_8031EF44, @@ -393,9 +392,9 @@ Method_core2_AD110 D_8036F980[]; /*= { func_8031FA48, func_8031FB14, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, -};*/ +}; -Method_core2_AD110 D_8036FE5C[]; /* ={ +Method_core2_AD110 D_8036FE5C[] ={ func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, @@ -414,7 +413,7 @@ Method_core2_AD110 D_8036FE5C[]; /* ={ func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, - func_8033443C, core2_func_80389BFC, func_80389C24, func_80389C4C, + func_8033443C, TTC_func_80389BFC, func_80389C24, func_80389C4C, func_80389C74, func_80389C9C, func_80389CC4, func_802D2B94, func_802D2C24, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, @@ -461,7 +460,6 @@ Method_core2_AD110 D_8036FE5C[]; /* ={ func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C }; -*/ /* .bss */ vector(Struct_core2_AD110_0) *D_803835C0; diff --git a/src/core2/code_AD5B0.c b/src/core2/code_AD5B0.c index fc339989..dbdce9a5 100644 --- a/src/core2/code_AD5B0.c +++ b/src/core2/code_AD5B0.c @@ -3,7 +3,7 @@ #include "variables.h" /* .data */ -extern u8 D_80370250; +extern u8 D_80370250 = 0; /* .bss */ struct { diff --git a/src/core2/code_AEDA0.c b/src/core2/code_AEDA0.c index 0577e7d3..b08129ea 100644 --- a/src/core2/code_AEDA0.c +++ b/src/core2/code_AEDA0.c @@ -13,12 +13,48 @@ void func_803382FC(s32 arg0); void func_80338308(s32 arg0, s32 arg1); /* .data */ -extern Gfx D_80370260[]; -extern Gfx D_80370290[]; -extern Gfx D_803702C0[]; -extern Gfx D_80370308[]; -extern u8 D_80370338[4]; -extern u8 D_8037033C; +Gfx D_80370260[] = { + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH), + gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsSPEndDisplayList() +}; + +Gfx D_80370290[] = { + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH), + gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2), + gsSPEndDisplayList() +}; + +Gfx D_803702C0[] = { + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH), + gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetAlphaCompare(G_AC_THRESHOLD), + gsDPSetBlendColor(0x00, 0x00, 0x00, 0x80), + gsDPSetRenderMode(Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList() +}; + + +Gfx D_80370308[] = { + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH), + gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsSPEndDisplayList() +}; + +u8 D_80370338[4] = {1, 0, 0, 0}; +u8 D_8037033C = 0; /* .bss */ s32 D_80383610; diff --git a/src/core2/code_B1400.c b/src/core2/code_B1400.c index 92f1804a..f85f9104 100644 --- a/src/core2/code_B1400.c +++ b/src/core2/code_B1400.c @@ -166,7 +166,7 @@ void func_8033A410(s32 a); void func_8033A45C(s32 arg0, s32 arg1); -extern Gfx D_80370340[] = +Gfx D_80370340[] = { gsDPPipeSync(), gsDPPipelineMode(G_PM_1PRIMITIVE), @@ -175,7 +175,7 @@ extern Gfx D_80370340[] = gsSPEndDisplayList() }; -extern Gfx D_80370368[] = +Gfx D_80370368[] = { gsDPPipeSync(), gsDPPipelineMode(G_PM_1PRIMITIVE), @@ -185,7 +185,7 @@ extern Gfx D_80370368[] = gsSPEndDisplayList() }; -extern Gfx D_80370398[] = +Gfx D_80370398[] = { gsDPPipeSync(), gsDPPipelineMode(G_PM_1PRIMITIVE), @@ -195,7 +195,7 @@ extern Gfx D_80370398[] = gsSPEndDisplayList() }; -extern Gfx D_803703C8[] = +Gfx D_803703C8[] = { gsDPPipeSync(), gsDPPipelineMode(G_PM_1PRIMITIVE), @@ -204,118 +204,400 @@ extern Gfx D_803703C8[] = gsSPEndDisplayList() }; -extern Gfx D_803703F0[] = -{ +Gfx D_803703F0[] = { gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2), gsSPEndDisplayList() }; -// 000E 9470: B9 00 03 1D 0C 19 20 48 B8 00 00 00 00 00 00 00 ...... H ........ -// 000E 9480: B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// 000E 9490: B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 94A0: B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// 000E 94B0: B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 94C0: B9 00 03 1D 0F 0A 40 00 B8 00 00 00 00 00 00 00 ......@. ........ -// 000E 94D0: B9 00 03 1D 0C 19 20 48 B8 00 00 00 00 00 00 00 ...... H ........ -// 000E 94E0: B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// 000E 94F0: B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9500: B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// 000E 9510: B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9520: B9 00 03 1D 0C 18 43 C8 B8 00 00 00 00 00 00 00 ......C. ........ +Gfx D_80370400[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_OPA_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370410[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; -extern Gfx D_803704C0[] = { +Gfx D_80370420[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370430[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370440[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370450[] = { + gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370460[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_OPA_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370470[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370480[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370490[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_803704A0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_803704B0[] = { + gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803704C0[] = { gsDPSetRenderMode(Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), gsSPEndDisplayList() }; -// 000E 9540: B9 00 03 1D 0C 19 20 78 B8 00 00 00 00 00 00 00 ...... x ........ -// 000E 9550: B9 00 03 1D 0C 18 42 70 B8 00 00 00 00 00 00 00 ......Bp ........ -// 000E 9560: B9 00 03 1D 0C 18 41 F8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9570: B9 00 03 1D 0C 18 42 70 B8 00 00 00 00 00 00 00 ......Bp ........ -// 000E 9580: B9 00 03 1D 0C 18 41 F8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9590: B9 00 03 1D 0F 0A 40 10 B8 00 00 00 00 00 00 00 ......@. ........ -// 000E 95A0: B9 00 03 1D 0C 19 20 58 B8 00 00 00 00 00 00 00 ...... X ........ -// 000E 95B0: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 95C0: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 95D0: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 95E0: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 95F0: B9 00 03 1D 0C 18 43 D8 B8 00 00 00 00 00 00 00 ......C. ........ +Gfx D_803704D0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_OPA_SURF2), + gsSPEndDisplayList(), +}; -extern Gfx D_80370590[] = -{ +Gfx D_803704E0[] = { + gsDPSetRenderMode(Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803704F0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370500[] = { + gsDPSetRenderMode(Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370510[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370520[] = { + gsDPSetRenderMode(Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsSPEndDisplayList(), +}; + +Gfx D_80370530[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)), + gsSPEndDisplayList(), +}; + +Gfx D_80370540[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370550[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370560[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370570[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList() +}; + +Gfx D_80370580[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList() +}; + +Gfx D_80370590[] = { gsDPSetRenderMode(Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), gsSPEndDisplayList() }; -// 000E 9610: B9 00 03 1D 0C 19 20 58 B8 00 00 00 00 00 00 00 ...... X ........ -// 000E 9620: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9630: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9640: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9650: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9660: B9 00 03 1D 0F 0A 40 10 B8 00 00 00 00 00 00 00 ......@. ........ -// 000E 9670: B9 00 03 1D 0C 19 20 58 B8 00 00 00 00 00 00 00 ...... X ........ - - -extern Gfx D_80370600[] = -{ +Gfx D_803705A0[] = { gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)), - gsSPEndDisplayList() + gsSPEndDisplayList(), }; -// 000E 9680: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9690: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 96A0: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 96B0: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 96C0: B9 00 03 1D 0C 18 43 D8 B8 00 00 00 00 00 00 00 ......C. ........ +Gfx D_803705B0[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; -extern Gfx D_80370660[]; -// B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// B9 00 03 1D 0C 18 42 40 B8 00 00 00 00 00 00 00 ......B@ ........ -// B9 00 03 1D 0C 18 41 C8 B8 00 00 00 00 00 00 00 ......A. ........ -// B9 00 03 1D 0C 18 43 C8 B8 00 00 00 00 00 00 00 ......C. ........ +Gfx D_803705C0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; -extern u8 D_80370730; -// 000E 97A0: B9 00 03 1D 0C 18 42 70 B8 00 00 00 00 00 00 00 ......Bp ........ -// 000E 97B0: B9 00 03 1D 0C 18 41 F8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 97C0: B9 00 03 1D 0C 18 42 70 B8 00 00 00 00 00 00 00 ......Bp ........ -// 000E 97D0: B9 00 03 1D 0C 18 41 F8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 97E0: B9 00 03 1D 0C 18 42 70 B8 00 00 00 00 00 00 00 ......Bp ........ -// 000E 97F0: B9 00 03 1D 0C 18 41 F8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9800: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9810: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9820: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9830: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9840: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9850: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9860: B9 00 03 1D 0C 18 43 D8 B8 00 00 00 00 00 00 00 ......C. ........ +Gfx D_803705D0[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; -extern u8 D_80370800; +Gfx D_803705E0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; -// 000E 9870: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9880: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9890: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 98A0: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 98B0: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 98C0: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 98D0: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 98E0: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 98F0: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9900: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9910: B9 00 03 1D 0C 18 42 50 B8 00 00 00 00 00 00 00 ......BP ........ -// 000E 9920: B9 00 03 1D 0C 18 41 D8 B8 00 00 00 00 00 00 00 ......A. ........ -// 000E 9930: B9 00 03 1D 0C 18 43 D8 B8 00 00 00 00 00 00 00 ......C. ........ +Gfx D_803705F0[] = { + gsDPSetRenderMode(Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsSPEndDisplayList(), +}; -extern Gfx D_803708D0[] = +Gfx D_80370600[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)), + gsSPEndDisplayList(), +}; + +Gfx D_80370610[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370620[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370630[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370640[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370650[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + + +Gfx D_80370660[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370670[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370680[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370690[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_803706A0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_803706B0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_803706C0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_803706D0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_803706E0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_803706F0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370700[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370710[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_80370720[] = { + gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370730[] = { + gsDPSetRenderMode(Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370740[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370750[] = { + gsDPSetRenderMode(Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370760[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370770[] = { + gsDPSetRenderMode(Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370780[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370790[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803707A0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803707B0[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803707C0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803707D0[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803707E0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803707F0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + + +Gfx D_80370800[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370810[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370820[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370830[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370840[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370850[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370860[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370870[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370880[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_80370890[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803708A0[] = { + gsDPSetRenderMode(Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803708B0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803708C0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPEndDisplayList(), +}; + +Gfx D_803708D0[] = { gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(2, 0, 0, 0x007C, 0x007C), @@ -330,7 +612,7 @@ extern Gfx D_803708D0[] = gsSPEndDisplayList() }; -extern Gfx D_80370928[] = +Gfx D_80370928[] = { gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD), gsDPSetTileSize(2, 0, 0, 0x007C, 0x007C), @@ -347,9 +629,9 @@ extern Gfx D_80370928[] = gsSPEndDisplayList() }; -extern s32 D_80370990 = 0; +s32 D_80370990 = 0; -extern GeoListFunc D_80370994[] = { +GeoListFunc D_80370994[] = { func_803384A8, func_803385BC, func_803387F8, diff --git a/src/core2/code_B3A80.c b/src/core2/code_B3A80.c index 730d899c..c7d43d78 100644 --- a/src/core2/code_B3A80.c +++ b/src/core2/code_B3A80.c @@ -7,11 +7,15 @@ extern f32 glspline_catmull_rom_interpolate(f32, s32, f32 *); -extern f32 D_803709E0[]; -extern u8 D_80370A1C; -extern u8 D_80370A14; //assetCache_size; -extern u8 D_80370A18; -extern s32 D_80370A10; +f32 D_803709E0[] = { + 0.0f, 0.0f, 0.0f, 1.0f, + 1.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f +}; +s32 D_80370A10 = 0; + u8 D_80370A14 = 0; //assetCache_size; + u8 D_80370A18 = 0; + u8 D_80370A1C = 0; /* .bss */ diff --git a/src/core2/code_B5040.c b/src/core2/code_B5040.c index b993586a..4cb4f43e 100644 --- a/src/core2/code_B5040.c +++ b/src/core2/code_B5040.c @@ -13,7 +13,46 @@ void savedata_clear(u8 *savedata); s32 savedata_verify(s32 arg0, SaveData *savedata); /* .data */ -extern Struct_B5040 D_80370A20[]; +Struct_B5040 D_80370A20[] = { + {0x66, 0xFF}, + {0x67, 0x100}, + {0x68, 0x101}, + {0x69, 0x102}, + {0x6A, 0x103}, + {0x6B, 0x104}, + {0x6C, 0x105}, + {0x6D, 0x106}, + {0x6E, 0x107}, + {0x6F, 0x108}, + {0x70, 0x109}, + {0x71, 0x10A}, + {0x72, 0x10B}, + {0x7D, 0x10C}, + {0x7E, 0x10D}, + {0x7F, 0x10E}, + {0x80, 0x10F}, + {0x81, 0x110}, + {0x82, 0x111}, + {0x83, 0x112}, + {0x84, 0x113}, + {0x85, 0x114}, + {0x86, 0x115}, + {0x87, 0x116}, + {0x88, 0x117}, + {0x89, 0x118}, + {0x8A, 0x119}, + {0x8B, 0x11A}, + {0x8C, 0x11B}, + {0x8D, 0x11C}, + {0x8E, 0x11D}, + {0x8F, 0x11E}, + {0x90, 0x11F}, + {0x91, 0x120}, + {0x92, 0x121}, + {0x93, 0x122}, + {0x65, 0x123}, + {-1, 0x000} +}; /* .bss */ s32 D_80383CF0; diff --git a/src/core2/code_B9770.c b/src/core2/code_B9770.c index abd99726..f5556551 100644 --- a/src/core2/code_B9770.c +++ b/src/core2/code_B9770.c @@ -217,15 +217,17 @@ typedef struct { s32 func_80341BC8(struct56s *arg0, glspline_list * arg1); /* .data */ -extern struct56s **D_80371E70; -extern glspline_list **D_80371E74; -extern s32 D_80371E78; -extern s32 D_80371E7C; -extern s32 D_80371E80; - -/* .rodata */ -extern char D_80378FF0[]; -extern f32 D_8037901C; +struct56s **D_80371E70 = NULL; +glspline_list **D_80371E74 = NULL; +s32 D_80371E78 = 0; +s32 D_80371E7C = 0; +s32 D_80371E80 = 0; +u8 D_80371E84[] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, + 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0xFF, 0x80, 0x00, 0xFF, + 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0xFF, 0x40, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, + 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; /* .bss */ s16 *D_803858A0; diff --git a/src/core2/code_C2F30.c b/src/core2/code_C2F30.c index e664df60..729c1a1d 100644 --- a/src/core2/code_C2F30.c +++ b/src/core2/code_C2F30.c @@ -25,7 +25,7 @@ typedef struct demo_file_header{ void demo_free(void); -extern DemoInput D_80371EF0; +DemoInput D_80371EF0 = {0, 0, 0, 2, 0}; /* .bss */ DemoInput *D_803860D0; //demo_input_ptr diff --git a/src/core2/code_C8760.c b/src/core2/code_C8760.c index 2f340cb8..5e946299 100644 --- a/src/core2/code_C8760.c +++ b/src/core2/code_C8760.c @@ -9,7 +9,7 @@ struct { u8 unk4; u8 unk5; u8 pad6[2]; -}D_803720A0; +}D_803720A0 = {NULL, 0, 0}; extern f32 D_803792F0; diff --git a/src/core2/code_C97F0.c b/src/core2/code_C97F0.c index 3cce2aed..c713d9c7 100644 --- a/src/core2/code_C97F0.c +++ b/src/core2/code_C97F0.c @@ -13,22 +13,67 @@ typedef struct { typedef struct { u8 unk0; - u8 pad1[3]; + // u8 pad1[3]; Struct_core2_C97F0_2 unk4[15]; }Struct_core2_C97F0_1; typedef struct { s16 unk0; - u8 pad2[0x2]; f32 unk4[3]; u8 unk10; - u8 pad11[0x3]; }Struct_core2_C97F0_0; /* .data */ -extern Struct_core2_C97F0_1 D_803720B0[]; -extern Struct_core2_C97F0_0 D_803724F4[]; -extern s32 D_803725A8[4]; +Struct_core2_C97F0_1 D_803720B0[] = { + {1, { + {0.01f, {0xFF, 0xFF, 0xFF, 0x80}, 1.0f,}, + {0.25f, {0xFF, 0x00, 0x00, 0x80}, 0.75f}, + {0.5f, {0x00, 0xFF, 0x00, 0x80}, 0.5f}, + {0.75f, {0x00, 0x00, 0xFF, 0x80}, 0.25f}, + {1.0f, {0xFF, 0x00, 0xFF, 0x80}, 0.1f}, + 0 + }}, + {0, { + {0.15f, {0xFF, 0xFF, 0xFF, 0x80}, 0.2f}, + {0.25f, {0xDC, 0xD2, 0xDC, 0xD2}, 0.35f}, + {0.32f, {0xFF, 0xFF, 0xFF, 0x5A}, 0.7f}, + {0.45f, {0xD2, 0xFF, 0xD7, 0x78}, 0.3f}, + {0.56f, {0xC8, 0xFF, 0xFF, 0x96}, 0.9f}, + {0.69f, {0xFF, 0xD2, 0xFF, 0x6E}, 0.45f}, + {0.78f, {0xDC, 0xFF, 0xFF, 0x73}, 0.28f}, + {0.84f, {0xFF, 0xE6, 0xFF, 0xC8}, 0.55f}, + {1.05f, {0xC8, 0xFF, 0xFF, 0x64}, 0.4f}, + {1.15f, {0xFF, 0xC8, 0xFF, 0x96}, 0.22f}, + 0 + }}, + {2, { + {0.15f, {0xFF, 0x00, 0x00, 0xC8}, 0.2f}, + {0.25f, {0xDC, 0xD2, 0xDC, 0xD2}, 0.35f}, + {0.32f, {0xFF, 0xFF, 0xFF, 0xA0}, 0.7f}, + {0.45f, {0xD2, 0xF0, 0xBE, 0xDC}, 0.3f}, + {0.56f, {0xC8, 0xFF, 0xFF, 0xBE}, 0.9f}, + {0.69f, {0xFF, 0xD2, 0xFF, 0xA0}, 0.45f}, + {0.78f, {0xDC, 0xFF, 0xFF, 0x8C}, 0.28f}, + {0.84f, {0xFF, 0xE6, 0xFF, 0xFF}, 0.55f}, + {1.05f, {0xC8, 0xFF, 0xFF, 0xBE}, 0.4f}, + {1.15f, {0xFF, 0xC8, 0xFF, 0x96}, 0.22f}, + 0 + }} +}; + +Struct_core2_C97F0_0 D_803724F4[] = { + {0x95, { 48.0f, 10.0f, -51.0f}, 0}, + {0x20, { 48.0f, 10.0f, -51.0f}, 0}, + {0x96, { 48.0f, 10.0f, -51.0f}, 0}, + {0x97, { 48.0f, 10.0f, -51.0f}, 0}, + {0x07, { 52.0f, 24.0f, -21.0f}, 0}, + {0x12, {-358.74f, 90.8f, 306.8f}, 0}, + {0x1F, { -61.8f, -3.64f, -42.921f}, 2}, + {0x04, { 0.0f, 24.0f, -21.0f}, 1}, + 0 +}; + +s32 D_803725A8[4] = {0, 0, 0, 0}; /* .bss */ struct{ diff --git a/src/core2/code_C9F00.c b/src/core2/code_C9F00.c index 32161d6d..a66c92fb 100644 --- a/src/core2/code_C9F00.c +++ b/src/core2/code_C9F00.c @@ -23,16 +23,57 @@ typedef struct { void (*unk4)(void *, Struct68s *, f32); }Struct_Core2_C9F00_0; -extern Struct_Core2_C9F00_1 D_803725C0[]; -extern Struct_Core2_C9F00_0 D_803725F4[]; +Struct_Core2_C9F00_1 D_803725C0[] = { + { 0x37, 0x1, 0x00}, + { 0x38, 0x2, 0x24}, + { 0xF9, 0x5, 0x22}, + { 0xFA, 0x6, 0x22}, + { 0xFB, 0x7, 0x22}, + { 0xFC, 0x8, 0x22}, + { 0xFD, 0x9, 0x22}, + { 0xFE, 0xA, 0x22}, + { 0xFF, 0xB, 0x22}, + {0x100, 0xC, 0x22}, + {0x100, 0xC, 0x22}, + { 0x13, 0xD, 0x00}, + 0 +}; -/* .rodata */ -extern f64 D_80379350; -extern f64 D_80379358; -extern f64 D_80379360; -extern f64 D_80379368; -extern f64 D_80379370; -extern f64 D_80379378; + +void func_80351DE0(Struct6Bs *, Struct68s *); +extern void MMM_func_8038ADF0(void *, Struct68s *); +extern void func_80387940(void *, Struct68s *); +extern void GV_func_80387960(void *, Struct68s *); +extern void func_80387980(void *, Struct68s *); +extern void func_803879A0(void *, Struct68s *); +extern void func_803879C0(void *, Struct68s *); +extern void CC_func_803879E0(void *, Struct68s *); +extern void CC_func_80387A00(void *, Struct68s *); +extern void CC_func_80387A20(void *, Struct68s *); +extern void func_80351FE0(void *, Struct68s *); + +void func_80351E60(Struct6Bs *, Struct68s *, f32); +extern void func_8038AF90(void *, Struct68s *, f32); +extern void func_8038B790(void *, Struct68s *, f32); +extern void CCW_func_80387A40(void *, Struct68s *, f32); +extern void func_80352114(void *, Struct68s *, f32); + +Struct_Core2_C9F00_0 D_803725F4[] = { + { NULL, NULL}, + {func_80351DE0, func_80351E60}, + {MMM_func_8038ADF0, func_8038AF90}, + { NULL, NULL}, + { NULL, func_8038B790}, + {func_80387940, CCW_func_80387A40}, + {GV_func_80387960, CCW_func_80387A40}, + {func_80387980, CCW_func_80387A40}, + {func_803879A0, CCW_func_80387A40}, + {func_803879C0, CCW_func_80387A40}, + {CC_func_803879E0, CCW_func_80387A40}, + {CC_func_80387A00, CCW_func_80387A40}, + {CC_func_80387A20, CCW_func_80387A40}, + {func_80351FE0, func_80352114} +}; /* .bss */ struct { diff --git a/src/core2/code_CBD10.c b/src/core2/code_CBD10.c index 28cc6df7..62d4648f 100644 --- a/src/core2/code_CBD10.c +++ b/src/core2/code_CBD10.c @@ -13,7 +13,29 @@ extern void func_80344D94(u8, f32[3]); extern void func_80344E3C(u8, f32[3]); /* .data */ -extern struct53s D_80372670; +struct53s D_80372670[] = { + { 0x0, 1}, + { 0x1, 1}, + { 0x2, 1}, + { 0x3, 1}, + { 0x4, 1}, + { 0x5, 1}, + { 0x6, 1}, + { 0x7, 1}, + { 0x8, 1}, + { 0x9, 1}, + { 0xA, 1}, + { 0xB, 1}, + { 0xC, 1}, + { 0xD, 1}, + { 0xE, 1}, + { 0xF, 1}, + {0x10, 1}, + {0x11, 1}, + {0x12, 1}, + {0x13, 1} +}; + /* .code */ void func_80352CA0(u8 arg0, f32 *arg1){ @@ -72,7 +94,7 @@ void func_80352DE4(void) { func_8033FD98(temp_s0, sp2C); func_80287E9C(sp58); func_80287F7C(sp58, 1); - func_80287F50(sp58, &D_80372670, 0x28); + func_80287F50(sp58, D_80372670, 0x28); func_80287F10(sp58); sp38[0] = 0.0f; sp38[1] = 40.0f; diff --git a/src/core2/code_CC1E0.c b/src/core2/code_CC1E0.c index 2fc693ec..5791c0bd 100644 --- a/src/core2/code_CC1E0.c +++ b/src/core2/code_CC1E0.c @@ -27,15 +27,18 @@ extern ActorProp *func_80320EB0(ActorMarker *, f32, s32); void fxegg_collide(s32 arg0, ActorMarker *arg1, s32 arg2); /* .data */ -extern struct53s D_803726A0; - -/* .rodata */ -extern f32 D_80379430; -extern f32 D_80379434; -extern f32 D_80379438; -extern f64 D_80379440; -extern f64 D_80379448; - +struct53s D_803726A0[] = { + {9, 1}, + {8, 1}, + {7, 1}, + {6, 1}, + {5, 1}, + {4, 1}, + {3, 1}, + {2, 1}, + {1, 1}, + {0, 1} +}; /* .code */ void fxegg_shatter(u8 projectile_indx){ @@ -185,7 +188,7 @@ void fxegg_head_spawn(void){ func_8033FCD8(projectile_indx, 0xe); func_80287E9C(sp78); - func_80287F50(sp78, &D_803726A0, 0x14); + func_80287F50(sp78, D_803726A0, 0x14); func_80287F10(sp78); func_80344E18(sp77, 1); diff --git a/src/core2/code_CD6E0.c b/src/core2/code_CD6E0.c index 185172d0..e49b9b7b 100644 --- a/src/core2/code_CD6E0.c +++ b/src/core2/code_CD6E0.c @@ -9,18 +9,16 @@ extern void projectile_getPosition(u8 arg0, f32 arg1[3]); extern void func_8033FC98(u8 arg0, s32 arg1); /* .data */ +// 0104 1090: 00 01 01 01 02 01 03 01 04 01 05 01 06 01 07 01 ........ ........ +// 0104 10A0: 08 01 09 01 + extern u8 D_803726D4[]; +// 0A 0A 0F 14 19 1E 23 28 2D 32 36 3A ........ ..#(-26: +// 0104 10B0: 3E 42 46 4A 4C 4E 50 28 14 00 00 00 extern f32 D_803726EC; - -/* .rodata */ -extern f64 D_80379480; - -extern f64 D_803794B0; - +// 00 00 00 00 >BFJLNP( ........ /* .bss */ -// extern s32 D_803863E4; - void func_80354670(u8 arg0, s32 arg1) { func_8033FFE4(arg0, D_803726D4[arg1], D_803726D4[arg1]); func_8033FC34(arg0, ml_map_f(arg1, 0.0f, 8.0f, 40.0f, 255.0f)); diff --git a/src/core2/code_CECD0.c b/src/core2/code_CECD0.c index bb59d7b9..87ecd80a 100644 --- a/src/core2/code_CECD0.c +++ b/src/core2/code_CECD0.c @@ -10,7 +10,7 @@ typedef struct { } Struct_Core2_CECD0_0; /* .data */ -extern Struct_Core2_CECD0_0 D_803726F0; +extern Struct_Core2_CECD0_0 D_803726F0 = {0x3, 0x32}; /* .code */ void func_80355C60(f32 arg0[3], f32 arg1){ diff --git a/src/core2/code_CF090.c b/src/core2/code_CF090.c index 1b7a2dc5..179cad35 100644 --- a/src/core2/code_CF090.c +++ b/src/core2/code_CF090.c @@ -5,7 +5,29 @@ #include "code_B6EA0.h" /* .data */ -extern struct53s *D_80372700; +struct53s D_80372700[] = { + {0x00, 1}, + {0x01, 1}, + {0x02, 1}, + {0x03, 1}, + {0x04, 1}, + {0x05, 1}, + {0x06, 1}, + {0x07, 1}, + {0x08, 1}, + {0x09, 1}, + {0x0A, 1}, + {0x0B, 1}, + {0x0C, 1}, + {0x0D, 1}, + {0x0E, 1}, + {0x0F, 1}, + {0x10, 1}, + {0x11, 1}, + {0x12, 1}, + {0x13, 1} +}; + /* .code */ void func_80356020(u8 arg0, f32 arg1[4]){ @@ -61,7 +83,7 @@ void func_8035611C(void){ func_8033FD98(temp_s0, sp2C); func_80287E9C(sp58); func_80287F7C(sp58, 1); - func_80287F50(sp58, &D_80372700, 0x28); + func_80287F50(sp58, D_80372700, 0x28); func_80287F10(sp58); sp38[0] = 0.0f; diff --git a/src/core2/code_CF3E0.c b/src/core2/code_CF3E0.c index 8aaad8ec..a18c5bdf 100644 --- a/src/core2/code_CF3E0.c +++ b/src/core2/code_CF3E0.c @@ -8,7 +8,22 @@ typedef struct { } unkD_80372730; // Needs to be a struct to match, s16 array doesn't work extern unkD_80372730 D_80372730[]; +// 0104 1100: 00 AB 0B A1 00 AC 0B A2 00 AA 0C E6 00 0F 0C 85 ........ ........ +// 0104 1110: 00 A9 0B A0 00 10 0A 7E 00 14 0C 11 00 0F 0C 85 .......~ ........ +// 0104 1120: 00 86 0A E1 00 DD 0C E7 00 03 0D 9C 00 04 0D 9D ........ ........ +// 0104 1130: 00 05 0D 9E 00 06 0D 9F 00 07 0D A0 00 08 0B 46 ........ .......F +// 0104 1140: 00 09 0A 21 00 0A 0D A1 00 0B 0D A2 00 0C 0D A3 ...!.... ........ +// 0104 1150: 00 BE 0F A8 00 BF 0F A9 00 C0 0F AA 00 95 0B 50 ........ .......P +// 0104 1160: 00 A7 0F 7B FF FF FF FF + + extern unkD_80372730 D_80372798[]; +// 00 9E 0B A3 00 9F 0C E8 ...{.... ........ +// 0104 1170: 00 A0 10 32 00 A1 10 33 00 A2 10 34 00 A3 10 35 ...2...3 ...4...5 +// 0104 1180: 00 A4 10 36 00 A5 10 37 00 A6 10 38 00 A7 10 39 ...6...7 ...8...9 +// 0104 1190: 00 A8 10 3A 00 A9 10 3B 00 AA 10 3C 00 AB 10 3D ...:...; ...<...= +// 0104 11A0: 00 AC 0A 88 00 AD 0A E2 00 AE 0C 8B 00 AF 0C 8C ........ ........ +// 0104 11B0: 00 B0 0F BD 00 C2 0E 36 00 C5 0D B6 FF FF FF FF .......6 ........ s32 func_80356370(unkD_80372730 *arg0, s32 arg1) { s32 phi_v1 = 0; @@ -76,6 +91,8 @@ void func_80356560(s32 arg0) { func_8035648C(arg0, 0xE); } +/* BREAK */ + //THIS VALUE #ifndef CORE2_CODE_CRC2 #define CORE2_CODE_CRC2 0x9E44C2DC