diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index f7fb64bb..73715d4f 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -934,33 +934,34 @@ segments: - [0x1035870, .data, ch/trainers] - [0x10358C0, .data, code_43800] - [0x10358F0, .data, code_43A40] - - [0x10359D0, bin, data_E0070] + - [0x10359D0, .data, mapspecificflags] - [0x10359E0, .data, code_440B0] - - [0x1035B00, bin, data_E01A0] + - [0x1035B00, .data, code_45310] - [0x1035B30, .data, ch/code_468E0] - - [0x1035B80, bin, data_E0220] + - [0x1035B80, .data, ch/jinjo] - [0x1035C90, .data, ch/beehive] - [0x1035CE0, .data, code_47BD0] - [0x1035D10, .data, ch/soundsource] - [0x1035D90, .data, code_49A70] - [0x1035E00, .data, ch/gloop] - - [0x1035E60, bin, data_E0500] + - [0x1035E60, .data, code_4A6F0] - [0x1035F00, .data, code_4BD70] - - [0x1035FC0, bin, data_E0660] + - [0x1035FC0, .data, code_4BE10] - [0x1036050, .data, code_4C020] - - [0x10363D0, bin, data_E0A70] + - [0x10363D0, .data, ch/wadingboots] - [0x1036420, .data, ch/badShad] - [0x1036450, .data, code_50490] - - [0x10364F0, bin, data_E0B90] + - [0x10364F0, .data, ch/climbBase] + - [0x1036520, .data, code_509D0] - [0x1036630, .data, code_517A0] - [0x1036660, .data, code_51950] - [0x10366D0, .data, code_51C90] - [0x1036740, .data, ch/mole] - [0x10367D0, .data, ch/molehill] - [0x1036840, .data, code_53A10] - - [0x1036870, bin, data_E0F10] + - [0x1036870, .data, code_53C10] - [0x1036900, .data, code_54D50] - - [0x10369B0, bin, data_E1050] #.data, code_55180] + - [0x10369B0, .data, code_55180] - [0x1036A10, .data, code_55390] - [0x1036A40, .data, code_556C0] - [0x1036A70, .data, code_55850] @@ -971,47 +972,63 @@ segments: - [0x1036CD0, .data, code_57C70] - [0x1036D30, .data, code_581D0] - [0x1036D80, .data, code_584D0] - - [0x1036E10, bin, data_E14B0] + - [0x1036E10, .data, code_59780] - [0x1036F70, .data, code_59A80] - [0x1036FA0, .data, code_59D40] - [0x1037020, .data, ch/code_5AB30] - [0x10370E0, .data, code_5B6A0] - [0x1037190, .data, code_5BD90] - - [0x10371C0, bin, data_E1860] + - [0x10371C0, .data, code_5C870] + - [0x1037200, .data, code_5DBC0] + - [0x1037220, .data, code_66D90] - [0x1037230, .data, code_66FB0] - [0x10372B0, .data, gc/bound] - [0x1037300, .data, code_67650] - - [0x1037310, bin, data_E19B0] + - [0x1037310, .data, code_679A0] - [0x10373A0, .data, code_6A4B0] - - [0x1037470, bin, data_E1B10] + - [0x1037470, .data, code_6AEF0] + - [0x1037480, .data, code_6B030] + - [0x1037500, .data, code_6C3E0] - [0x1037750, .data, code_6CD20] - [0x10377A0, .data, code_6D030] - - [0x10377B0, bin, data_E1E50] + - [0x10377B0, .data, code_6D270] - [0x10377C0, .data, code_6D490] - - [0x10379D0, bin, data_E2070] + - [0x10379D0, .data, code_6DA30] + - [0x1037C50, .data, code_72060] - [0x1037CB0, .data, code_73640] - [0x10380F0, .data, code_74090] - [0x10381A0, .data, code_74290] - - [0x10381D0, bin, data_E2870] + - [0x10381D0, .data, code_74420] + - [0x1038200, .data, code_74910] + - [0x1038230, .data, code_74ED0] + - [0x1038260, .data, code_75480] + - [0x1038290, .data, code_75930] + - [0x10382C0, .data, code_75E90] + - [0x10382F0, .data, code_763D0] + - [0x10389E0, .data, code_76D90] + - [0x1038A40, .data, code_78100] + - [0x1038C30, .data, code_78E50] - [0x1038C80, .data, fxcommon3score] - [0x10392E0, .data, code_79C80] - [0x1039330, .data, code_7A760] - - [0x1039380, bin, data_E3A20] + - [0x1039380, .data, code_7AF80] - [0x10395B0, .data, code_82000] - - [0x103A1D0, bin, data_E4870] + - [0x103A1D0, .data, code_83340] - [0x103A1E0, .data, gc/section] - [0x103A710, .data, gc/sky] - [0x103AB20, .data, gc/transition] - [0x103AE20, .data, code_851D0] - - [0x103AEA0, bin, data_E5540] + - [0x103AEA0, .data, code_87E30] - [0x103AEB0, .data, gc/pauseMenu] - - [0x103B000, bin, data_E56A0] + - [0x103B000, .data, code_8DC20] - [0x103B090, .data, gc/zoombox] - - [0x103C310, bin, data_E69B0] + - [0x103C310, .data, code_91E10] + - [0x103C340, .data, code_935F0] - [0x103C370, .data, gc/parade] - [0x103C790, .data, code_94A20] - [0x103C7A0, .data, code_956B0] - - [0x103C7C0, bin, data_E6E60] + - [0x103C7C0, .data, code_98CB0] + - [0x103C7D0, bin, data_E6E60] - [0x103C850, .data, code_9B650] - [0x103CC90, .data, code_9B990] - [0x103CDF0, .data, code_9D640] diff --git a/include/enums.h b/include/enums.h index 0eb680d6..e9237812 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2399,10 +2399,10 @@ enum asset_e ASSET_229_ANIM_WHIPCRACK_ATTACK, ASSET_22A_ANIM_WHIPCRACK_IDLE, ASSET_22B_ANIM_NABNUT_FAT, - ASSET_22C_ANIM_NAMBUT_CRY, - ASSET_22D_ANIM_NAMBUT_BACKFLIP, - ASSET_22E_ANIM_NAMBUT_STAND, - ASSET_22F_ANIM_NAMBUT_RUN, + ASSET_22C_ANIM_NABNUT_CRY, + ASSET_22D_ANIM_NABNUT_BACKFLIP, + ASSET_22E_ANIM_NABNUT_STAND, + ASSET_22F_ANIM_NABNUT_RUN, ASSET_233_ANIM_ICECUBE = 0x233, diff --git a/include/gc/gczoombox.h b/include/gc/gczoombox.h index a3183c1c..261f1457 100644 --- a/include/gc/gczoombox.h +++ b/include/gc/gczoombox.h @@ -86,7 +86,7 @@ enum talk_pic_e { TALK_PIC_4D_GNAWTY, TALK_PIC_4E_BOSS_BOOM_BOX, TALK_PIC_4F_ZUBBA, - TALK_PIC_50_NAMBUT, + TALK_PIC_50_NABNUT, TALK_PIC_51_POLAR_BEAR_CUBS, TALK_PIC_52_YOUNG_EEYRIE_1, TALK_PIC_53_YOUNG_EEYRIE_2, diff --git a/src/CCW/code_5540.c b/src/CCW/code_5540.c index 2d140441..69edb3a9 100644 --- a/src/CCW/code_5540.c +++ b/src/CCW/code_5540.c @@ -36,7 +36,7 @@ void __chnabnut_setState_method(ActorMarker* marker, s32 next_state) { void chnabnut_setState(Actor *this, s32 next_state) { if (next_state == NABNUT_STATE_1_SAD) { - func_80335924(this->unk148, ASSET_22C_ANIM_NAMBUT_CRY, 0.2f, 10.6f); + func_80335924(this->unk148, ASSET_22C_ANIM_NABNUT_CRY, 0.2f, 10.6f); } if (next_state == NABNUT_STATE_2_WAIT) { @@ -45,7 +45,7 @@ void chnabnut_setState(Actor *this, s32 next_state) { if (next_state == NABNUT_STATE_3_BACKFLIP) { this->marker->propPtr->unk8_3 = FALSE; - func_80335924(this->unk148, ASSET_22D_ANIM_NAMBUT_BACKFLIP, 0.2f, 3.13f); + func_80335924(this->unk148, ASSET_22D_ANIM_NABNUT_BACKFLIP, 0.2f, 3.13f); func_80335A8C(this->unk148, 2); func_80324E38(0.0f, 3); timed_setCameraToNode(0.0f, 0xB); @@ -53,14 +53,14 @@ void chnabnut_setState(Actor *this, s32 next_state) { } if (next_state == NABNUT_STATE_4_THANK_PLAYER) { - func_80335924(this->unk148, ASSET_22E_ANIM_NAMBUT_STAND, 0.2f, 3.53f); + func_80335924(this->unk148, ASSET_22E_ANIM_NABNUT_STAND, 0.2f, 3.53f); func_80335A8C(this->unk148, 1); func_802C8F70(this->yaw - 40.0f); jiggySpawn(JIGGY_4A_CCW_NABNUT, this->position); } if (next_state == NABNUT_STATE_5_EXIT) { - func_80335924(this->unk148, ASSET_22F_ANIM_NAMBUT_RUN, 0.2f, 0.34f); + func_80335924(this->unk148, ASSET_22F_ANIM_NABNUT_RUN, 0.2f, 0.34f); } if (next_state == NABNUT_STATE_6_DESPAWN) { diff --git a/src/core2/ch/climbBase.c b/src/core2/ch/climbBase.c index 726cafce..bd3d393d 100644 --- a/src/core2/ch/climbBase.c +++ b/src/core2/ch/climbBase.c @@ -13,7 +13,7 @@ typedef struct { }ActorLocal_climbBase; /* .data */ -extern ActorInfo D_80367B20 = { +ActorInfo D_80367B20 = { 0x35, 0x26, 0x0, 0x1, NULL, func_802D77D4, func_80326224, func_80325340, diff --git a/src/core2/ch/jinjo.c b/src/core2/ch/jinjo.c index 58f980d2..7694b713 100644 --- a/src/core2/ch/jinjo.c +++ b/src/core2/ch/jinjo.c @@ -11,24 +11,24 @@ extern void func_8032BB88(Actor *, s32, s32); void func_802CDD78(Actor *this); /* .data */ -extern ActorAnimationInfo D_803671B0[]; -extern ActorInfo D_80367200 = { 0x5A, 0x60, 0x3C0, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; -extern ActorInfo D_80367224 = { 0x5B, 0x62, 0x3C2, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; -extern ActorInfo D_80367248 = { 0x5E, 0x5E, 0x3BB, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; -extern ActorInfo D_8036726C = { 0x5D, 0x61, 0x3C1, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; -extern ActorInfo D_80367290 = { 0x5C, 0x5F, 0x3BC, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; +ActorAnimationInfo D_803671B0[] = { + {0, 0.0f}, + {0x2D, 1000000.0f}, + {0x2D, 1.5f}, + {0x2F, 1.5f}, + {0x31, 0.75f}, + {0x2D, 1000000.0f}, + {0x31, 0.4f}, + {0x130, 1.75f}, + {0x131, 2.13333f}, + {0x31, 0.75f} +}; -/*.rodata */ -//jumptable D_80376560 -extern f64 D_80376578; //45.0 -extern f64 D_80376580; //182.04444 -extern f64 D_803765A8; //0.015 -extern f64 D_803765B0; //0.8 -extern f64 D_803765B8; //0.3 -extern f64 D_803765C0; //0.2 -extern f64 D_803765C8; //0.9 -//0.1 -//.rodata end 803765d0 +ActorInfo D_80367200 = { 0x5A, 0x60, 0x3C0, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; +ActorInfo D_80367224 = { 0x5B, 0x62, 0x3C2, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; +ActorInfo D_80367248 = { 0x5E, 0x5E, 0x3BB, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; +ActorInfo D_8036726C = { 0x5D, 0x61, 0x3C1, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; +ActorInfo D_80367290 = { 0x5C, 0x5F, 0x3BC, 0x1, D_803671B0, func_802CDD78, func_80326224, func_80325888, 0, 0, 0.0f, 0}; s32 func_802CDB50(s32 arg0){ switch(arg0){ diff --git a/src/core2/ch/wadingboots.c b/src/core2/ch/wadingboots.c index e902997a..eb30b672 100644 --- a/src/core2/ch/wadingboots.c +++ b/src/core2/ch/wadingboots.c @@ -6,8 +6,14 @@ Actor *chwadingboots_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void chwadingboots_update(Actor *this); /* .data */ -extern ActorAnimationInfo D_80367A00[]; -extern ActorInfo D_80367A20 = { +ActorAnimationInfo D_80367A00[] = { + {0x67, 0.7f}, + {0x67, 0.7f}, + {0x67, 0.7f}, + {0x67, 0.7f}, +}; + +ActorInfo D_80367A20 = { MARKER_11_WADING_BOOTS, ACTOR_65_WADING_BOOTS, ASSET_366_MODEL_WADING_BOOTS, 0x0, D_80367A00, chwadingboots_update, func_80326224, chwadingboots_draw, diff --git a/src/core2/code_45310.c b/src/core2/code_45310.c index d48743d0..229b3e7e 100644 --- a/src/core2/code_45310.c +++ b/src/core2/code_45310.c @@ -30,7 +30,7 @@ Actor *func_802CCA7C(ActorMarker *, Gfx **, Mtx **, Vtx **); void func_802CCC5C(Actor *this); /* .data */ -extern ActorInfo D_80367130 = { +ActorInfo D_80367130 = { MARKER_C2_BUZZBOMB, ACTOR_134_BUZZBOMB, ASSET_3ED_MODEL_BUZZBOMB, 0, NULL, func_802CCC5C, NULL, func_802CCA7C, diff --git a/src/core2/code_4A6F0.c b/src/core2/code_4A6F0.c index 6c390d21..ce2dd1d3 100644 --- a/src/core2/code_4A6F0.c +++ b/src/core2/code_4A6F0.c @@ -12,17 +12,28 @@ Actor *func_802D2964(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_802D1CF0(Actor *this); /* .data */ -extern ActorAnimationInfo D_80367490[]; -extern ActorInfo D_803674E0 = { +ActorAnimationInfo D_80367490[] = { + {0, 0.0f}, + {0x6A, 2.6f}, + {0x6B, 1.33f}, + {0x6C, 6.67f}, + {0x6C, 6.67f}, + {0x6D, 7.5f}, + {0x6E, 0.67f}, + {0x16E, 8.0f}, + {0x17F, 2.0f}, + {0x180, 0.7f}, +}; + +ActorInfo D_803674E0 = { 0x6, 0x7, 0x3C6, 0x1, D_80367490, func_802D1CF0, func_80326224, func_802D2964, 0, 0, 0.0f, 0 }; -extern s32 D_80367504[3]; -extern f32 D_80367510[3]; -extern s32 D_8036751C[4]; - +s32 D_80367504[3] = {0.0f, 0.0f, 0.0f}; +f32 D_80367510[3] = {1.0f, 0.0f, 2.0f}; +s32 D_8036751C[4] = {100, 100, 30, 100}; /* .bss */ u8 D_8037DDF0; @@ -30,7 +41,6 @@ u8 D_8037DDF1; u8 D_8037DDF2; u8 D_8037DDF3; - /* .code */ s32 func_802D1680(s32 arg0) { f32 var[3]; diff --git a/src/core2/code_4BE10.c b/src/core2/code_4BE10.c index 6a0d7d74..2cc6999e 100644 --- a/src/core2/code_4BE10.c +++ b/src/core2/code_4BE10.c @@ -5,16 +5,18 @@ void func_802D2DA0(Actor *this); /* .data */ -extern ActorInfo D_803675F0 = { +ActorInfo D_803675F0 = { 0x16, 0x6A, 0x0, 0x1, NULL, func_802D2DA0, func_80326244, func_80325340, 0, 0, 0.0f, 0 }; - -extern struct31s D_80367624; -extern struct42s D_8036764C; - +s16 D_80367614[] = {3,2,3,4,3,5,3,0}; +struct31s D_80367624 = {{0.7f, 0.3f}, {0.01f, 0.01f}, {0.05f, 0.05f}, {0.2f, 0.2f}, 0.0f, 0.01f}; +struct42s D_8036764C = { + {{-100.0f, 400.0f, -100.0f}, { 100.0f, 800.0f, 100.0f}}, + {{-100.0f, 0.0f, -100.0f}, { 100.0f, 0.0f, 100.0f}} +}; /* .code */ void func_802D2DA0(Actor *this) { diff --git a/src/core2/code_509D0.c b/src/core2/code_509D0.c index 1d5491f4..b3cd473d 100644 --- a/src/core2/code_509D0.c +++ b/src/core2/code_509D0.c @@ -9,49 +9,52 @@ extern ActorMarker *func_8028E86C(void); extern void func_803252D0(f32, s32); extern void func_8035646C(s32); -extern ActorAnimationInfo D_80367B50[]; +ActorAnimationInfo D_80367B50[] = { + {0, 0.0f}, + {0x18A, 1.5f}, + {0x18A, 1.5f}, + {0x18A, 1.5f}, + {0x18A, 1.5f}, + {0x18A, 1.5f} +}; - -extern ActorInfo D_80367B80 = { +ActorInfo D_80367B80 = { MARKER_36_ORANGE_COLLECTABLE, ACTOR_29_ORANGE_COLLECTABLE, ASSET_2D2_MODEL_ORANGE, 0x5, NULL, func_802D8528, func_80326224, func_80325888, 0, 0, 0.6f,0 }; -extern ActorInfo D_80367BA4 = { +ActorInfo D_80367BA4 = { MARKER_37_GOLD_BULLION, ACTOR_2A_GOLD_BULLION, ASSET_3C7_MODEL_GOLD_BULLION, 0x5, NULL, func_802D8528, func_80326224, func_80325888, 0, 0, 0.6f, 0 }; -extern ActorInfo D_80367BC8 = { +ActorInfo D_80367BC8 = { MARKER_1FD_BLUE_PRESENT_COLLECTABLE, ACTOR_1ED_BLUE_PRESENT_COLLECTABLE, ASSET_47F_MODEL_XMAS_GIFT_BLUE, 0x5, D_80367B50, func_802D8528, func_80326224, func_80325888, 0, 0, 1.8f, 0 }; -extern ActorInfo D_80367BEC = { +ActorInfo D_80367BEC = { MARKER_1FE_GREEN_PRESENT_COLLECTABLE, ACTOR_1EF_GREEN_PRESENT_COLLECTABLE, ASSET_480_MODEL_XMAS_GIFT_GREEN, 0x5, D_80367B50, func_802D8528, func_80326224, func_80325888, 0, 0, 1.4f, 0 }; -extern ActorInfo D_80367C10 = { +ActorInfo D_80367C10 = { MARKER_1FF_RED_PRESENT_COLLECTABLE, ACTOR_1F1_RED_PRESENT_COLLECTABLE, ASSET_481_MODEL_XMAS_GIFT_RED, 0x5, D_80367B50, func_802D8528, func_80326224, func_80325888, 0, 0, 1.4f, 0 }; -extern struct31s D_80367C34; -extern f32 D_80376D60; -extern f32 D_80376D64; -extern f32 D_80376D68; -extern f32 D_80376D6C; +struct31s D_80367C34 = {{0.2f, 0.4f}, {0.1f, 0.1f}, {0.0f, 0.01f}, {3.0f, 3.5f}, 0.1f, 0.1f}; + /* .code */ void func_802D7960(f32 position[3], enum asset_e sprite_id) { diff --git a/src/core2/code_53C10.c b/src/core2/code_53C10.c index 91fd1393..44715271 100644 --- a/src/core2/code_53C10.c +++ b/src/core2/code_53C10.c @@ -31,14 +31,6 @@ typedef struct { f32 unk3C; }ActorLocal_core2_53C10; -/* .data */ -extern struct41s D_80367EA0; -extern struct41s D_80367ED0; -extern struct41s D_80367F00; - -/* .rodata */ - - /* .code */ void func_802DABA0(ParticleEmitter *pCtrl, f32 position[3], f32 scale, enum asset_e model_id) { particleEmitter_setPosition(pCtrl, position); @@ -55,6 +47,10 @@ void func_802DABA0(ParticleEmitter *pCtrl, f32 position[3], f32 scale, enum asse } void func_802DAC84(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) { + static struct41s D_80367EA0 = { + {{-200.0f, 850.0f, -200.0f}, { 400.0f, 1000.0f, 400.0f}}, + {{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}} + }; particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_80367EA0); func_802DABA0(pCtrl, this->position, this->scale, model_id); func_802EFE24(pCtrl, -800.0f, -800.0f, -800.0f, 800.0f, 800.0f, 800.0f); @@ -63,6 +59,10 @@ void func_802DAC84(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) { void func_802DAD08(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) { + static struct41s D_80367ED0 = { + {{ -50.0f, 750.0f, -50.0f}, { 120.0f, 900.0f, 120.0f}}, + {{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}} + }; particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_80367ED0); func_802DABA0(pCtrl, this->position, this->scale, model_id); func_802EFE24(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f); @@ -70,6 +70,10 @@ void func_802DAD08(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) { } void func_802DAD8C(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) { + static struct41s D_80367F00 = { + {{ -80.0f, 400.0f, -80.0f}, { 160.0f, 860.0f, 160.0f}}, + {{ 0.0f, -1400.0f, 0.0f}, { 0.0f, -1400.0f, 0.0f}} + }; particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_80367F00); func_802DABA0(pCtrl, this->position, this->scale, model_id); func_802EFE24(pCtrl, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f); diff --git a/src/core2/code_55180.c b/src/core2/code_55180.c index 87ae2cfb..e30b35fd 100644 --- a/src/core2/code_55180.c +++ b/src/core2/code_55180.c @@ -7,7 +7,7 @@ extern bool func_8024DB50(f32[3], f32); void func_802DC208(Actor *this); /* .data */ -ActorInfo D_8037FE0 = { +ActorInfo D_80367FE0 = { 0x1F6, 0x1E6, 0, 0, NULL, func_802DC208, func_80326224, func_80325340, @@ -22,9 +22,6 @@ struct40s D_80368004 = { 0.0f, 0.7f}, 4.0f, 1.0f }; - - /* .rodata */ -extern f64 D_80376EF0; /* .code */ void func_802DC110(f32 *position, enum asset_e sprite_id) { diff --git a/src/core2/code_59780.c b/src/core2/code_59780.c index 5b44b4c7..1be91b7f 100644 --- a/src/core2/code_59780.c +++ b/src/core2/code_59780.c @@ -10,66 +10,68 @@ void func_802E07E0(Actor *this); void func_802E08F0(Actor *this); /* .data */ -extern ActorAnimationInfo D_80368440[]; +ActorAnimationInfo D_80368440[] = { + {0, 0.0f}, + {0x98, 1.2f} +}; -extern ActorInfo D_80368450 = { +ActorInfo D_80368450 = { 0x72, 0xA2, 0x3AD, 0x1, D_80368440, func_802E08F0, func_80326224, func_80325888, 0, 0, 0.0f, 0 }; - -extern ActorInfo D_80368474 = { +ActorInfo D_80368474 = { 0x8C, 0xBC, 0x45C, 0, NULL, NULL, func_802E07E0, func_802E0738, 0, 0, 0.0f, 0 }; -extern ActorInfo D_80368498 = { +ActorInfo D_80368498 = { 0x8D, 0xBD, 0x45E, 0, NULL, NULL, func_802E07E0, func_802E0738, 0, 0, 0.0f, 0 }; -extern ActorInfo D_803684BC = { +ActorInfo D_803684BC = { 0x13D, 0x2F4, 0x46E, 0, NULL, NULL, func_802E07E0, func_802E0738, 0, 0, 0.0f, 0 }; -extern ActorInfo D_803684E0 = { +ActorInfo D_803684E0 = { 0x13E, 0x2F5, 0x46F, 0, NULL, NULL, func_802E07E0, func_802E0738, 0, 0, 0.0f, 0 }; -extern ActorInfo D_80368504 = { +ActorInfo D_80368504 = { 0x13F, 0x2F6, 0x3BB, 0, NULL, NULL, func_802E07E0, func_802E0738, 0, 0, 0.0f, 0 }; -extern ActorInfo D_80368528 = { +ActorInfo D_80368528 = { 0x140, 0x2F7, 0x3BB, 0, NULL, NULL, func_802E07E0, func_802E0738, 0, 0, 0.0f, 0 }; -extern ActorInfo D_8036854C = { +ActorInfo D_8036854C = { 0x141, 0x2F8, 0x3BB, 0, NULL, NULL, func_802E07E0, func_802E0738, 0, 0, 0.0f, 0 }; -extern ActorInfo D_80368570 = { +ActorInfo D_80368570 = { 0x142, 0x2F9, 0x3BB, 0, NULL, NULL, func_802E07E0, func_802E0738, diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 28c100ca..5420533d 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -38,7 +38,13 @@ void func_8033DC9C(f32); extern void func_80324C58(void); /* .data */ -extern s16 D_80367FF0[]; +s16 D_803687F0[] = { + 0x159A, 0x02BC, 0x21C8, 0x00C8, 0x14ED, 0x03A2, 0x1951, 0x0003, + '**', ' B', 'AN', 'JO', ' K', 'AZ', 'OO', 'IE', + ' (', 'c)', ' R', 'AR', 'E ', 'Lt', 'd ', '19', + '98', ' *', '*\0', 0, 0, 0, 0, 0, + +}; /* .bss */ struct{ @@ -640,35 +646,35 @@ u8 func_802E4A8C(void){ } s32 func_802E4A98(s32 arg0){ - return D_80367FF0[arg0*8 + 0]; + return D_803687F0[8*(arg0 - 0x80) + 0]; } s32 func_802E4AAC(s32 arg0){ - return D_80367FF0[arg0*8 + 1]; + return D_803687F0[8*(arg0 - 0x80) + 1]; } s32 func_802E4AC0(s32 arg0){ - return D_80367FF0[arg0*8 + 2]; + return D_803687F0[8*(arg0 - 0x80) + 2]; } s32 func_802E4AD4(s32 arg0){ - return D_80367FF0[arg0*8 + 3]; + return D_803687F0[8*(arg0 - 0x80) + 3]; } s32 func_802E4AE8(s32 arg0){ - return D_80367FF0[arg0*8 + 4]; + return D_803687F0[8*(arg0 - 0x80) + 4]; } s32 func_802E4AFC(s32 arg0){ - return D_80367FF0[arg0*8 + 5]; + return D_803687F0[8*(arg0 - 0x80) + 5]; } s32 func_802E4B10(s32 arg0){ - return D_80367FF0[arg0*8 + 6]; + return D_803687F0[8*(arg0 - 0x80) + 6]; } s32 func_802E4B24(s32 arg0){ - return D_80367FF0[arg0*8 + 7]; + return D_803687F0[8*(arg0 - 0x80) + 7]; } f32 func_802E4B38(void){ diff --git a/src/core2/code_5DBC0.c b/src/core2/code_5DBC0.c index bfa3ee3a..a36813a5 100644 --- a/src/core2/code_5DBC0.c +++ b/src/core2/code_5DBC0.c @@ -43,13 +43,13 @@ typedef struct { u8 pad1F[1]; }struct5DBC0s; -extern u8 D_80368830[3] = {0,0,0}; -extern u8 D_80368834[3]; -extern u8 D_80368838[3]; -extern u8 D_8036883C[3]; -extern u8 D_80368840[3]; -extern u8 D_80368844[3]; -extern u8 D_80368848[3]; +u8 D_80368830[3] = {0xFF, 0x8B, 0}; +u8 D_80368834[3] = {0xFF, 0x8B, 0}; +u8 D_80368838[3] = {0xFF, 0x8B, 0}; +u8 D_8036883C[3] = {0xFF, 0x8B, 0}; +u8 D_80368840[3] = {0xFF, 0xFF, 0XFF}; +u8 D_80368844[3] = {0xFF, 0x00, 0X46}; +u8 D_80368848[3] = {0xFF, 0x8B, 0}; /* .bss */ struct5DBC0s * D_8037E900; diff --git a/src/core2/code_5FD90.c b/src/core2/code_5FD90.c index daeb1ba2..b45f8ecc 100644 --- a/src/core2/code_5FD90.c +++ b/src/core2/code_5FD90.c @@ -17,10 +17,6 @@ typedef struct { }Struct_core2_5FD90_0; -/* .rodata */ -extern f32 D_80377180; -extern f32 D_80377184; - /* .bss */ struct { BKCollisionGeo *unk0[100]; diff --git a/src/core2/code_66D90.c b/src/core2/code_66D90.c index 96f9cd13..665d5a44 100644 --- a/src/core2/code_66D90.c +++ b/src/core2/code_66D90.c @@ -8,7 +8,7 @@ extern void func_802EFF7C(ParticleEmitter *, f32, f32, f32); extern void func_802EFF9C(ParticleEmitter *, f32); /* .data */ -extern s32 D_80368850[3]; +s32 D_80368850[3] = {0xFF, 0xFF, 0xFE}; /* .bss */ u8 D_803808F0; diff --git a/src/core2/code_679A0.c b/src/core2/code_679A0.c index 3551b7cd..cc264be9 100644 --- a/src/core2/code_679A0.c +++ b/src/core2/code_679A0.c @@ -22,7 +22,7 @@ void func_802EFF9C(ParticleEmitter *, f32); void func_802F0C78(ParticleEmitter *this); -extern Gfx D_80368940[] = { +Gfx D_80368940[] = { 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), @@ -32,7 +32,7 @@ extern Gfx D_80368940[] = { gsSPEndDisplayList() }; -extern Gfx D_80368978[] = { +Gfx D_80368978[] = { 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), @@ -42,18 +42,9 @@ extern Gfx D_80368978[] = { gsSPEndDisplayList() }; -extern ParticleEmitter **D_803689B0; //particlePtrArrayPtr -extern s32 D_803689B4; //particlePtrArraySize -extern s32 D_803689B8[3]; - -extern f64 D_803771B0; -extern f64 D_803771B8; -extern f64 D_803771C0; -extern f64 D_803771C8; - -// 000F 0220: C0F86A0000000000 40F86A0000000000 -// 000F 0230: 40F86A0000000000 3F50624DD2F1A9FC -// 000F 0240: 400921FB54524550 0000000000000000 +ParticleEmitter **D_803689B0 = NULL; //particlePtrArrayPtr +s32 D_803689B4 = 0; //particlePtrArraySize +s32 D_803689B8[3] = {0xAF, 0x87, 0}; /* .bss */ f32 D_80380920; diff --git a/src/core2/code_6AEF0.c b/src/core2/code_6AEF0.c index 20fa090c..2d1ad048 100644 --- a/src/core2/code_6AEF0.c +++ b/src/core2/code_6AEF0.c @@ -3,8 +3,7 @@ #include "variables.h" -extern s32 D_80368AA0[3]; - +s32 D_80368AA0[3] = {0xC8, 0xC8, 0xE6}; /* .bss */ u8 D_80380A00; diff --git a/src/core2/code_6B030.c b/src/core2/code_6B030.c index a019c220..252d0358 100644 --- a/src/core2/code_6B030.c +++ b/src/core2/code_6B030.c @@ -19,12 +19,33 @@ typedef struct { }Struct_core2_6B030_0; /* .data */ -extern Gfx D_80368AC0[]; -extern Struct_core2_6B030_0 *D_80368AB0; -extern s16 D_80368AB4; -extern s16 D_80368AB8; -extern Gfx D_80368B08[]; -extern Struct_core2_6B030_1 D_80368B28[]; +Struct_core2_6B030_0 *D_80368AB0 = NULL; +s16 D_80368AB4 = 0; +s16 D_80368AB8 = 0; + +Gfx D_80368AC0[] = { + gsDPPipeSync(), + 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), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetCombineLERP(TEXEL1, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_XLU_SURF2), + gsSPEndDisplayList() +}; + +Gfx D_80368B08[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, SHADE, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 0, 0x50, 0xF0, 0xFF, 0xFF), + gsSPEndDisplayList() +}; + +Struct_core2_6B030_1 D_80368B28[] = { + {0x704, 0xFFFF}, + {0x705, 0xFFFF} +}; /* .bss */ f32 *D_80380A10; diff --git a/src/core2/code_6C3E0.c b/src/core2/code_6C3E0.c index 5df94d0b..bc56471a 100644 --- a/src/core2/code_6C3E0.c +++ b/src/core2/code_6C3E0.c @@ -13,28 +13,62 @@ typedef struct { f32 unkC[2]; f32 unk14[2]; u8 unk1C[3]; - // u8 pad1F[1]; + u8 unk1F; }Struct_Core2_6C3E0; /* .data */ -extern Struct_Core2_6C3E0 D_80368B30[]; -extern struct42s D_80368BD0; -extern struct42s D_80368C00; -extern struct42s D_80368C30; -extern struct42s D_80368C60; -extern struct42s D_80368C90; -extern struct42s D_80368CC0; -extern struct42s D_80368CF0; -extern struct42s D_80368D20; -extern struct42s D_80368D50; +Struct_Core2_6C3E0 D_80368B30[] = { + {{0.7f, 0.9f}, 0.5f, {0.1f, 0.1f}, { 0.4f, 0.6f}, {0xFF, 0xFF, 0xFE}, 0}, + {{0.8f, 1.2f}, 0.5f, {0.1f, 0.1f}, { 0.9f, 1.8f}, {0xFF, 0xFF, 0xFE}, 1}, + {{0.8f, 1.0f}, 0.5f, {0.1f, 0.1f}, { 0.6f, 1.0f}, {0xFF, 0xFF, 0xFE}, 2}, + {{0.7f, 0.7f}, 0.5f, {0.4f, 0.4f}, { 1.8f, 1.9f}, {0xFF, 0xFF, 0xFE}, 3}, + {{1.5f, 1.5f}, 0.5f, {0.1f, 0.1f}, {12.0f, 12.0f}, {0xFF, 0xFF, 0xFE}, 4} +}; -/* .rodata */ -extern f32 D_803771F0; -extern f32 D_803771F4; -extern f32 D_803771F8; -extern f32 D_803771FC; -extern f32 D_80377200; -extern f32 D_80377204; +struct42s D_80368BD0 = { + {{-100.0f, 100.0f, -100.0f}, { 100.0f, 250.0f, 100.0f}}, + {{ -10.0f, 10.0f, -10.0f}, { 10.0f, 10.0f, 10.0f}} +}; + +struct42s D_80368C00 = { + {{-100.0f, 100.0f, -100.0f}, { 100.0f, 250.0f, 100.0f}}, + {{ -10.0f, 10.0f, -10.0f}, { 10.0f, 10.0f, 10.0f}} +}; + +struct42s D_80368C30 = { + {{-200.0f, 100.0f, -200.0f}, { 200.0f, 350.0f, 200.0f}}, + {{ -30.0f, 100.0f, -30.0f}, { 30.0f, 100.0f, 30.0f}} +}; + +struct42s D_80368C60 = { + {{-125.0f, 100.0f, -125.0f}, { 125.0f, 250.0f, 125.0f}}, + {{ -15.0f, 100.0f, -15.0f}, { 15.0f, 100.0f, 15.0f}} +}; + +struct42s D_80368C90 = { + {{-125.0f, 100.0f, -125.0f}, { 125.0f, 250.0f, 125.0f}}, + {{ -15.0f, 100.0f, -15.0f}, { 15.0f, 100.0f, 15.0f}} +}; + +struct42s D_80368CC0 = { + {{-100.0f, 100.0f, -100.0f}, { 100.0f, 250.0f, 100.0f}}, + {{ -15.0f, 15.0f, -15.0f}, { 15.0f, 15.0f, 15.0f}} +}; + +struct42s D_80368CF0 = { + {{ -75.0f, 100.0f, -75.0f}, { 75.0f, 250.0f, 75.0f}}, + {{ -8.0f, 5.0f, -8.0f}, { -5.0f, 35.0f, 8.0f}} +}; + +struct42s D_80368D20 = { + {{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}}, + {{ -15.0f, -15.0f, -15.0f}, { 15.0f, 15.0f, 15.0f}} +}; + +struct42s D_80368D50 = { + {{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}}, + {{ -25.0f, -5.0f, -25.0f}, { 25.0f, 5.0f, 25.0f}} +}; /* .bss */ u8 D_80380A60; diff --git a/src/core2/code_6D270.c b/src/core2/code_6D270.c index 78a01687..3bf2e762 100644 --- a/src/core2/code_6D270.c +++ b/src/core2/code_6D270.c @@ -7,7 +7,7 @@ extern func_802EFAB0(ParticleEmitter *, s32, f32); ParticleEmitter *func_802F4274(f32 arg0[3]); /* .data */ -extern s32 D_80368DE0[3]; +s32 D_80368DE0[3] = {0xFF, 0XFF, 0XFE}; /* .bss */ u8 D_80380AA0; diff --git a/src/core2/code_6DA30.c b/src/core2/code_6DA30.c index 9c575969..387ede61 100644 --- a/src/core2/code_6DA30.c +++ b/src/core2/code_6DA30.c @@ -37,40 +37,164 @@ typedef struct{ }Struct_6DA30_0_s; /* .data */ -extern Struct_6DA30_0_s D_80369000[]; +extern Struct_6DA30_0_s D_80369000[] = { + {'A', 'V', -3, 0}, + {'W', 'A', -3, 0}, + {'V', 'A', -3, 0}, + {'Y', 'A', -2, 0}, + {'M', 'O', -1, 0}, + {'D', 'A', -1, 0}, + {'R', 'O', -2, 0}, + {'T', 'A', -2, 0}, + {'S', 'T', -1, 0}, + {'A', 'M', -1, 0}, + {'C', 'O', -1, 0}, + {'O', 'V', -1, 0}, + {'L', 'O', -1, 0}, + {'M', 'U', -1, 0}, + {'U', 'M', -1, 0}, + {'M', 'A', -2, 0}, + {'M', '0', -1, 0}, + {'N', 'S', 1, 0}, + {'H', 'I', 1, 0}, + {'I', 'P', 1, 0}, + {'I', '\'', 2, 0}, + {'A', '\'', -1, 0}, + {'N', '\'', 3, 0}, + {'E', 'E', 0, -1}, + {'Z', 'E', 0, 1}, + 0 +}; -extern struct { +s32 D_80369068[] = {8, 16, 16, 0}; //max letter width + +struct { u8 unk0; u8 unk1; u8 unk2; u8 unk3; -} D_80369078; +} D_80369078 = {0xFF, 0xFF, 0xFF, 0XFF}; -extern s32 D_80369068[]; //max letter width -extern MapFontTextureMap D_8036907C[]; +MapFontTextureMap D_8036907C[] ={ + {MAP_1_SM_SPIRAL_MOUNTAIN, 0x6F0}, + {MAP_2_MM_MUMBOS_MOUNTAIN, 0x6EF}, + {0x3, 0x6EE}, + {0x4, 0x6EE}, + {MAP_5_TTC_BLUBBERS_SHIP, 0x6F0}, + {MAP_6_TTC_NIPPERS_SHELL, 0x6EE}, + {MAP_7_TTC_TREASURE_TROVE_COVE, 0x6F0}, + {0x8, 0x6EE}, + {0x9, 0x6EE}, + {MAP_A_TTC_SANDCASTLE, 0x6F0}, + {MAP_B_CC_CLANKERS_CAVERN, 0x6EE}, + {MAP_C_MM_TICKERS_TOWER, 0x6EF}, + {MAP_D_BGS_BUBBLEGLOOP_SWAMP, 0x6EE}, + {MAP_E_MM_MUMBOS_SKULL, 0x6EF}, + {0xF, 0x6EE}, + {MAP_10_BGS_MR_VILE, 0x6EE}, + {MAP_11_BGS_TIPTUP, 0x6EE}, + {MAP_12_GV_GOBIS_VALLEY, 0x6F0}, + {MAP_13_GV_MEMORY_GAME, 0x6EE}, + {MAP_14_GV_SANDYBUTTS_MAZE, 0x6EE}, + {MAP_15_GV_WATER_PYRAMID, 0x6EE}, + {MAP_16_GV_RUBEES_CHAMBER, 0x6EE}, + {0x17, 0x6EE}, + {0x18, 0x6EE}, + {0x19, 0x6EE}, + {MAP_1A_GV_INSIDE_JINXY, 0x6EE}, + {MAP_1B_MMM_MAD_MONSTER_MANSION, 0x6EF}, + {MAP_21_CC_WITCH_SWITCH_ROOM, 0x6EE}, + {MAP_22_CC_INSIDE_CLANKER, 0x6EE}, + {MAP_23_CC_GOLDFEATHER_ROOM, 0x6EE}, + {MAP_24_MMM_TUMBLARS_SHED, 0x6EE}, + {MAP_25_MMM_WELL, 0x6EE}, + {MAP_26_MMM_NAPPERS_ROOM, 0x6EE}, + {MAP_28_MMM_EGG_ROOM, 0x6EF}, + {MAP_29_MMM_NOTE_ROOM, 0x6EF}, + {MAP_2A_MMM_FEATHER_ROOM, 0x6EF}, + {MAP_2B_MMM_SECRET_CHURCH_ROOM, 0x6EF}, + {MAP_2C_MMM_BATHROOM, 0x6EF}, + {MAP_2D_MMM_BEDROOM, 0x6EF}, + {MAP_2E_MMM_HONEYCOMB_ROOM, 0x6EF}, + {MAP_2F_MMM_WATERDRAIN_BARREL, 0x6EE}, + {MAP_30_MMM_MUMBOS_SKULL, 0x6EE}, + {MAP_31_RBB_RUSTY_BUCKET_BAY, 0x6EE}, + {MAP_32_UNUSED, 0x6EE}, + {MAP_33_UNUSED, 0x6F0}, + {MAP_34_RBB_ENGINE_ROOM, 0x6EE}, + {MAP_35_RBB_WAREHOUSE, 0x6EE}, + {MAP_36_RBB_BOATHOUSE, 0x6EE}, + {MAP_37_RBB_CONTAINER_1, 0x6EE}, + {MAP_38_RBB_CONTAINER_3, 0x6EE}, + {MAP_39_RBB_CREW_CABIN, 0x6EE}, + {MAP_3A_RBB_BOSS_BOOM_BOX, 0x6EE}, + {MAP_3B_RBB_STORAGE_ROOM, 0x6EE}, + {MAP_3C_RBB_KITCHEN, 0x6EE}, + {MAP_3D_RBB_NAVIGATION_ROOM, 0x6EE}, + {MAP_3E_RBB_CONTAINER_2, 0x6EE}, + {MAP_3F_RBB_CAPTAINS_CABIN, 0x6EE}, + {MAP_41_FP_BOGGYS_IGLOO, 0x6EE}, + {0x42, 0x6EE}, + {MAP_43_CCW_SPRING, 0x6EE}, + {MAP_44_CCW_SUMMER, 0x6EE}, + {MAP_45_CCW_AUTUMN, 0x6EE}, + {MAP_46_CCW_WINTER, 0x6EE}, + {MAP_47_BGS_MUMBOS_SKULL, 0x6EE}, + {MAP_48_FP_MUMBOS_SKULL, 0x6EE}, + {0x49, 0x6EE}, + {MAP_4A_CCW_SPRING_MUMBOS_SKULL, 0x6EE}, + {MAP_4B_CCW_SUMMER_MUMBOS_SKULL, 0x6EE}, + {MAP_4C_CCW_AUTUMN_MUMBOS_SKULL, 0x6EE}, + {MAP_4D_CCW_WINTER_MUMBOS_SKULL, 0x6EE}, + {0x4E, 0x6EE}, + {0x4F, 0x6EE}, + {0x50, 0x6EE}, + {0x51, 0x6EE}, + {0x52, 0x6EE}, + {MAP_53_FP_CHRISTMAS_TREE, 0x6EE}, + {0x54, 0x6EE}, + {0x55, 0x6EE}, + {0x56, 0x6EE}, + {0x57, 0x6EE}, + {0x58, 0x6EE}, + {0x59, 0x6EE}, + {MAP_5A_CCW_SUMMER_ZUBBA_HIVE, 0x6EE}, + {MAP_5B_CCW_SPRING_ZUBBA_HIVE, 0x6EE}, + {MAP_5C_CCW_AUTUMN_ZUBBA_HIVE, 0x6EE}, + {MAP_5E_CCW_SPRING_NABNUTS_HOUSE, 0x6EE}, + {MAP_5F_CCW_SUMMER_NABNUTS_HOUSE, 0x6EE}, + {MAP_60_CCW_AUTUMN_NABNUTS_HOUSE, 0x6EE}, + {MAP_61_CCW_WINTER_NABNUTS_HOUSE, 0x6EE}, + {MAP_62_CCW_WINTER_HONEYCOMB_ROOM, 0x6EE}, + {MAP_63_CCW_AUTUMN_NABNUTS_WATER_SUPPLY, 0x6EE}, + {MAP_64_CCW_WINTER_NABNUTS_WATER_SUPPLY, 0x6EE}, + {MAP_65_CCW_SPRING_WHIPCRACK_ROOM, 0x6EE}, + {MAP_66_CCW_SUMMER_WHIPCRACK_ROOM, 0x6EE}, + {MAP_67_CCW_AUTUMN_WHIPCRACK_ROOM, 0x6EE}, + {MAP_68_CCW_WINTER_WHIPCRACK_ROOM, 0x6EE}, + 0 +}; -extern u8 D_80369200[]; +char D_80369200[] = { + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + ':', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '@', '%', '?', '(', ')', '<', '>', '"', '.', ';', '-', '!', '/', '\'' +}; -extern Gfx D_80369238[];/* = { +Gfx D_80369238[] = { gsDPPipeSync(), 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(qu016(0.5), qu016(0.5), 0, G_TX_RENDERTILE, G_ON), + gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), gsDPSetCycleType(G_CYC_1CYCLE), gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), gsDPSetTexturePersp(G_TP_NONE), gsDPSetTextureFilter(G_TF_BILERP), gsSPEndDisplayList(), -};*/ - - -extern u8 D_80377240[4]; -extern u8 D_80377244[4]; -extern u8 D_80377248[4]; -extern u8 D_8037724C[4]; -extern u8 D_80377250[4]; -extern u8 D_80377254[4]; +}; +/* .bss */ char D_80380AB0; BKSprite *D_80380AB8[0x5]; diff --git a/src/core2/code_72060.c b/src/core2/code_72060.c index 27e996df..c873a42a 100644 --- a/src/core2/code_72060.c +++ b/src/core2/code_72060.c @@ -17,15 +17,39 @@ extern void mlMtxApply(Mtx *); extern f32 func_802EC920(BKVertexList *); extern bool func_8024DB50(f32[3], f32); -extern struct4Cs * D_80369280; -extern s32 D_80369284; -extern BKModelBin * D_80369288; -extern s32 D_8036928C; -extern Gfx D_80369290[]; -extern Gfx D_803692B0[]; +struct4Cs *D_80369280 = NULL; -extern f32 D_80377350; -extern f32 D_80377354; +s32 D_80369284 = 0; + +BKModelBin *D_80369288 = NULL; + +s32 D_8036928C = 0; + +Gfx D_80369290[] = +{ + gsDPPipeSync(), + gsDPPipelineMode(G_PM_1PRIMITIVE), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPEndDisplayList(), +}; + +Gfx D_803692B0[] = +{ + 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_803692C0[] = +{ + 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_803692D0[] = +{ + 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(), +}; /* .bss */ f32 D_80381040[3]; diff --git a/src/core2/code_74420.c b/src/core2/code_74420.c index a7a724a4..9cc337aa 100644 --- a/src/core2/code_74420.c +++ b/src/core2/code_74420.c @@ -2,8 +2,8 @@ #include "functions.h" #include "variables.h" -extern f32 D_80369800[9]; -extern s32 D_80369824; +f32 D_80369800[9] = {11.0f, 8.0f, 6.0f, 4.5f, 3.0f, 2.0f, -1.0f, -1.0f, 0.0f}; +s32 D_80369824 = 0; /* .bss */ struct8s * D_80381530[4]; diff --git a/src/core2/code_74910.c b/src/core2/code_74910.c index b717e0d1..e68e4a75 100644 --- a/src/core2/code_74910.c +++ b/src/core2/code_74910.c @@ -5,8 +5,8 @@ extern void func_802FB020(struct8s *, s32); -extern f32 D_80369830[]; -extern s32 D_80369854; +f32 D_80369830[] = {14.0f, 10.5f, 7.5f, 5.0f, 3.0f, 2.0f, -1.0f, -1.0f, 0.0f}; +s32 D_80369854 = 0; struct8s *D_80381540[5]; s32 D_80381554; diff --git a/src/core2/code_74ED0.c b/src/core2/code_74ED0.c index b1e8dabd..b8f42898 100644 --- a/src/core2/code_74ED0.c +++ b/src/core2/code_74ED0.c @@ -6,8 +6,8 @@ extern void func_802FB020(struct8s *, s32); /* .data */ -extern f32 D_80369860[9]; -extern s32 D_80369884; +f32 D_80369860[9] = {14.0f, 10.5f, 7.5f, 5.0f, 3.0f, 2.0f, -1.0f, -1.0f, 0.0f}; +s32 D_80369884 = 0; /* .bss */ struct8s *D_80381560[3]; diff --git a/src/core2/code_75480.c b/src/core2/code_75480.c index 5209edc5..74f538ea 100644 --- a/src/core2/code_75480.c +++ b/src/core2/code_75480.c @@ -3,8 +3,9 @@ #include "variables.h" /* .data */ -extern f32 D_80369890[]; -extern s32 D_803698B4; +f32 D_80369890[] = {12.0f, 9.0f, 6.5f, 4.5f, 3.0f, 2.0f, -1.0f, -1.0f, 0.0f}; +s32 D_803698B4 = 0; + /* .bss */ struct8s *D_80381570[4]; diff --git a/src/core2/code_75930.c b/src/core2/code_75930.c index b949df2e..f19a6bb0 100644 --- a/src/core2/code_75930.c +++ b/src/core2/code_75930.c @@ -4,8 +4,8 @@ /* .data */ -extern f32 D_803698C0[]; -extern s32 D_803698E4; +f32 D_803698C0[] = {14.0f, 10.5f, 7.5f, 5.0f, 3.0f, 2.0f, -1.0f, -1.0f, 0.0f}; +s32 D_803698E4 = 0; /* .bss */ struct8s *D_80381580[4]; diff --git a/src/core2/code_75E90.c b/src/core2/code_75E90.c index f0eb8fdb..f208e68b 100644 --- a/src/core2/code_75E90.c +++ b/src/core2/code_75E90.c @@ -3,8 +3,8 @@ #include "variables.h" /* .data */ -extern f32 D_803698F0[]; -extern s32 D_80369914; +f32 D_803698F0[] = {14.0f, 10.5f, 7.5f, 5.0f, 3.0f, 2.0f, -1.0f, -1.0f, 0.0f}; +s32 D_80369914 = 0; /* .bss */ struct8s *D_80381590[4]; diff --git a/src/core2/code_763D0.c b/src/core2/code_763D0.c index f77b42d4..f85f8481 100644 --- a/src/core2/code_763D0.c +++ b/src/core2/code_763D0.c @@ -10,7 +10,7 @@ extern s32 D_80276588; //framebuffer_w extern s32 D_8027658C; //framebuffer_h -extern Gfx D_80369920[] = { +Gfx D_80369920[] = { gsDPPipeSync(), 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), @@ -21,7 +21,7 @@ extern Gfx D_80369920[] = { gsSPEndDisplayList(), }; -extern struct8s D_80369960[] = { +struct8s D_80369960[] = { { 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0.0f, ITEM_C_NOTE, ASSET_7D9_SPRITE_NOTE, 0x1, 0xA, @@ -127,10 +127,6 @@ extern struct8s D_80369960[] = { }, }; -/* .rodata */ -extern f32 D_803773A0; -extern f32 D_803773A4; - /* .code */ void func_802FD360(struct8s *arg0, Gfx **gfx, Mtx **mtx, Vtx **vtx){ s32 tmp_s2 = 0; diff --git a/src/core2/code_76D90.c b/src/core2/code_76D90.c index 69c81f56..73af87a0 100644 --- a/src/core2/code_76D90.c +++ b/src/core2/code_76D90.c @@ -16,12 +16,26 @@ void item_set(s32, s32); f32 func_802FB0E4(s32); -extern void *D_8036A010; -extern void *D_8036A014; -extern s32 D_8036A018[]; -extern Gfx D_8036A030[]; +/* .data*/ +void *D_8036A010 = NULL; +void *D_8036A014 = NULL; +s32 D_8036A018[] = {2, 1, 0, 3, 4, 5}; + +Gfx D_8036A030[] = +{ + gsDPPipeSync(), + 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(0x1000, 0x1000, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsSPEndDisplayList() +}; + +/* .bss */ s32 D_803815C0; s32 D_803815C4; f32 D_803815C8; @@ -37,16 +51,6 @@ s32 D_803815EC; struct7s D_803815F0; s32 D_80381610; - -/* rodata - !!! NOTE the second half of .rodata is already defined as .rodata - COMBINE IN subyaml/core2.us.v10.yaml -*/ -extern f64 D_803773B0; -extern f64 D_803773B8; -extern f64 D_803773C0; -extern f64 D_803773C8; - void func_802FDD20(void) { s32 phi_v1; diff --git a/src/core2/code_78100.c b/src/core2/code_78100.c index b47da5b4..2ebe4a87 100644 --- a/src/core2/code_78100.c +++ b/src/core2/code_78100.c @@ -5,9 +5,34 @@ extern f32 func_802FB0E4(struct8s *); /* .data */ -extern u16 D_8036A070[0xD][0x10]; -extern enum asset_e D_8036A210[5]; -extern Gfx D_8036A228[]; +u16 D_8036A070[0xD][0x10] = { + {0x0000, 0xF33D, 0x1085, 0xB167, 0xF439, 0x9963, 0xF233, 0x6117, 0xDA6F, 0xF2B7, 0xDC33, 0xFD3D, 0x38CF, 0xC9EB, 0x819F, 0xD32D}, + {0x0000, 0xF2FD, 0x30CD, 0xC9EB, 0xF4BB, 0xA1A5, 0x8261, 0xF277, 0xDB31, 0xDCB3, 0xA267, 0x6319, 0xF379, 0xF231, 0xC26F, 0xDA2D}, + {0x0000, 0xF2FB, 0x0847, 0xA163, 0xCB2F, 0x521F, 0xF479, 0xFFFF, 0xD1ED, 0x5115, 0xADEF, 0x7BA1, 0x3AA1, 0xF273, 0x6BF1, 0xD433}, + {0x0000, 0xE22F, 0xB9A7, 0x108B, 0xF47B, 0xACEB, 0x4A61, 0xC739, 0xF2B9, 0x891F, 0x0263, 0x84AB, 0xCC31, 0xB2EB, 0x314D, 0x0915}, + {0x0000, 0xDA2F, 0xB1A5, 0x088D, 0xD3F3, 0x8C65, 0xCF39, 0x1A63, 0x80DD, 0xF2B9, 0x5257, 0xFCBB, 0x38D7, 0xA5B5, 0x6BA9, 0xF273}, + {0x0000, 0xE22F, 0xB1A7, 0x08CF, 0xE3B5, 0xBC6F, 0x6A61, 0xC6B7, 0xF2B9, 0x88DD, 0x09DF, 0x3AA7, 0x8C67, 0xF4BB, 0x5295, 0x40D5}, + {0x0000, 0xE22F, 0xC1E9, 0x088D, 0xD3B1, 0xBDF1, 0x8C27, 0xF2B9, 0x9161, 0xF4B9, 0x6DB7, 0x099D, 0x4151, 0x436D, 0x6A23, 0x739D}, + {0x0000, 0xF2B9, 0x5259, 0xAA29, 0x108D, 0xF439, 0x7BA5, 0xBDF1, 0xEA2F, 0x33AF, 0x9121, 0x963B, 0x119B, 0xCBEF, 0xBAF1, 0xD1EB}, + {0x0000, 0xF275, 0x0849, 0xA165, 0xF479, 0x521B, 0xA52F, 0xCEF9, 0x19E1, 0xD9ED, 0x4BED, 0xC32F, 0x73A3, 0x2951, 0xF2FB, 0xDBF3}, + {0x0000, 0xEA33, 0xA1A5, 0x1917, 0xB56D, 0x429D, 0xF2FB, 0xECB9, 0x0847, 0xCB6F, 0x22B1, 0x6159, 0x7CAD, 0xD1ED, 0x39D1, 0x73A3}, + {0x0000, 0xF2FB, 0xB1A5, 0x4995, 0xCBAF, 0x9CE7, 0x1049, 0xD9EF, 0xC5F3, 0x095B, 0xF439, 0xA337, 0x4AE1, 0xA2E9, 0xF273, 0x64AD}, + {0x0000, 0xF2B9, 0x6159, 0xC9EB, 0xCB2F, 0xF47B, 0xA9A5, 0xF273, 0x92E5, 0x20C9, 0xDBF1, 0xF2FD, 0x39CF, 0xE22F, 0x9961, 0xBAEB}, + {0x0000, 0xF2BB, 0xC9EB, 0x6959, 0xC32D, 0xEA31, 0x314D, 0xF3FB, 0x5AD7, 0xA965, 0xF53B, 0xF277, 0x911F, 0xD431, 0xE2F3, 0xFB3F} +}; + +enum asset_e D_8036A210[5] = {0x7DF, 0x7DF, 0x7DF, 0x7DF, 0x7DF}; + +Gfx D_8036A228[] = +{ + gsDPPipeSync(), + 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(), +}; /* .bss */ u16 D_80381620[0xD][5][0x10]; diff --git a/src/core2/code_78E50.c b/src/core2/code_78E50.c index 5ae291ed..eb843399 100644 --- a/src/core2/code_78E50.c +++ b/src/core2/code_78E50.c @@ -5,8 +5,18 @@ extern f32 func_802FB0E4(struct8s*); /* .code */ -extern s32 D_8036A260[]; -extern Gfx D_8036A278[]; +enum asset_e D_8036A260[] = {0x7E0, 0x7E1, 0x7E2, 0x7E3, 0x7E4}; +Gfx D_8036A278[] = +{ + gsDPPipeSync(), + 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(), +}; + /* .bss */ void *D_80381EB0[2]; diff --git a/src/core2/code_7AF80.c b/src/core2/code_7AF80.c index 03521626..a77848dc 100644 --- a/src/core2/code_7AF80.c +++ b/src/core2/code_7AF80.c @@ -43,36 +43,65 @@ void func_80308D2C(Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_80308F0C(Cube *cube); void func_80308EC8(void); -/* .data */ extern ActorInfo D_803675F0; extern ActorInfo D_80367838; -extern s32 sSpawnableActorSize; //0x8036A9B0 -extern ActorSpawn *sSpawnableActorList; //0x8036A9B4 +/* .data */ +s32 sSpawnableActorSize = 0; //0x8036A9B0 +ActorSpawn *sSpawnableActorList = NULL; //0x8036A9B4 -extern s32 D_8036A9B8; -extern Struct_core2_7AF80_1 *D_8036A9BC; -extern Struct_core2_7AF80_1 *D_8036A9C0; -extern s32 D_8036A9C4; -extern Struct_core2_7AF80_1 *D_8036A9C8; -extern Struct_core2_7AF80_1 *D_8036A9CC; -extern s32 D_8036A9D0; -extern Struct_core2_7AF80_1 *D_8036A9D4; -extern Struct_core2_7AF80_1 *D_8036A9D8; +s32 D_8036A9B8 = 0; +Struct_core2_7AF80_1 *D_8036A9BC = NULL; +Struct_core2_7AF80_1 *D_8036A9C0 = NULL; -extern UNK_TYPE(s32) D_8036A9DC; -extern UNK_TYPE(void *) D_8036A9E0; -extern u8 D_8036A9E4[]; -extern s16 D_8036ABD4; +s32 D_8036A9C4 = 0; +Struct_core2_7AF80_1 *D_8036A9C8 = NULL; +Struct_core2_7AF80_1 *D_8036A9CC = NULL; +s32 D_8036A9D0 = 0; +Struct_core2_7AF80_1 *D_8036A9D4 = NULL; +Struct_core2_7AF80_1 *D_8036A9D8 = NULL; -extern s16 *D_8036ABA0; -extern s16 *D_8036ABA4; -extern s32 D_8036ABA8; //max index of D_8036ABA4 -extern s16 D_8036ABAC[]; -extern s16 D_8036ABC0[]; +UNK_TYPE(s32) D_8036A9DC = 0; +UNK_TYPE(void *) D_8036A9E0 = NULL; -/* .rodata */ +u8 D_8036A9E4[] = { + 0, 9, 2, 3, 4, 5, 6, 7, -1, 8, 0xA, 0xB, + 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 1, 0x13, 0x14, 0x15, 0x16, 0x64, 0x65, 0x66, 0x67, 0x68, + 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, + 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, -1, + -1, -1, -1, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, + 0x7C, 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0xB4, 0x88, 0x89, 0x8A, 0x8B, + 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 +}; + +s16 *D_8036ABA0 = NULL; +s16 *D_8036ABA4 = NULL; +s32 D_8036ABA8 = 0; //max index of D_8036ABA4 +s16 D_8036ABAC[] = {0x269, 0x26B, 0x26D, 0x26F, 0x271, 0x273, 0x275, 0x277, 0x279, -1}; +s16 D_8036ABC0[] = {0x268, 0x26A, 0x26C, 0x26E, 0x270, 0x272, 0x274, 0x276, 0x278, -1}; +s16 D_8036ABD4 = 0; /* .bss */ struct { diff --git a/src/core2/code_83340.c b/src/core2/code_83340.c index 41e78860..26a6b2f1 100644 --- a/src/core2/code_83340.c +++ b/src/core2/code_83340.c @@ -21,9 +21,9 @@ typedef struct{ BKModelBin *func_8030A428(s32 arg0); /* .data */ -s32 D_8036B800; -s32 D_8036B804; -s32 D_8036B808; +s32 D_8036B800 = 0; +s32 D_8036B804 = 0; +s32 D_8036B808 = 0; /* .bss */ struct_7AF80_0 *D_80382390; //prop models ??? diff --git a/src/core2/code_87E30.c b/src/core2/code_87E30.c index 69635278..62ddb73e 100644 --- a/src/core2/code_87E30.c +++ b/src/core2/code_87E30.c @@ -11,8 +11,7 @@ extern void gczoombox_minimize(gczoombox_t *); extern void gczoombox_close(gczoombox_t *); extern bool func_803188B4(gczoombox_t *); -extern s8 D_8036C4D0[]; -extern f32 D_80378534; +s8 D_8036C4D0[] = {1, 0x1E, 0x14, 0xF, 0xB, 8, 6, 4, 3, 2, -1, -1}; /* .bss */ struct { diff --git a/src/core2/code_8DC20.c b/src/core2/code_8DC20.c index fd921fb8..c6dd034c 100644 --- a/src/core2/code_8DC20.c +++ b/src/core2/code_8DC20.c @@ -5,8 +5,30 @@ extern s16 D_803A5D00[2][0xF660]; -extern Gfx D_8036C630[]; -extern Gfx D_8036C690[]; +Gfx D_8036C630[] = +{ + gsDPPipeSync(), + 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(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, TEXEL0), + gsDPSetTextureFilter(G_TF_POINT), + gsDPSetTexturePersp(G_TP_NONE), + gsDPSetPrimColor(0, 0, 0x00, 0x00, 0x00, 0xFF), + gsDPSetColorDither(G_CD_DISABLE), + gsSPEndDisplayList() +}; + +Gfx D_8036C690[] = +{ + gsDPPipeSync(), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetColorDither(G_CD_MAGICSQ), + gsSPEndDisplayList(), +}; /* .bss */ s32 D_803830A0; diff --git a/src/core2/code_91E10.c b/src/core2/code_91E10.c index 8af326d9..53c15a0a 100644 --- a/src/core2/code_91E10.c +++ b/src/core2/code_91E10.c @@ -55,7 +55,53 @@ void func_803197AC(s32 arg0); void func_80319E20(s32 arg0, s32 arg1); void func_8031A3E4(void); -extern u8 D_8036D940[]; +u8 D_8036D940[] = { + 0, + TALK_PIC_11_CHIMPY, + TALK_PIC_12_CONGA, + TALK_PIC_13_BLUBBER, + TALK_PIC_14_NIPPER, + TALK_PIC_15_CLANKER, + TALK_PIC_16_SNIPPET, + TALK_PIC_17_VILE_4, + TALK_PIC_18_TIPTUP, + TALK_PIC_19_TANKTUP, + TALK_PIC_1A_FLIBBIT, + TALK_PIC_1B_TRUNKER, + TALK_PIC_1C_RUBEE, + TALK_PIC_1D_GOBI, + TALK_PIC_1E_GRABBA, + TALK_PIC_1F_TEEHEE, + TALK_PIC_3B_SNACKER, + TALK_PIC_3C_ANCIENT_ONE, + TALK_PIC_43_BOGGY, + TALK_PIC_44_WOZZA, + TALK_PIC_5B_CHEATO, + TALK_PIC_64_CROC_BANJO, + TALK_PIC_35_JUJU, + TALK_PIC_34_TERMITE, + TALK_PIC_38_LEAKY, + TALK_PIC_37_LITTLE_LOCKUP, + TALK_PIC_59_BLACK_SNIPPET, + TALK_PIC_39_GLOOP, + TALK_PIC_40_CROCTUS, + TALK_PIC_33_PIRANHA, + TALK_PIC_4B_TWINKLY, + TALK_PIC_4C_TWINKLY_CHOMPER, + TALK_PIC_3F_JINXY, + TALK_PIC_45_MOTZHAND, + TALK_PIC_5A_LOGGO, + TALK_PIC_3E_SNORKEL, + TALK_PIC_4E_BOSS_BOOM_BOX, + TALK_PIC_50_NABNUT, + TALK_PIC_55_ADULT_EEYRIE, + TALK_PIC_4D_GNAWTY, + TALK_PIC_4F_ZUBBA, + TALK_PIC_36_YUMYUM, + TALK_PIC_3D_SAND_EEL, + TALK_PIC_3A_TIPTUP_CHOIR_MEMBER, + TALK_PIC_67_VILE_5, +}; /* .bss */ Struct_Core2_91E10 *D_803830E0; diff --git a/src/core2/code_935F0.c b/src/core2/code_935F0.c index e49737a4..7f56d878 100644 --- a/src/core2/code_935F0.c +++ b/src/core2/code_935F0.c @@ -17,7 +17,7 @@ enum minigame_e { }; /* .data */ -extern ActorInfo D_8036D970 = { +ActorInfo D_8036D970 = { 0x1E1, 0x376, 0x0, 0x1, NULL, func_8031A9E4, func_80326224, func_80325340, diff --git a/src/core2/code_98CB0.c b/src/core2/code_98CB0.c index 8d510e29..4d3923ab 100644 --- a/src/core2/code_98CB0.c +++ b/src/core2/code_98CB0.c @@ -23,7 +23,7 @@ void func_80256E24(f32 *, f32, f32, f32, f32, f32); /* .data */ -extern s32 D_8036DDF0; +s32 D_8036DDF0 = 0x24; /* .bss */ struct { diff --git a/src/core2/gc/section.c b/src/core2/gc/section.c index 431f5959..ec2e8e4d 100644 --- a/src/core2/gc/section.c +++ b/src/core2/gc/section.c @@ -166,7 +166,7 @@ Struct_core2_83D70_1 D_8036BCE8[] = { }; /* .bss */ -char D_803823A0[0x60]; +char D_803823A0[0x70]; /* .data */ MapInfo * func_8030AD00(enum map_e map_id){ diff --git a/src/core2/mapspecificflags.c b/src/core2/mapspecificflags.c index cdfadb73..e6662b73 100644 --- a/src/core2/mapspecificflags.c +++ b/src/core2/mapspecificflags.c @@ -5,7 +5,7 @@ void mapSpecificFlags_set(s32 i, s32 val); /* .data */ -extern u32 D_80367000; +u32 D_80367000 = 0; /* .bss */ u32 D_8037DDE0; diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index b24fa661..dd921263 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -222,7 +222,7 @@ extern struct { {2, TALK_PIC_41_GRUNTILDA_3, 0, 0.0f}, {2, TALK_PIC_43_BOGGY, 0, 0.0f}, {2, TALK_PIC_44_WOZZA, 0, 0.0f}, - {2, TALK_PIC_50_NAMBUT, 0, 0.0f}, + {2, TALK_PIC_50_NABNUT, 0, 0.0f}, {2, TALK_PIC_51_POLAR_BEAR_CUBS, 0, 0.0f}, {2, TALK_PIC_55_ADULT_EEYRIE, 0, 0.0f}, {2, TALK_PIC_57_BRENTILDA, 0, 0.0f}, diff --git a/undefined_syms.us.v10.txt b/undefined_syms.us.v10.txt index 7ff0bebc..06c6fcc9 100644 --- a/undefined_syms.us.v10.txt +++ b/undefined_syms.us.v10.txt @@ -17,6 +17,7 @@ FP_D_80392840 = 0x80392840; core1_D_803727F4 = 0x803727F4; __osBaseTimer = 0x80285D00; FP_D_80392864 = 0x80392864; +D_803687F0 = 0x803687F0; n_aspMainTextStart = _binary_bin_core1_n_aspMain_text_bin_start; n_aspMainTextEnd = _binary_bin_core1_n_aspMain_text_bin_end;