diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index 5106050b..a43fd58e 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -537,20 +537,20 @@ segments: - [0xF86B80, c, code_D9B0] - [0xF87140, c, bainput] - [0xF875E0, c, bakey] - - [0xF87870, c, abilityprogress] #DONE - - [0xF87B00, bin, core2_untouched_text] - # - [0xF64270, c, code_E910] #DONE - # - [0xF647A0, c, code_EE40] #DONE - # - [0xF648B0, c, code_EF50] #DONE - # - [0xF656C0, c, ba/physics] #DONE - # - [0xF66630, c, bs/iFrame] #DONE - # - [0xF66700, c, pitch] #DONE - # - [0xF669A0, c, code_11040] #DONE - # - [0xF66BB0, c, climb] #DONE - # - [0xF66DC0, c, code_11460] #DONE - # - [0xF66FC0, c, code_11660] #DONE - # - [0xF67130, c, code_117D0] #DONE - # - [0xF671D0, c, code_11870] #DONE + - [0xF87870, c, abilityprogress] + - [0xF87B00, c, code_E910] + - [0xF88030, c, code_EE40] + - [0xF88140, c, code_EF50] + - [0xF88F50, c, ba/physics] + - [0xF89EC0, c, ba/iFrame] + - [0xF89F90, c, pitch] + - [0xF8A230, c, code_11040] + - [0xF8A440, c, climb] + - [0xF8A650, c, code_11460] + - [0xF8A850, c, code_11660] + - [0xF8A9C0, c, code_117D0] + - [0xF8AA60, c, code_11870] + - [0xF8AD30, bin, core2_untouched_text] # - [0xF674A0, c, roll] #DONE # - [0xF67740, c, yaw] #DONE # - [0xF67CC0, c, code_12360] #DONE @@ -910,10 +910,10 @@ segments: - [0x1056020, .data, code_B850] - [0x1056030, .data, eggshatter] - [0x1056080, .data, ba/falldamage] - - [0x10560B0, bin, core2_untouched_data] - # - [0x10321F0, .data, code_E910] - # - [0x1032E10, .data, ba/physics] - # - [0x1032E20, .data, code_117D0] + - [0x10560B0, .data, code_E910] + - [0x1056CD0, .data, ba/physics] + - [0x1056CE0, .data, code_117D0] + - [0x1056DF0, bin, core2_untouched_data] # - [0x1032F30, .data, basfx] # - [0x1032F50, .data, code_12F30] # - [0x1032FF0, .data, code_14420] @@ -1141,15 +1141,15 @@ segments: - [0x1067100, .rodata, code_C4B0] - [0x1067140, .rodata, code_D9B0] - [0x1067150, .rodata, abilityprogress] - - [0x1067180, bin, core2_untouched_rodata] - # - [0x10431B0, .rodata, code_EF50] - # - [0x1043350, .rodata, ba/physics] - # - [0x10433B0, .rodata, bs/iFrame] - # - [0x10433C0, .rodata, pitch] - # - [0x10433F0, .rodata, code_11040] - # - [0x1043400, .rodata, climb] - # - [0x1043410, .rodata, code_11660] - # - [0x10435D0, .rodata, code_11870] + - [0x1067180, .rodata, code_EF50] + - [0x1067320, .rodata, ba/physics] + - [0x1067380, .rodata, ba/iFrame] + - [0x1067390, .rodata, pitch] + - [0x10673C0, .rodata, code_11040] + - [0x10673D0, .rodata, climb] + - [0x10673E0, .rodata, code_11660] + - [0x10675A0, .rodata, code_11870] + - [0x10675B0, bin, core2_untouched_rodata] # - [0x10435E0, .rodata, roll] # - [0x1043600, .rodata, yaw] # - [0x1043660, .rodata, code_12360] @@ -1403,18 +1403,18 @@ segments: - [0x0106C980, .bss, bainput] - [0x0106C980, .bss, bakey] - [0x0106C980, .bss, abilityprogress] - # - [0x0106C980, .bss, code_E910] - # - [0x0106C980, .bss, code_EE40] - # - [0x0106C980, .bss, code_EF50] - # - [0x0106C980, .bss, ba/physics] - # - [0x0106C980, .bss, bs/iFrame] - # - [0x0106C980, .bss, pitch] - # - [0x0106C980, .bss, code_11040] - # - [0x0106C980, .bss, climb] - # - [0x0106C980, .bss, code_11460] - # - [0x0106C980, .bss, code_11660] - # - [0x0106C980, .bss, code_117D0] - # - [0x0106C980, .bss, code_11870] + - [0x0106C980, .bss, code_E910] + - [0x0106C980, .bss, code_EE40] + - [0x0106C980, .bss, code_EF50] + - [0x0106C980, .bss, ba/physics] + - [0x0106C980, .bss, ba/iFrame] + - [0x0106C980, .bss, pitch] + - [0x0106C980, .bss, code_11040] + - [0x0106C980, .bss, climb] + - [0x0106C980, .bss, code_11460] + - [0x0106C980, .bss, code_11660] + - [0x0106C980, .bss, code_117D0] + - [0x0106C980, .bss, code_11870] # - [0x0106C980, .bss, roll] # - [0x0106C980, .bss, yaw] # - [0x0106C980, .bss, code_12360] diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index f661f16d..7cab4c82 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -543,7 +543,7 @@ segments: - [0xF647A0, c, code_EE40] - [0xF648B0, c, code_EF50] - [0xF656C0, c, ba/physics] - - [0xF66630, c, bs/iFrame] + - [0xF66630, c, ba/iFrame] - [0xF66700, c, pitch] - [0xF669A0, c, code_11040] - [0xF66BB0, c, climb] @@ -1142,7 +1142,7 @@ segments: - [0x1043180, .rodata, abilityprogress] - [0x10431B0, .rodata, code_EF50] - [0x1043350, .rodata, ba/physics] - - [0x10433B0, .rodata, bs/iFrame] + - [0x10433B0, .rodata, ba/iFrame] - [0x10433C0, .rodata, pitch] - [0x10433F0, .rodata, code_11040] - [0x1043400, .rodata, climb] @@ -1405,7 +1405,7 @@ segments: - [0x1048560, .bss, code_EE40] - [0x1048560, .bss, code_EF50] - [0x1048560, .bss, ba/physics] - - [0x1048560, .bss, bs/iFrame] + - [0x1048560, .bss, ba/iFrame] - [0x1048560, .bss, pitch] - [0x1048560, .bss, code_11040] - [0x1048560, .bss, climb] diff --git a/include/functions.h b/include/functions.h index 2510ff03..c3a82848 100644 --- a/include/functions.h +++ b/include/functions.h @@ -257,7 +257,7 @@ void func_80294980(f32 arg0[3]); f32 get_slope_timer(void); f32 get_turbo_duration(void); void func_80295C08(void (* arg0)(void)); -void bsiFrame_startWithValue(f32); +void baiFrame_startWithValue(f32); f32 pitch_getIdeal(void); void pitch_setAngVel(f32, f32); void func_80298528(f32); diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index 75228eee..dab90961 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -32,48 +32,64 @@ boot_gOverlayTable = gOverlayTable; boot_func_8023DA20 = func_8023DA20; /* Temporary*/ +func_8029B6F0 = 0x80000000 | (0xa6d4c << 2); +mapModel_getBounds = 0x80000000 | (0xc26ce << 2); +bsList_clearAll = 0x8029a440; +bsList_setInitMethod = 0x8029a4a8; +bsList_setUpdateMethod = 0x8029a4bc; +bsList_setEndMethod = 0x8029a4d0; +bsList_setInterruptMethod = 0x8029a4e4; +bs_clearState = 0x8029a550; +bastick_reset = 0x8029af5c; +update_void_return_Location = 0x8029c448; +func_802992F0 = 0x80000000 | (0xa644c << 2); +func_802993C8 = 0x80000000 | (0xa6482 << 2); +basfx_reset = 0x80000000 | (0xa65d0 << 2); +func_8029A4D0 = 0x80000000 | (0xa68c4 << 2); +bsStoredState_getLongLegTimer = 0x80000000 | (0xa69d0 << 2); +bsStoredState_getTurboTimer = 0x80000000 | (0xa69d3 << 2); +bsStoredState_setLongLegTimer = 0x80000000 | (0xa69ea << 2); +func_8029ADCC = 0x80000000 | (0xa6b03 << 2); +func_8029CF6C = 0x80000000 | (0xa736b << 2); +hazards_reset = 0x80000000 | (0xa7397 << 2); +func_8029DFF8 = 0x80000000 | (0xa778e << 2); +bsbtrot_inSet = 0x80000000 | (0xaa676 << 2); +bsStoredState_setTurboTimer = 0x80000000 | (0xa69ed << 2); +basfx_free = 0x80000000 | (0xa6618 << 2); +func_8029A54C = 0x80000000 | (0xa68e3 << 2); +func_8029ADA8 = 0x80000000 | (0xa6afa << 2); +freeHazardSfxId = 0x80000000 | (0xa738e << 2); +func_8029E100 = 0x80000000 | (0xa77d0 << 2); +bastick_update = 0x80000000 | (0xa6bed << 2); +bs_updateState = 0x80000000 | (0xa6988 << 2); +func_8029A554 = 0x80000000 | (0xa68e5 << 2); +hazards_update = 0x80000000 | (0xa75ea << 2); +basfx_update = 0x80000000 | (0xa6633 << 2); +func_8029AF1C = 0x80000000 | (0xa6b57 << 2); +bs_setInterruptResponse = 0x80000000 | (0xa69ab << 2); +bs_getInterruptType = 0x80000000 | (0xa69ae << 2); +func_8029B504 = 0x80000000 | (0xa6cd1 << 2); +func_8029B930 = 0x80000000 | (0xa6ddc << 2); +func_8029BA80 = 0x80000000 | (0xa6e30 << 2); +func_8029BE5C = 0x80000000 | (0xa6f27 << 2); +func_8029BED4 = 0x80000000 | (0xa6f45 << 2); +func_8029BF4C = 0x80000000 | (0xa6f63 << 2); +func_8029CCC4 = 0x80000000 | (0xa72c1 << 2); +func_802AD318 = 0x80000000 | (0xab456 << 2); +bsjig_inJiggyJig = 0x80000000 | (0xac228 << 2); +bsjig_setJiggyMarkerPtr = 0x80000000 | (0xac22b << 2); +chJigsawDance_setState = 0x80000000 | (0xb2120 << 2); +actor_spawnWithYaw_s16 = 0x80000000 | (0xca1c1 << 2); +func_80330FCC = 0x80000000 | (0xcc507 << 2); +item_set = 0x80000000 | (0xd1a19 << 2); + +func_8029CED0 = 0x80000000 | (0xa7344 << 2); +bastick_distance = 0x80000000 | (0xa6c4a << 2); +bastick_getAngleRelativeToBanjo = 0x80000000 | (0xa6c5f << 2); /* Temporary Correct*/ -ability_hasLearned = 0x80295618; -ability_setLearned = 0x80295658; -func_80295914 = 0x80295754; -func_80295A8C = 0x802958cc; -func_80295B04 = 0x80295944; -func_80295C14 = 0x80295a54; -func_80295D74 = 0x80295bb4; -func_80296C90 = 0x80296ad0; -func_80296C9C = 0x80296adc; -func_80296CA8 = 0x80296ae8; -func_80296CB4 = 0x80296af4; -func_80296CC0 = 0x80296b00; -baphysics_get_position_change = 0x80297500; -baphysics_set_type = 0x8029771c; -baphysics_set_target_horizontal_velocity = 0x802977b0; -baphysics_set_vertical_velocity = 0x802977e0; -baphysics_get_target_yaw = 0x802978bc; -baphysics_get_velocity = 0x802978c8; -baphysics_get_vertical_velocity = 0x802978ec; -baphysics_set_goto_position = 0x80297a04; -bsiFrame_getState = 0x80297aac; -pitch_setIdeal = 0x80297d7c; -pitch_applyIdeal = 0x80297dc4; -pitch_get = 0x80297dd8; -climbGetBottom = 0x80298060; -climbGetBottomY = 0x80298084; -climbGetTopY = 0x802980a8; -climbSet = 0x802980b4; -func_80298464 = 0x802982a4; -player_setPosition = 0x802982e0; -_player_getPosition = 0x80298314; -player_getYPosition = 0x80298338; -func_80298504 = 0x80298344; -func_80298540 = 0x80298380; -func_80298564 = 0x802983a4; -func_802985F0 = 0x80298430; -func_80298850 = 0x80298690; -func_80298890 = 0x802986d0; -func_802988DC = 0x8029871c; -func_8029892C = 0x8029876c; +roll_reset = 0x80000000 | (0xa62ac << 2); +roll_update = 0x80000000 | (0xa62bd << 2); roll_setIdeal = 0x80298b20; roll_applyIdeal = 0x80298b68; roll_get = 0x80298b7c; @@ -132,6 +148,481 @@ bsclaw_hitboxActive = 0x802ab0c0; bsclimb_inSet = 0x802ab640; bscroc_hitboxActive = 0x802acd8c; func_802AD3A0 = 0x802ad1e0; +bsstand_init = 0x802b4808; +bsstand_update = 0x802b4b90; +bsstand_end = 0x802b50b8; +func_802B5350 = 0x802b51c0; +bswalk_slow_init = 0x802b70d0; +bswalk_slow_upate = 0x802b71cc; +bswalk_init = 0x802b7368; +bswalk_update = 0x802b7484; +bswalk_fast_init = 0x802b7628; +bswalk_fast_update = 0x802b77dc; +bswalk_fast_end = 0x802b79f8; +bsjump_init = 0x802b0f7c; +bsjump_update = 0x802b11a4; +bsjump_end = 0x802b1464; +bsclaw_init = 0x802ab0cc; +bsclaw_update = 0x802ab13c; +bsclaw_end = 0x802ab3cc; + +bscrouch_init = 0x802ad62c; +bscrouch_update = 0x802ad7b0; +bscrouch_end = 0x802adb0c; +bsbtrot_jump_init = 0x802a9168; +bsbtrot_jump_update = 0x802a92b8; +bsbtrot_jump_end = 0x802a96a4; +bsturn_init = 0x802b65d0; +bsturn_update = 0x802b66c0; +bsturn_end = 0x802b6860; +func_802B63F8 = 0x802b6268; +func_802B64D0 = 0x802b6340; +func_802B6500 = 0x802b6370; +bsow_init = 0x802b1e28; +bsow_update = 0x802b1eec; +bsow_end = 0x802b1fd4; +bsbbuster_init = 0x8029faa4; +bsbbuster_update = 0x8029fbcc; +bsbbuster_end = 0x802a00b8; +bsbflap_init = 0x802a24d0; +bsbflap_update = 0x802a285c; +bsbflap_end = 0x802a2b50; +bsbpeck_init = 0x802a635c; +bsbpeck_update = 0x802a6530; +bsbpeck_end = 0x802a6768; +bsbflip_init = 0x802a2cac; +bsbflip_update = 0x802a2d88; +bsbflip_end = 0x802a314c; +bsbarge_init = 0x8029f490; +bsbarge_update = 0x8029f5bc; +bsbarge_end = 0x8029f928; +bsbtrot_enter_init = 0x802a8c7c; +bsbtrot_enter_update = 0x802a8ce4; +bsbtrot_enter_end = 0x802a8d74; +bsbtrot_stand_init = 0x802a8da0; +bsbtrot_stand_update = 0x802a8df0; +bsbtrot_stand_end = 0x802a8e50; +bsbtrot_walk_init = 0x802a8f38; +bsbtrot_walk_update = 0x802a8f8c; +bsbtrot_walk_end = 0x802a9140; +bsbtrot_exit_init = 0x802a96cc; +bsbtrot_exit_update = 0x802a9708; +bsbtrot_exit_end = 0x802a9744; +func_802A4D90 = 0x802a4bd0; +func_802A4EC8 = 0x802a4d08; +func_802A4F44 = 0x802a4d84; +bsbwhirl_enter_init = 0x802aa470; +bsbwhirl_enter_update = 0x802aa51c; +bsbwhirl_enter_end = 0x802aa568; +bsbwhirl_stand_init = 0x802aa594; +bsbwhirl_stand_update = 0x802aa5d8; +bsbwhirl_stand_end = 0x802aa63c; +bsbwhirl_walk_init = 0x802aa65c; +bsbwhirl_walk_update = 0x802aa6bc; +bsbwhirl_walk_end = 0x802aa79c; +bsbwhirl_jump_init = 0x802aa7bc; +bsbwhirl_jump_update = 0x802aa904; +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; +bsstand_landing_update = 0x802b5120; +bsbshock_charge_init = 0x802a67f0; +bsbshock_charge_update = 0x802a6980; +bsbshock_charge_end = 0x802a6c34; +bsbshock_init = 0x802a6ca0; +bsbshock_update = 0x802a6e08; +bsbshock_end = 0x802a6f14; +bsbfly_enter_init = 0x802a3660; +bsbfly_enter_update = 0x802a371c; +bsbfly_enter_end = 0x802a37d4; +func_802A505C = 0x802a4e9c; +bsbfly_init = 0x802a37fc; +bsbfly_update = 0x802a38e8; +func_802A3F70 = 0x802a3db0; +bsblongleg_enter_init = 0x802a5400; +bsblongleg_enter_update = 0x802a54c4; +bsblongleg_enter_end = 0x802a5558; +bsblongleg_stand_enter = 0x802a5584; +bsblongleg_stand_update = 0x802a55d8; +bsblongleg_stand_end = 0x802a56bc; +bsblongleg_walk_init = 0x802a56dc; +bsblongleg_walk_update = 0x802a576c; +bsblongleg_walk_end = 0x802a58d0; +bsblongleg_jump_init = 0x802a5b60; +bsblongleg_jump_update = 0x802a5cb0; +bsblongleg_jump_end = 0x802a5f5c; +bsblongleg_exit_init = 0x802a59f4; +bsblongleg_exit_update = 0x802a5a74; +bsblongleg_exit_end = 0x802a5b34; +func_802A3F9C = 0x802a3ddc; +func_802A411C = 0x802a3f5c; +func_802A4404 = 0x802a4244; +func_802A762C = 0x802a746c; +func_802A7674 = 0x802a74b4; +func_802A7718 = 0x802a7558; +func_802A7738 = 0x802a7578; +func_802A7838 = 0x802a7678; +func_802A7A2C = 0x802a786c; +func_802B5774 = 0x802b55e4; +func_802B5950 = 0x802b57c0; +func_802B5AF8 = 0x802b5968; +func_802B5B18 = 0x802b5988; +func_802B5C40 = 0x802b5ab0; +func_802B5E10 = 0x802b5c80; +bsjump_fall_init = 0x802b14b0; +bsjump_fall_update = 0x802b15a0; +bsjump_fall_end = 0x802b1770; +bsSwim_dive_init = 0x802a7bec; +func_802A7E2C = 0x802a7c6c; +func_802A7F4C = 0x802a7d8c; +bstwirl_init = 0x802b68bc; +bstwirl_update = 0x802b69e0; +bstwirl_end = 0x802b6b44; +bsslide_init = 0x802b40c0; +bsslide_update = 0x802b4230; +bsslide_end = 0x802b439c; +func_802B9ACC = 0x802b993c; +func_802B9B14 = 0x802b9984; +func_802B9AAC = 0x802b991c; +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; +bscarry_idle_init = 0x802AAD64; +bscarry_idle_update = 0x802AAE10; +bscarry_idle_end = 0x802AAE58; +bscarry_interrupt = 0x802AAFE4; +bscarry_walk_init = 0x802AAE78; +bscarry_walk_update = 0x802AAF1C; +bscarry_walk_end = 0x802AAFA4; +bscarry_interrupt = 0x802AAFE4; +bstalk_init = 0x802B5FA0; +bstalk_update = 0x802B6050; +bstalk_end = 0x802B6088; +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; +func_802B2BF0 = 0x802B2A40; +func_802B2C58 = 0x802B2AA8; +func_802B2D50 = 0x802B2BA0; +bsdie_init = 0x802ADCE0; +bsdie_update = 0x802ADE98; +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; +bsjig_jiggy_interrupt = 0x802B0CFC; +bsbtrot_slide_init = 0x802A9764; +bsbtrot_slide_update = 0x802A9874; +bsbtrot_slide_end = 0x802A99B8; +func_802A2098 = 0x802A1ED8; +func_802A2130 = 0x802A1F70; +func_802A2054 = 0x802A1E94; +bspumpkin_idle_init = 0x802B21D4; +bspumpkin_idle_update = 0x802B227C; +bspumpkin_idle_end = 0x802B22FC; +bspumpkin_walk_init = 0x802B2324; +bspumpkin_walk_update = 0x802B23D0; +bspumpkin_walk_end = 0x802B2460; +bspumpkin_jump_init = 0x802B2488; +bspumpkin_jump_update = 0x802B25A0; +bspumpkin_jump_end = 0x802B27E0; +bspumpkin_fall_init = 0x802B2810; +bspumpkin_fall_update = 0x802B28AC; +bspumpkin_fall_end = 0x802B2A20; +func_802A846C = 0x802A82AC; +func_802A85EC = 0x802A842C; +func_802A872C = 0x802A856C; +__bspumpkin_ow_init = 0x802B2E2C; +__bspumpkin_ow_update = 0x802B2E4C; +__bspumpkin_ow_end = 0x802B2E6C; +bspumpkin_die_init = 0x802B2EEC; +bspumpkin_die_update = 0x802B3090; +bspumpkin_die_end = 0x802B3298; +bsclimb_idle_init = 0x802AB670; +bsclimb_idle_update = 0x802AB71C; +bsclimb_idle_end = 0x802AB850; +func_802ABD60 = 0x802ABBA0; +bsclimb_move_init = 0x802AB870; +bsclimb_move_update = 0x802AB8E4; +bsclimb_move_end = 0x802ABAEC; +func_802B1928 = 0x802B1778; +func_802B1A54 = 0x802B18A4; +func_802B1BCC = 0x802B1A1C; +func_802B5FD0 = 0x802B5E40; +func_802B6064 = 0x802B5ED4; +func_802B60D0 = 0x802B5F40; +func_802B60D8 = 0x802B5F48; +func_802B6270 = 0x802B60E0; +func_802B6314 = 0x802B6184; +func_802B63C8 = 0x802B6238; +bsblongleg_slide_init = 0x802A5F84; +bsblongleg_slide_update = 0x802A608C; +bsblongleg_slide_end = 0x802A61A8; +func_802B3868 = 0x802B36B8; +func_802B3954 = 0x802B37A4; +func_802B3A20 = 0x802B3870; +func_802A4430 = 0x802A4270; +func_802A4548 = 0x802A4388; +func_802A4664 = 0x802A44A4; +bsbfly_beakbomb_crash_init = 0x802A4588; +func_802A48B4 = 0x802A46F4; +func_802A4A40 = 0x802A4880; +func_802A4CD0 = 0x802A4B10; +func_802A4CF0 = 0x802A4B30; +func_802A4D10 = 0x802A4B50; +func_802A7F6C = 0x802A7DAC; +func_802A8098 = 0x802A7ED8; +func_802A82D4 = 0x802A8114; +bsthrow_init = 0x802B63B0; +bsthrow_update = 0x802B6450; +bsthrow_end = 0x802B651C; +bsthrow_interrupt = 0x802B6568; +bscroc_idle_init = 0x802ABF14; +bscroc_idle_update = 0x802ABFB8; +bscroc_idle_end = 0x802AC064; +bscroc_walk_init = 0x802AC08C; +bscroc_walk_update = 0x802AC0FC; +bscroc_walk_end = 0x802AC1C0; +bscroc_jump_init = 0x802AC1E8; +bscroc_jump_update = 0x802AC31C; +bscroc_jump_end = 0x802AC510; +bscroc_fall_init = 0x802AC538; +bscroc_fall_update = 0x802AC5CC; +bscroc_fall_end = 0x802AC70C; +func_802A6394 = 0x802A61D4; +func_802A63F0 = 0x802A6230; +func_802A6450 = 0x802A6290; +bscroc_ow_init = 0x802AC978; +bscroc_ow_update = 0x802AC998; +bscroc_ow_end = 0x802AC9B8; +bscroc_die_init = 0x802ACA38; +bscroc_die_update = 0x802ACBE0; +bscroc_die_end = 0x802ACD3C; +bswalrus_idle_init = 0x802B80F4; +bswalrus_idle_update = 0x802B81A0; +bswalrus_idle_end = 0x802B822C; +bswalrus_walk_init = 0x802B8254; +bswalrus_walk_update = 0x802B82C4; +bswalrus_walk_end = 0x802B8360; +bswalrus_jump_init = 0x802B8388; +bswalrus_jump_update = 0x802B84C4; +bswalrus_jump_end = 0x802B86F8; +bswalrus_fall_init = 0x8802B8720; +bswalrus_fall_update = 0x8802B87BC; +bswalrus_fall_end = 0x8802B8924; +func_802A1F6C = 0x8802A1DAC; +func_802A1FC8 = 0x8802A1E08; +func_802A2014 = 0x8802A1E54; +bswalrus_ow_init = 0x8802B8AF4; +bswalrus_ow_update = 0x8802B8B14; +bswalrus_ow_end = 0x8802B8B34; +bswalrus_die_init = 0x8802B8BB4; +bswalrus_die_update = 0x8802B8D74; +bswalrus_die_end = 0x8802B8E80; +bscroc_bite_init = 0x8802ACE0C; +bscroc_bite_update = 0x8802ACE64; +bscroc_bite_end = 0x8802ACFA8; +bscroc_eat_bad_init = 0x8802ACFCC; +bscroc_eat_bad_update = 0x8802AD014; +bscroc_eat_bad_end = 0x8802AD0C8; +bscroc_eat_good_init = 0x8802AD168; +bscroc_eat_good_update = 0x8802AD1EC; +bscroc_eat_good_end = 0x8802AD370; +bsbtrot_fall_init = 0x8802A9A78; +bsbtrot_fall_update = 0x8802A9B48; +bsbtrot_fall_end = 0x8802A9EA8; +bssplat_init = 0x8802B4460; +bssplat_update = 0x8802B4578; +bssplat_end = 0x8802B46B4; +func_802B3CEC = 0x8802B3B3C; +func_802B3D1C = 0x8802B3B6C; +func_802B3D6C = 0x8802B3BBC; +func_802B3E2C = 0x802B3C7C; +func_802B3E64 = 0x802B3CB4; +func_802B3EF4 = 0x802B3D44; +func_802B3D8C = 0x802B3BDC; +func_802B3DBC = 0x802B3C0C; +func_802B3E0C = 0x802B3C5C; +func_802A4F74 = 0x802A4DB4; +func_802A4FC8 = 0x802A4E08; +func_802A503C = 0x802A4E7C; +func_802B5E8C = 0x802B5CFC; +func_802B5EFC = 0x802B5D6C; +func_802B5F38 = 0x802B5DA8; +func_802A83C0 = 0x802A8200; +func_802A8410 = 0x802A8250; +func_802A844C = 0x802A828C; +bsbtrot_unk79_init = 0x802A9EC8; +bsbtrot_unk79_update = 0x802A9F28; +bsbtrot_unk79_end = 0x802A9F74; +bswalk_mud_init = 0x802b7a28; +bswalk_mud_update = 0x802b7aa0; +bsbtrot_ow_init = 0x802A9F9C; +bsbtrot_ow_update = 0x802AA0BC; +bsbtrot_ow_end = 0x802AA178; +bssled_init = 0x802B3DF4; +bssled_update = 0x802B3E60; +bssled_end = 0x802B3E94; +bssled_interrupt = 0x802B3EE8; +bswalrus_sled_init = 0x802B9014; +bswalrus_sled_update = 0x802B9084; +bswalrus_sled_end = 0x802B914C; +func_802B98C0 = 0x802B9730; +bswalrus_sled_jump_init = 0x802B9174; +bswalrus_sled_jump_update = 0x802B92B0; +bswalrus_sled_jump_end = 0x802B93E8; +func_802B98C0 = 0x802B9730; +func_802A7BD0 = 0x802A7A10; +func_802A7CA8 = 0x802A7AE8; +func_802A7D74 = 0x802A7BB4; +bswalrus_timeout_init = 0x802B95FC; +func_802B9830 = 0x802B96A0; +func_802B9880 = 0x802B96F0; +func_802B90D0 = 0x802B8F40; +func_802B9130 = 0x802B8FA0; +func_802B917C = 0x802B8FEC; +func_802B98C0 = 0x802B9730; +func_802B95A0 = 0x802B9410; +func_802B963C = 0x802B94AC; +func_802B976C = 0x802B95DC; +func_802B98C0 = 0x802B9730; +func_802A1080 = 0x802A0EC0; +func_802A10D4 = 0x802A0F14; +func_802A117C = 0x802A0FBC; +func_802A11A4 = 0x802A0FE4; +func_802A1214 = 0x802A1054; +func_802A12D4 = 0x802A1114; +func_802A12FC = 0x802A113C; +func_802A1438 = 0x802A1278; +func_802A163C = 0x802A147C; +func_802A1664 = 0x802A14A4; +func_802A170C = 0x802A154C; +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; +func_8029F398 = 0x8029F1D8; +func_8029F3F4 = 0x8029F234; +func_8029F440 = 0x8029F280; +func_802B34A0 = 0x802B32F0; +func_802B34F8 = 0x802B3348; +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; +bspumpkin_drone_end = 0x8802B33F4; +bscroc_drone_init = 0x8802AD494; +bscroc_drone_update = 0x8802AD4B4; +bscroc_drone_end = 0x8802AD4DC; +bswalrus_drone_init = 0x8802B8ED0; +bswalrus_drone_update = 0x8802B8EF8; +bswalrus_drone_end = 0x8802B8F18; +func_802B5F58 = 0x8802B5DC8; +func_802B5F80 = 0x8802B5DF0; +func_802B5FA0 = 0x8802B5E10; +func_802A874C = 0x8802A858C; +func_802A8774 = 0x8802A85B4; +func_802A8794 = 0x8802A85D4; +bswalk_drone_init = 0x8802B7BBC; +bswalk_drone_update = 0x8802B7C30; +bswalk_drone_end = 0x8802B7C50; +func_802A50B0 = 0x8802A4EF0; +func_802A50D8 = 0x8802A4F18; +func_802A50F8 = 0x8802A4F38; +bsbtrot_drone_init = 0x802AA1B8; +bsbtrot_drone_update = 0x802AA1E8; +bsbtrot_drone_end = 0x802AA210; +bsblongleg_drone_init = 0x802A62B8; +bsblongleg_drone_update = 0x802A62E0; +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; +bscroc_bounce_init = 0x802AC9D8; +bscroc_bounce_update = 0x802AC9F8; +bscroc_bounce_end = 0x802ACA18; +bswalrus_bounce_init = 0x802B8B54; +bswalrus_bounce_update = 0x802B8B74; +bswalrus_bounce_end = 0x802B8B94; +func_802A1BC8 = 0x802A1A08; +func_802A1BE8 = 0x802A1A28; +func_802A1C08 = 0x802A1A48; +bsbwhirl_drone_init = 0x802AAB8C; +bsbwhirl_drone_update = 0x802AABAC; +bsbwhirl_drone_end = 0x802AABD4; +func_802AADBC = 0x802AABFC; +func_802AAE08 = 0x802AAC48; +func_802AAE4C = 0x802AAC8C; + bsjump_jumpingFromWater = 0x802b1c14; bspumpkin_inSet = 0x802b2154; bsswim_inset = 0x802b5594; diff --git a/src/TTC/ch/clam.c b/src/TTC/ch/clam.c index ee73e315..08b481cb 100644 --- a/src/TTC/ch/clam.c +++ b/src/TTC/ch/clam.c @@ -242,7 +242,7 @@ static void __chClam_playerDropsItem(enum bundle_e bundle_id, enum item_e item_i static void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_marker){ - if(bsiFrame_getState() == 3) return; + if(baiFrame_getState() == 3) return; if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showDialog(ASSET_A14_DIALOG_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){ mapSpecificFlags_set(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN, TRUE); diff --git a/src/core2/bs/iFrame.c b/src/core2/ba/iFrame.c similarity index 53% rename from src/core2/bs/iFrame.c rename to src/core2/ba/iFrame.c index fc33c20f..0afd7ffa 100644 --- a/src/core2/bs/iFrame.c +++ b/src/core2/ba/iFrame.c @@ -8,31 +8,31 @@ u8 iFrameState; /* .code */ -void bsiFrame_setState(s32 state) { +void baiFrame_setState(s32 state) { iFrameState = state; } -s32 bsiFrame_getState(void) { +s32 baiFrame_getState(void) { return iFrameState; } -void bsiFrame_reset(void) { +void baiFrame_reset(void) { iFrameState = 0; - bsiFrame_setState(IFRAME_NONE); + baiFrame_setState(IFRAME_NONE); stateTimer_clear(STATE_TIMER_4_IFRAME); } -void bsiFrame_start(void) { - bsiFrame_startWithValue(0.6f); +void baiFrame_start(void) { + baiFrame_startWithValue(0.6f); } -void bsiFrame_startWithValue(f32 val) { +void baiFrame_startWithValue(f32 val) { stateTimer_set(STATE_TIMER_4_IFRAME, val); - bsiFrame_setState(IFRAME_INVICIBLE); + baiFrame_setState(IFRAME_INVICIBLE); } -void bsiFrame_update(void) { +void baiFrame_update(void) { if (stateTimer_isDone(STATE_TIMER_4_IFRAME)) { - bsiFrame_setState(IFRAME_NONE); + baiFrame_setState(IFRAME_NONE); } } diff --git a/src/core2/bs/iFrame.h b/src/core2/ba/iFrame.h similarity index 100% rename from src/core2/bs/iFrame.h rename to src/core2/ba/iFrame.h diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index f0df9374..61e0c6c9 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -808,7 +808,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ obj_collision_type = MARKER_COLLISION_FUNC_1; break; }//L8028D034 - if(bsiFrame_getState() == 3){ + if(baiFrame_getState() == 3){ plyr_collision_type = MARKER_COLLISION_FUNC_0; } if(obj_collision_type){ @@ -1030,7 +1030,7 @@ void baMarker_8028D7B8(s32 arg0, ActorMarker *arg1, struct5Cs *collision_flags){ if(func_8033D5A4(collision_flags)) baflag_set(BA_FLAG_8); - if((bsiFrame_getState() != 3 && func_8028F1E0()) || !sp20){ + if((baiFrame_getState() != 3 && func_8028F1E0()) || !sp20){ if(!func_8028F25C()){ sp24 = func_8033D564(collision_flags); if(0 < sp24 && sp24 < 6){ diff --git a/src/core2/bs/ant.c b/src/core2/bs/ant.c index 1817577c..d172e1ca 100644 --- a/src/core2/bs/ant.c +++ b/src/core2/bs/ant.c @@ -337,7 +337,7 @@ static void __bsant_recoil_update(void){ } static void __bsant_recoil_end(void){ - bsiFrame_start(); + baiFrame_start(); baphysics_reset_gravity(); baMarker_collisionOn(); baeyes_open(); diff --git a/src/core2/bs/bFly.c b/src/core2/bs/bFly.c index 1da6d657..f15837e2 100644 --- a/src/core2/bs/bFly.c +++ b/src/core2/bs/bFly.c @@ -679,7 +679,7 @@ void func_802A4C34(s32 arg0) { void func_802A4C88(s32 arg0) { baphysics_reset(); baMarker_collisionOn(); - bsiFrame_start(); + baiFrame_start(); func_8029E070(0); func_80291548(); func_802A34C8(); diff --git a/src/core2/bs/bSwim.c b/src/core2/bs/bSwim.c index e036b299..6b3b5892 100644 --- a/src/core2/bs/bSwim.c +++ b/src/core2/bs/bSwim.c @@ -325,7 +325,7 @@ void func_802A7CA8(void) { void func_802A7D74(void) { - bsiFrame_start(); + baiFrame_start(); baMarker_collisionOn(); baeyes_open(); func_802A75B0(); diff --git a/src/core2/bs/bTrot.c b/src/core2/bs/bTrot.c index b9fbeb16..463d30f7 100644 --- a/src/core2/bs/bTrot.c +++ b/src/core2/bs/bTrot.c @@ -749,7 +749,7 @@ void bsbtrot_ow_update(void){ } void bsbtrot_ow_end(void){ - bsiFrame_start(); + baiFrame_start(); baphysics_reset_gravity(); baMarker_collisionOn(); baeyes_open(); diff --git a/src/core2/bs/bbuster.c b/src/core2/bs/bbuster.c index 5c4b6310..3190548f 100644 --- a/src/core2/bs/bbuster.c +++ b/src/core2/bs/bbuster.c @@ -155,8 +155,8 @@ void bsbbuster_update(void){ break; case 3://802A00F0 D_8037D2B7 = 0; - if(bsiFrame_getState() == 1){ - bsiFrame_startWithValue(0.9f); + if(baiFrame_getState() == 1){ + baiFrame_startWithValue(0.9f); } D_8037D2B0 -= time_getDelta(); diff --git a/src/core2/bs/beeMain.c b/src/core2/bs/beeMain.c index 05c61a6c..5dcd1b3b 100644 --- a/src/core2/bs/beeMain.c +++ b/src/core2/bs/beeMain.c @@ -360,7 +360,7 @@ void func_802A1A50(void){ } void func_802A1B28(void){ - bsiFrame_start(); + baiFrame_start(); baphysics_reset_gravity(); baMarker_collisionOn(); baeyes_open(); diff --git a/src/core2/bs/croc.c b/src/core2/bs/croc.c index 55c592d7..13fe3978 100644 --- a/src/core2/bs/croc.c +++ b/src/core2/bs/croc.c @@ -384,7 +384,7 @@ static void __bscroc_recoil_update(void){ } void __bscroc_recoil_end(void){ - bsiFrame_start(); + baiFrame_start(); baphysics_reset_gravity(); baMarker_collisionOn(); baeyes_open(); diff --git a/src/core2/bs/ow.c b/src/core2/bs/ow.c index eda61f8f..333f8c83 100644 --- a/src/core2/bs/ow.c +++ b/src/core2/bs/ow.c @@ -66,7 +66,7 @@ void bsow_update(void) { void bsow_end(void){ func_802B35DC(); func_802B1FD0(0); - bsiFrame_start(); + baiFrame_start(); baphysics_reset_gravity(); baMarker_collisionOn(); baeyes_open(); diff --git a/src/core2/bs/pumpkin.c b/src/core2/bs/pumpkin.c index 79cd34b7..bfed4961 100644 --- a/src/core2/bs/pumpkin.c +++ b/src/core2/bs/pumpkin.c @@ -394,7 +394,7 @@ void __bspumpkin_bounce_update(void) { } void __bspumpkin_bounce_end(void) { - bsiFrame_start(); + baiFrame_start(); baphysics_reset_gravity(); baMarker_collisionOn(); baeyes_open(); diff --git a/src/core2/bs/splat.c b/src/core2/bs/splat.c index 34e2e10c..eb3ec99e 100644 --- a/src/core2/bs/splat.c +++ b/src/core2/bs/splat.c @@ -85,5 +85,5 @@ void bssplat_update(void){ void bssplat_end(void){ baMarker_collisionOn(); - bsiFrame_start(); + baiFrame_start(); } diff --git a/src/core2/code_11870.c b/src/core2/code_11870.c index 5af7f6b8..26f14d68 100644 --- a/src/core2/code_11870.c +++ b/src/core2/code_11870.c @@ -32,7 +32,7 @@ void func_80298890(void){ if(D_8037C670){ D_8037C670--; if(D_8037C670 == 0){ - bsiFrame_startWithValue(1.2f); + baiFrame_startWithValue(1.2f); D_8037C671 = 0; } } diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index dfe0e97b..596efd53 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -2254,7 +2254,7 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) { sp6C = func_8033D584(arg2); sp68 = func_8033D5A4(arg2); sp64 = func_8033D574(arg2); - if (((bsiFrame_getState() != 3) && func_8028F1E0()) || (func_8033D594(arg2) == 0)) { + if (((baiFrame_getState() != 3) && func_8028F1E0()) || (func_8033D594(arg2) == 0)) { if (sp64 == 0) { if ((sp68 != 0) || (arg1->id == 0)) { if (sp68 <= 0) { diff --git a/src/core2/code_E910.c b/src/core2/code_E910.c index 554dd2e4..52646bd6 100644 --- a/src/core2/code_E910.c +++ b/src/core2/code_E910.c @@ -58,7 +58,7 @@ bsMap D_80363824[] ={ {BS_ROLL, bstwirl_init, bstwirl_update, bstwirl_end, func_802B5350}, {BS_SLIDE, bsslide_init, bsslide_update, bsslide_end, func_802B5350}, {0x33, func_802B9ACC, func_802B9B14, func_802B9AAC, func_802B9D00}, - {BS_34_JIG_NOTEDOOR, bsjig_notedoor_init, bsjig_notedoor_update, bsjig_notedoor_end, func_80296590}, + {BS_34_JIG_NOTEDOOR, bsjig_notedoor_init, bsjig_notedoor_update, bsjig_notedoor_end, VER_SELECT(func_80296590, 0x802b0cfc, 0, 0)}, {BS_35_ANT_IDLE, bsant_idle_init, bsant_idle_update, bsant_idle_end, func_802B5350}, {BS_ANT_WALK, bsant_walk_init, bsant_walk_update, bsant_walk_end, func_802B5350}, {BS_ANT_JUMP, bsant_jump_init, bsant_jump_update, bsant_jump_end, func_802B5350}, @@ -202,7 +202,7 @@ void func_80295914(void){ func_80295DD0(); func_80296C30(); baphysics_init(); - bsiFrame_reset(); + baiFrame_reset(); pitch_reset(); climbClear(); func_8029887C(); @@ -309,7 +309,7 @@ void func_80295C14(void){ snackerctl_update(); func_8028B71C(); hazards_update(); - bsiFrame_update(); + baiFrame_update(); func_80294E60(); cameraMode_update(); func_802919A0(); diff --git a/src/core2/code_EE40.c b/src/core2/code_EE40.c index 2391341e..4f37173b 100644 --- a/src/core2/code_EE40.c +++ b/src/core2/code_EE40.c @@ -26,8 +26,6 @@ void func_80295DD0(void){ D_8037C3C0.unk0[1] += 1000.0f; D_8037C3C0.unk0[2] += 400.0f; D_8037C3C0.unk18 = 0; - - } void func_80295E74(void){ diff --git a/src/core2/code_EF50.c b/src/core2/code_EF50.c index b982ccca..7dd0ebc7 100644 --- a/src/core2/code_EF50.c +++ b/src/core2/code_EF50.c @@ -1,7 +1,7 @@ #include #include "functions.h" #include "variables.h" - +#include "version.h" #include "core2/ba/physics.h" extern f32 player_getYaw(void); @@ -266,10 +266,15 @@ void func_80296590(void){ case 0x13 : //L802965C8 case 0x26 : //L802965C8 case 0x2a : //L802965C8 - case 0x2c : //L802965C8 case 0x30 : //L802965C8 +#if VERSION == VERSION_USA_1_0 + case 0x2c : +#endif func_80296404(temp_a0); break; +#if VERSION == VERSION_PAL + case 0x2c : +#endif case 0x31 : //L802965D8 case 0x32 : //L802965D8 case 0x33 : //L802965D8 @@ -382,7 +387,7 @@ void func_80296608(void){ sp2C = 2; break; case BS_INTR_1F_HAZARD: //L80296868 - if(bsiFrame_getState() != 3 && baMarker_isCollidable()){ + if(baiFrame_getState() != 3 && baMarker_isCollidable()){ case BS_INTR_31: //L8029688C func_802960C4(2); item_dec(ITEM_14_HEALTH); @@ -391,7 +396,7 @@ void func_80296608(void){ } break; case BS_INTR_21: //L802968B4 - if(bsiFrame_getState() != 3){ + if(baiFrame_getState() != 3){ case BS_INTR_33: //L802968C8 func_802960C4(0); item_dec(ITEM_14_HEALTH); @@ -400,7 +405,7 @@ void func_80296608(void){ } break; case BS_INTR_20: //L802968F0 - if(bsiFrame_getState() != 3){ + if(baiFrame_getState() != 3){ func_802960C4(1); item_dec(ITEM_14_HEALTH); next_state = func_802962BC(0); diff --git a/src/core2/hazards.c b/src/core2/hazards.c index 3fee7301..d3f5def4 100644 --- a/src/core2/hazards.c +++ b/src/core2/hazards.c @@ -4,7 +4,7 @@ #include "core2/ba/timer.h" #include "core2/statetimer.h" -#include "bs/iFrame.h" +#include "ba/iFrame.h" /* .bss */ u8 hazardSfxId; @@ -243,7 +243,7 @@ bool canTakeGroundDamage(void) { && bs_state != BS_25_LONGLEG_ENTER && player_getWaterState() != BSWATERGROUP_2_UNDERWATER && func_8028EC04() < 1U - && bsiFrame_getState() != IFRAME_INVICIBLE + && baiFrame_getState() != IFRAME_INVICIBLE && bs_getState() != BS_3D_FALL_TUMBLING && player_isDead() < 1U; } diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index dd02cc84..24c7a82f 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -1328,7 +1328,7 @@ void chfinalboss_phase3_update(ActorMarker *marker) { } break; case 23: - if (chfinalboss_func_80386BEC(this, 9.0f) && (bsiFrame_getState() != 3)) { + if (chfinalboss_func_80386BEC(this, 9.0f) && (baiFrame_getState() != 3)) { chfinalboss_phase3_setState(this, 0x18); } break; @@ -1575,7 +1575,7 @@ void chfinalboss_phase4_update(ActorMarker *marker) { break; case 29: - if ((chfinalboss_func_80386BEC(this, 9.0f)) && (bsiFrame_getState() != 3) && (sFinalBossJinjoStatueActivated == 0)) { + if ((chfinalboss_func_80386BEC(this, 9.0f)) && (baiFrame_getState() != 3) && (sFinalBossJinjoStatueActivated == 0)) { chfinalboss_phase4_setState(this, 0x1E); } break; @@ -1814,14 +1814,14 @@ void chfinalboss_phase5_update(ActorMarker *marker) { break; case 36: - if (chfinalboss_func_80386BEC(this, 9.0f) && (bsiFrame_getState() != 3)) { + if (chfinalboss_func_80386BEC(this, 9.0f) && (baiFrame_getState() != 3)) { chfinalboss_phase5_setState(this, 0x25); } break; case 37: chfinalboss_func_80386BEC(this, 3.0f); - if (bsiFrame_getState() == 3) { + if (baiFrame_getState() == 3) { chfinalboss_phase5_setState(this, 0x24); break; } diff --git a/symbol_addrs.pal.txt b/symbol_addrs.pal.txt index cefcf1da..78b23897 100644 --- a/symbol_addrs.pal.txt +++ b/symbol_addrs.pal.txt @@ -53,4 +53,4 @@ D_8027D008 = 0x8027cd48; D_8027D5B0 = 0x8027D408; D_8027DCC8 = 0x8027DB20; D_8027DCCC = 0x8027DB24; -D_8027D100 = 0x8027CE68; \ No newline at end of file +D_8027D100 = 0x8027CE68; diff --git a/tools/asm-processor b/tools/asm-processor index ba74fff4..42e7ccaf 160000 --- a/tools/asm-processor +++ b/tools/asm-processor @@ -1 +1 @@ -Subproject commit ba74fff47c78f9243d5c5365222ad75b4d9c4eb3 +Subproject commit 42e7ccaf1883279c7fe2f9d338ff3383175aa97f