diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index 382a5470..7f7fd9f9 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -563,18 +563,18 @@ segments: - [0xF8D610, c, code_14420] - [0xF8F110, c, code_15F20] - [0xF8F200, c, hazards] - - [0xF8FE50, bin, core2_untouched_text] - # - [0xF6C5C0, c, code_16C60] #DONE - # - [0xF6CB50, c, batimer] #DONE - # - [0xF6CDB0, c, bs/ant] #DONE - # - [0xF6DEB0, c, bs/bBarge] #DONE - # - [0xF6E4F0, c, bs/bbuster] #DONE - # - [0xF6EC90, c, bs/bee] #DONE - # - [0xF6EEC0, c, bs/beeFly] #DONE - # - [0xF6F960, c, bs/beeMain] #DONE - # - [0xF70B40, c, bs/bEggAss] #DONE - # - [0xF70DB0, c, bs/bEggHead] #DONE - # - [0xF71060, c, bs/bFlap] #DONE + - [0xF8FE50, c, code_16C60] + - [0xF903E0, c, batimer] + - [0xF90640, c, bs/ant] + - [0xF91740, c, bs/bBarge] + - [0xF91D80, c, bs/bbuster] + - [0xF92520, c, bs/bee] + - [0xF92750, c, bs/beeFly] + - [0xF931F0, c, bs/beeMain] + - [0xF943D0, c, bs/bEggAss] + - [0xF94640, c, bs/bEggHead] + - [0xF948F0, c, bs/bFlap] + - [0xF94FC0, bin, core2_untouched_text] # - [0xF71730, c, bs/bFlip] #DONE # - [0xF71D20, c, bs/bFly] #DONE # - [0xF73BA0, c, bs/bLongLeg] #DONE @@ -916,12 +916,12 @@ segments: - [0x1056DF0, .data, basfx] - [0x1056E10, .data, code_12F30] - [0x1056EB0, .data, code_14420] - - [0x10571F0, bin, core2_untouched_data] - # - [0x1033330, .data, bs/ant] - # - [0x1033360, .data, bs/bbuster] - # - [0x1033380, .data, bs/beeFly] - # - [0x10333B0, .data, bs/beeMain] - # - [0x10333E0, .data, bs/bFlap] + - [0x10571F0, .data, bs/ant] + - [0x1057220, .data, bs/bbuster] + - [0x1057240, .data, bs/beeFly] + - [0x1057270, .data, bs/beeMain] + - [0x10572A0, .data, bs/bFlap] + - [0x10572B0, bin, core2_untouched_data] # - [0x10333F0, .data, bs/bFlip] # - [0x1033410, .data, bs/bLongLeg] # - [0x1033430, .data, bs/bPeck] @@ -1157,16 +1157,16 @@ segments: - [0x10676A0, .rodata, bastick] - [0x10676B0, .rodata, code_14420] - [0x1067740, .rodata, hazards] - - [0x1067BA0, bin, core2_untouched_rodata] - # - [0x1043BD0, .rodata, code_16C60] - # - [0x1043C70, .rodata, bs/ant] - # - [0x1043CA0, .rodata, bs/bBarge] - # - [0x1043CE0, .rodata, bs/bbuster] - # - [0x1043D20, .rodata, bs/beeFly] - # - [0x1043D50, .rodata, bs/beeMain] - # - [0x1043DC0, .rodata, bs/bEggAss] - # - [0x1043DE0, .rodata, bs/bEggHead] - # - [0x1043E00, .rodata, bs/bFlap] + - [0x1067BA0, .rodata, code_16C60] + - [0x1067C40, .rodata, bs/ant] + - [0x1067C70, .rodata, bs/bBarge] + - [0x1067CB0, .rodata, bs/bbuster] + - [0x1067CF0, .rodata, bs/beeFly] + - [0x1067D20, .rodata, bs/beeMain] + - [0x1067D90, .rodata, bs/bEggAss] + - [0x1067DB0, .rodata, bs/bEggHead] + - [0x1067DD0, .rodata, bs/bFlap] + - [0x1067E40, bin, core2_untouched_rodata] # - [0x1043E70, .rodata, bs/bFlip] # - [0x1043EC0, .rodata, bs/bFly] # - [0x1043F20, .rodata, bs/bLongLeg] @@ -1428,16 +1428,16 @@ segments: - [0x0106C980, .bss, code_14420] - [0x0106C980, .bss, code_15F20] - [0x0106C980, .bss, hazards] - # - [0x0106C980, .bss, code_16C60] - # - [0x0106C980, .bss, batimer] - # - [0x0106C980, .bss, bs/ant] - # - [0x0106C980, .bss, bs/bBarge] - # - [0x0106C980, .bss, bs/bbuster] - # - [0x0106C980, .bss, bs/beeFly] - # - [0x0106C980, .bss, bs/beeMain] - # - [0x0106C980, .bss, bs/bEggAss] - # - [0x0106C980, .bss, bs/bEggHead] - # - [0x0106C980, .bss, bs/bFlap] + - [0x0106C980, .bss, code_16C60] + - [0x0106C980, .bss, batimer] + - [0x0106C980, .bss, bs/ant] + - [0x0106C980, .bss, bs/bBarge] + - [0x0106C980, .bss, bs/bbuster] + - [0x0106C980, .bss, bs/beeFly] + - [0x0106C980, .bss, bs/beeMain] + - [0x0106C980, .bss, bs/bEggAss] + - [0x0106C980, .bss, bs/bEggHead] + - [0x0106C980, .bss, bs/bFlap] # - [0x0106C980, .bss, bs/bFlip] # - [0x0106C980, .bss, bs/bFly] # - [0x0106C980, .bss, bs/bLongLeg] diff --git a/include/core2/ba/flap.h b/include/core2/ba/flap.h index 6902d31f..55160d5c 100644 --- a/include/core2/ba/flap.h +++ b/include/core2/ba/flap.h @@ -9,5 +9,4 @@ void baflap_reset(void); void baflap_activate(bool active); void baflap_update(void); - -#endif // __BA_FLAP_H__ \ No newline at end of file +#endif // __BA_FLAP_H__ diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index 33d7672f..c1585ab5 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -33,19 +33,26 @@ boot_func_8023DA20 = func_8023DA20; /* Temporary*/ +func_80346C10 = 0x80000000 | (0xd1c18 << 2); +commonParticle_new = 0x80000000 | (0xcfa10 << 2); +func_802ADCD4 = 0x80000000 | (0xab6c5 << 2); /* Temporary Correct*/ -func_8029DFF8 = 0x80000000 | (0xa778e << 2); -func_8029E100 = 0x80000000 | (0xa77d0 << 2); -batimer_isZero = 0x80000000 | (0xa7871 << 2); bsbtrot_inSet = 0x80000000 | (0xaa676 << 2); func_802AD318 = 0x80000000 | (0xab456 << 2); +bsdrone_init = 0x80000000 | (0xab884 << 2); +bsdrone_update = 0x80000000 | (0xab894 << 2); +bsdrone_end = 0x80000000 | (0xab8a4 << 2); +func_802B6FA8 = 0x80000000 | (0xadb86 << 2); bsjig_inJiggyJig = 0x80000000 | (0xac228 << 2); bsjig_setJiggyMarkerPtr = 0x80000000 | (0xac22b << 2); func_802B0CD8 = 0x80000000 | (0xac2c6 << 2); +func_802B3A50 = 0x80000000 | (0xace28 << 2); func_802BC434 = 0x80000000 | (0xaf0a9 << 2); ncDynamicCamera_enterFirstPerson = 0x80000000 | (0xaf9d5 << 2); ncDynamicCamera_exitFirstPerson = 0x80000000 | (0xaf9e6 << 2); +ncDynamicCamD_func_802BF2C0 = 0x80000000 | (0xafc50 << 2); +ncDynamicCam4_func_802BFE50 = 0x80000000 | (0xaff34 << 2); ncFirstPersonCamera_setZoomedOutPosition = 0x80000000 | (0xb0a39 << 2); ncFirstPersonCamera_setZoomedOutRotation = 0x80000000 | (0xb0a43 << 2); __spawnQueue_add_0 = 0x80000000 | (0xb0e9e << 2); @@ -77,17 +84,25 @@ func_802F499C = 0x80000000 | (0xbd2df << 2); mapModel_getBounds = 0x80000000 | (0xc26ce << 2); level_get_main_map = 0x80000000 | (0xc2bde << 2); level_get_main_exit = 0x80000000 | (0xc2bf1 << 2); +func_8030EB00 = 0x80000000 | (0xc3b28 << 2); sfxSource_setCallbackByIndex = 0x80000000 | (0xc37bd << 2); func_8030DD90 = 0x80000000 | (0xc37cc << 2); sfxSource_getSampleRate = 0x80000000 | (0xc38d9 << 2); func_8030E5F4 = 0x80000000 | (0xc39e5 << 2); func_8030E3FC = 0x80000000 | (0xc3967 << 2); +func_8030E560 = 0x80000000 | (0xc39c0 << 2); +func_8030E760 = 0x80000000 | (0xc3a40 << 2); +func_8030EAAC = 0x80000000 | (0xc3b13 << 2); +func_8030EB88 = 0x80000000 | (0xc3b4a << 2); func_803114D0 = 0x80000000 | (0xc45c7 << 2); func_80324C58 = 0x80000000 | (0xc942a << 2); timedFunc_set_0 = 0x80000000 | (0xc94bf << 2); +func_8032728C = 0x80000000 | (0xc9db7 << 2); actor_spawnWithYaw_s16 = 0x80000000 | (0xca1c1 << 2); func_80330FCC = 0x80000000 | (0xcc507 << 2); model_getVtxList = 0x80000000 | (0xce966 << 2); +func_8033A1FC = 0x80000000 | (0xce993 << 2); +func_8033A45C = 0x80000000 | (0xcea2b << 2); func_8033DE30 = 0x80000000 | (0xcf8a0 << 2); item_set = 0x80000000 | (0xd1a19 << 2); func_80354030 = 0x80000000 | (0xd5124 << 2); @@ -96,20 +111,6 @@ func_803541CC = 0x80000000 | (0xd518b << 2); func_80354380 = 0x80000000 | (0xd51f8 << 2); func_80356074 = 0x80000000 | (0xd5935 << 2); -func_8029DD6C = 0x8029dbac; -func_8029DFC8 = 0x8029de08; -func_8029DFD4 = 0x8029de14; -func_8029E0C4 = 0x8029df04; -func_8029E0D0 = 0x8029df10; -batimer_decrement = 0x8029dfe8; -batimer_get = 0x8029e0b0; -batimer_set = 0x8029e200; -bsant_inSet = 0x8029e3d8; -bsbbarge_hitboxActive = 0x8029f484; -bsbbuster_hitboxActive = 0x8029fa98; -func_8028F66C = 0x8028f48c; -func_802A02B4 = 0x802a00f4; -bsBeeFly_inSet = 0x802a0db8; bsbfly_inSet = 0x802a35b8; bsbfly_bombHitboxActive = 0x802a3dd0; bslongleg_inSet = 0x802a50ec; @@ -199,12 +200,6 @@ bsbwhirl_jump_end = 0x802aaa5c; bsbwhirl_exit_init = 0x802aaa84; bsbwhirl_exit_update = 0x802aab30; bsbwhirl_exit_end = 0x802aab6c; -bsegghead_init = 0x802a2220; -bsegghead_update = 0x802a22a8; -bsegghead_end = 0x802a2490; -bseggass_init = 0x802a1fb0; -bseggass_update = 0x802a2038; -bseggass_end = 0x802a21ec; bswalk_creep_init = 0x802b6e38; bswalk_creep_update = 0x802b6f34; bsstand_landing_init = 0x802b50e8; @@ -271,15 +266,6 @@ func_802B9D00 = 0x802b9b70; bsjig_notedoor_init = 0x802b0dd8; bsjig_notedoor_update = 0x802b0ee0; bsjig_notedoor_end = 0x802b0d40; -bsant_idle_init = 0x8029E458; -bsant_idle_update = 0x8029E4F0; -bsant_idle_end = 0x8029E57C; -bsant_walk_init = 0x8029E5A4; -bsant_walk_update = 0x8029E614; -bsant_walk_end = 0x8029E6E0; -bsant_jump_init = 0x8029e708; -bsant_jump_update = 0x8029e844; -bsant_jump_end = 0x8029e9d4; func_802A7A54 = 0x802a7894; func_802A7AB0 = 0x802a78f0; func_802A7BA8 = 0x802a79e8; @@ -298,12 +284,6 @@ bstalk_interrupt = 0x802B6090; bsjump_tumble_init = 0x802B1C20; bsjump_tumble_update = 0x802B1CD0; bsjump_tumble_end = 0x802B1DBC; -bsant_fall_init = 0x8029E9FC; -bsant_fall_update = 0x8029EA9C; -bsant_fall_end = 0x8029EB7C; -bsant_ow_init = 0x8029EDE8; -bsant_ow_update = 0x8029EE08; -bsant_ow_end = 0x8029EE28; func_802B1BF4 = 0x802B1A44; func_802B1CF8 = 0x802B1B48; func_802B1DA4 = 0x802B1BF4; @@ -316,9 +296,6 @@ bsdie_end = 0x802AE14C; func_802A5120 = 0x802A4F60; func_802A5190 = 0x802A4FD0; func_802A51C0 = 0x802A5000; -bsant_die_init = 0x8029EEA8; -bsant_die_update = 0x8029F058; -bsant_die_end = 0x8029F188; bsjig_jiggy_init = 0x802B08B8; bsjig_jiggy_update = 0x802B0A24; bsjig_jiggy_end = 0x802B0B5C; @@ -513,15 +490,11 @@ func_802A18C8 = 0x802A1708; func_802A1B68 = 0x802A19A8; func_802A1B88 = 0x802A19C8; func_802A1BA8 = 0x802A19E8; -bsbeemain_die_init = 0x802A1A68; func_802A1DD8 = 0x802A1C18; func_802A1F2C = 0x802A1D6C; func_802A0590 = 0x802A03D0; func_802A0630 = 0x802A0470; func_802A0704 = 0x802A0544; -bsbeefly_enter = 0x802A086C; -bsbeefly_update = 0x802A0954; -bsbeefly_end = 0x802A0D98; func_802AD56C = 0x802AD3AC; func_802AD5C0 = 0x802AD400; func_802AD614 = 0x802AD454; @@ -534,9 +507,6 @@ func_802B353C = 0x802B338C; func_802A4D30 = 0x802A4B70; func_802A4D50 = 0x802A4B90; func_802A4D70 = 0x802A4BB0; -bsant_drone_init = 0x8029F2A8; -bsant_drone_update = 0x8029F2D0; -bsant_drone_end = 0x8029F2F0; bsdrone_interrupt = 0x802AE2D0; bspumpkin_drone_init = 0x8802B33B4; bspumpkin_drone_update = 0x8802B33D4; @@ -568,15 +538,9 @@ bsblongleg_drone_end = 0x802A6320; bswalrus_sled_drone_init = 0x802B977C; bswalrus_sled_drone_update = 0x802B97A4; bswalrus_sled_drone_end = 0x802B97C4; -bsbee_drone_init = 0x802A02B8; -bsbee_drone_update = 0x802A02E0; -bsbee_drone_end = 0x802A0300; func_802ABCCC = 0x802ABB0C; func_802ABD0C = 0x802ABB4C; func_802ABD40 = 0x802ABB80; -bsant_bounce_init = 0x8029EE48; -bsant_bounce_update = 0x8029EE68; -bsant_bounce_end = 0x8029EE88; bspumpkin_rebound_init = 0x802B2E8C; bspumpkin_rebound_update = 0x802B2EAC; bspumpkin_rebound_end = 0x802B2ECC; diff --git a/src/core2/ba/flap.c b/src/core2/ba/flap.c index ebd499ea..3cbd24ed 100644 --- a/src/core2/ba/flap.c +++ b/src/core2/ba/flap.c @@ -100,4 +100,3 @@ void baflap_update(void) { } } } - diff --git a/src/core2/bs/bBarge.c b/src/core2/bs/bBarge.c index 737da8e0..fb1c3560 100644 --- a/src/core2/bs/bBarge.c +++ b/src/core2/bs/bBarge.c @@ -19,7 +19,7 @@ u8 D_8037D2A5; u8 D_8037D2A6; /* .code */ -s32 func_8029F4E0(Actor * arg0){ +int func_8029F4E0(Actor * arg0){ return arg0->unk138_31 == 0; } diff --git a/src/core2/bs/bEggAss.c b/src/core2/bs/bEggAss.c index aeef0cf8..c47723bf 100644 --- a/src/core2/bs/bEggAss.c +++ b/src/core2/bs/bEggAss.c @@ -26,7 +26,7 @@ void bseggass_update(void) { s32 next_state; AnimCtrl *plyr_mvmt; s32 has_eggs; - s32 sp28; + enum bs_e sp28; s32 fill1; s32 fill2; diff --git a/src/core2/bs/bEggHead.c b/src/core2/bs/bEggHead.c index f04c0ff1..c285c9cd 100644 --- a/src/core2/bs/bEggHead.c +++ b/src/core2/bs/bEggHead.c @@ -29,7 +29,7 @@ void bsegghead_update(void) { s32 next_state; AnimCtrl *aCtrl; s32 has_eggs; - s32 sp28; + enum bs_e sp28; s32 fill1; s32 fill2;