pal core2 progress

This commit is contained in:
Banjo Kazooie
2025-08-18 00:03:05 -05:00
parent 24c3c06a6a
commit 2678f02ded
7 changed files with 113 additions and 134 deletions

View File

@@ -550,20 +550,20 @@ segments:
- [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
# - [0xF68020, c, basfx] #DONE
# - [0xF68890, c, code_12F30]
# - [0xF68FD0, c, bsList] #DONE
# - [0xF690E0, c, code_13780] #DONE
# - [0xF69260, c, bsStoredState] #DONE
# - [0xF69360, c, code_13A00] #DONE
# - [0xF69920, c, bastick] #DONE
# - [0xF69D80, c, code_14420] #DONE
# - [0xF6B880, c, code_15F20] #DONE
# - [0xF6B970, c, hazards] #DONE
- [0xF8AD30, c, roll]
- [0xF8AFD0, c, yaw]
- [0xF8B550, c, code_12360]
- [0xF8B8B0, c, basfx]
- [0xF8C120, c, code_12F30]
- [0xF8C860, c, bsList]
- [0xF8C970, c, code_13780]
- [0xF8CAF0, c, bsStoredState]
- [0xF8CBF0, c, code_13A00]
- [0xF8D1A0, c, bastick]
- [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
@@ -913,10 +913,10 @@ segments:
- [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]
- [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]
@@ -1149,15 +1149,15 @@ segments:
- [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]
# - [0x1043690, .rodata, basfx]
# - [0x10436C0, .rodata, code_12F30]
# - [0x10436E0, .rodata, bastick]
# - [0x10436F0, .rodata, code_14420]
# - [0x1043770, .rodata, hazards]
- [0x10675B0, .rodata, roll]
- [0x10675D0, .rodata, yaw]
- [0x1067630, .rodata, code_12360]
- [0x1067660, .rodata, basfx]
- [0x1067690, .rodata, code_12F30]
- [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]
@@ -1415,19 +1415,19 @@ segments:
- [0x0106C980, .bss, code_11660]
- [0x0106C980, .bss, code_117D0]
- [0x0106C980, .bss, code_11870]
# - [0x0106C980, .bss, roll]
# - [0x0106C980, .bss, yaw]
# - [0x0106C980, .bss, code_12360]
# - [0x0106C980, .bss, basfx]
# - [0x0106C980, .bss, code_12F30]
# - [0x0106C980, .bss, bsList]
# - [0x0106C980, .bss, code_13780]
# - [0x0106C980, .bss, bsStoredState]
# - [0x0106C980, .bss, code_13A00]
# - [0x0106C980, .bss, bastick]
# - [0x0106C980, .bss, code_14420]
# - [0x0106C980, .bss, code_15F20]
# - [0x0106C980, .bss, hazards]
- [0x0106C980, .bss, roll]
- [0x0106C980, .bss, yaw]
- [0x0106C980, .bss, code_12360]
- [0x0106C980, .bss, basfx]
- [0x0106C980, .bss, code_12F30]
- [0x0106C980, .bss, bsList]
- [0x0106C980, .bss, code_13780]
- [0x0106C980, .bss, bsStoredState]
- [0x0106C980, .bss, code_13A00]
- [0x0106C980, .bss, bastick]
- [0x0106C980, .bss, code_14420]
- [0x0106C980, .bss, code_15F20]
- [0x0106C980, .bss, hazards]
# - [0x0106C980, .bss, code_16C60]
# - [0x0106C980, .bss, batimer]
# - [0x0106C980, .bss, bs/ant]

View File

@@ -32,97 +32,70 @@ 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);
/* 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);
bsjig_inJiggyJig = 0x80000000 | (0xac228 << 2);
bsjig_setJiggyMarkerPtr = 0x80000000 | (0xac22b << 2);
func_802B0CD8 = 0x80000000 | (0xac2c6 << 2);
func_802BC434 = 0x80000000 | (0xaf0a9 << 2);
ncDynamicCamera_enterFirstPerson = 0x80000000 | (0xaf9d5 << 2);
ncDynamicCamera_exitFirstPerson = 0x80000000 | (0xaf9e6 << 2);
ncFirstPersonCamera_setZoomedOutPosition = 0x80000000 | (0xb0a39 << 2);
ncFirstPersonCamera_setZoomedOutRotation = 0x80000000 | (0xb0a43 << 2);
__spawnQueue_add_0 = 0x80000000 | (0xb0e9e << 2);
chJigsawDance_setState = 0x80000000 | (0xb2120 << 2);
func_802DC528 = 0x80000000 | (0xb71c2 << 2);
func_802DC560 = 0x80000000 | (0xb71d0 << 2);
func_802E4048 = 0x80000000 | (0xb908e << 2);
func_802E412C = 0x80000000 | (0xb90c7 << 2);
vtxList_getVertices = 0x80000000 | (0xbb18c << 2);
func_802EDD8C = 0x80000000 | (0xbb7db << 2);
particleEmitter_setSphericalParticleVelocityRange = 0x80000000 | (0xbc03c << 2);
fxRipple_802F3554 = 0x80000000 | (0xbcdcd << 2);
fxRipple_802F3584 = 0x80000000 | (0xbcdd9 << 2);
func_802F4094 = 0x80000000 | (0xbd09d << 2);
func_802F4200 = 0x80000000 | (0xbd0f8 << 2);
func_802F4798 = 0x80000000 | (0xbd25e << 2);
func_802F47D0 = 0x80000000 | (0xbd26c << 2);
func_802F487C = 0x80000000 | (0xbd297 << 2);
func_802F4884 = 0x80000000 | (0xbd299 << 2);
func_802F4894 = 0x80000000 | (0xbd29d << 2);
func_802F48B4 = 0x80000000 | (0xbd2a5 << 2);
func_802F48BC = 0x80000000 | (0xbd2a7 << 2);
func_802F48E0 = 0x80000000 | (0xbd2b0 << 2);
func_802F4900 = 0x80000000 | (0xbd2b8 << 2);
func_802F4924 = 0x80000000 | (0xbd2c1 << 2);
func_802F494C = 0x80000000 | (0xbd2cb << 2);
func_802F4978 = 0x80000000 | (0xbd2d6 << 2);
func_802F499C = 0x80000000 | (0xbd2df << 2);
mapModel_getBounds = 0x80000000 | (0xc26ce << 2);
level_get_main_map = 0x80000000 | (0xc2bde << 2);
level_get_main_exit = 0x80000000 | (0xc2bf1 << 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_803114D0 = 0x80000000 | (0xc45c7 << 2);
func_80324C58 = 0x80000000 | (0xc942a << 2);
timedFunc_set_0 = 0x80000000 | (0xc94bf << 2);
actor_spawnWithYaw_s16 = 0x80000000 | (0xca1c1 << 2);
func_80330FCC = 0x80000000 | (0xcc507 << 2);
model_getVtxList = 0x80000000 | (0xce966 << 2);
func_8033DE30 = 0x80000000 | (0xcf8a0 << 2);
item_set = 0x80000000 | (0xd1a19 << 2);
func_80354030 = 0x80000000 | (0xd5124 << 2);
func_803541C0 = 0x80000000 | (0xd5188 << 2);
func_803541CC = 0x80000000 | (0xd518b << 2);
func_80354380 = 0x80000000 | (0xd51f8 << 2);
func_80356074 = 0x80000000 | (0xd5935 << 2);
func_8029CED0 = 0x80000000 | (0xa7344 << 2);
bastick_distance = 0x80000000 | (0xa6c4a << 2);
bastick_getAngleRelativeToBanjo = 0x80000000 | (0xa6c5f << 2);
/* Temporary Correct*/
roll_reset = 0x80000000 | (0xa62ac << 2);
roll_update = 0x80000000 | (0xa62bd << 2);
roll_setIdeal = 0x80298b20;
roll_applyIdeal = 0x80298b68;
roll_get = 0x80298b7c;
yaw_setUpdateState = 0x80298fe8;
yaw_setIdeal = 0x80298ff4;
yaw_set = 0x80299018;
yaw_applyIdeal = 0x8029903c;
yaw_get = 0x8029905c;
yaw_getIdeal = 0x80299068;
func_8029957C = 0x802993bc;
basfx_80299D2C = 0x80299b6c;
basfx_debug = 0x80299cf4;
func_8029A47C = 0x8029a2bc;
bsList_getInterruptMethod = 0x8029a534;
bs_setState = 0x8029a56c;
bs_getState = 0x8029a608;
bs_checkInterrupt = 0x8029a65c;
bsStoredState_getTransformation = 0x8029a734;
bsStoredState_setTrot = 0x8029a7c0;
bastick_lockAtzero = 0x8029b158;
func_8029B41C = 0x8029b25c;
func_8029B73C = 0x8029b57c;
func_8029B890 = 0x8029b6d0;
func_8029B950 = 0x8029b790;
func_8029BD90 = 0x8029bbd0;
bs_getIdleState = 0x8029bdb8;
func_8029C0D0 = 0x8029bf10;
func_8029C834 = 0x8029c674;
func_8029C984 = 0x8029c7c4;
func_8029CDA0 = 0x8029cbe0;
func_8029CF20 = 0x8029cd60;
isPlayerInHazard = 0x8029d4ac;
func_8029DD6C = 0x8029dbac;
func_8029DFC8 = 0x8029de08;
func_8029DFD4 = 0x8029de14;

View File

@@ -3,6 +3,8 @@
#include "variables.h"
extern f32 func_80294404(void);
extern BKCollisionTri *func_8029463C(void);
extern BKModelBin *func_802946A8(void);
/* .data */
s16 D_80364580[] = {

View File

@@ -6,7 +6,8 @@
extern void func_802F494C(void *, f32);
extern void func_802F4884(void *, s32, f32);
extern f32 floor_getCurrentFloorYPosition(void);
extern Struct5Ds *func_802F47D0(void);
extern Struct5Ds *func_802F499C(Struct5Ds *);
void func_8029AE74(s32 arg0);
void func_8029AEE4(s32 arg0);

View File

@@ -261,9 +261,9 @@ f32 func_8029B56C(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
phi_f0 = arg2;
phi_f2 = 0.0f;
while ((phi_f0 > 0.0f) || (arg1 < arg0)) {
phi_f2 += 0.0166666675f;
arg0 += phi_f0 * 0.0166666675f;
phi_f0 += arg3 * 0.0166666675f;
phi_f2 += (1.0f/FRAMERATE);
arg0 += phi_f0 * (1.0f/FRAMERATE);
phi_f0 += arg3 * (1.0f/FRAMERATE);
}
return phi_f2;
}
@@ -341,7 +341,7 @@ void func_8029B890(void){
func_8029B62C();
return;
}
gcdialog_showDialog(0xf81, 7, NULL, NULL, func_8029B85C, NULL);
gcdialog_showDialog(VER_SELECT(0xf81, 0xae7, 0, 0), 7, NULL, NULL, func_8029B85C, NULL);
fileProgressFlag_set(FILEPROG_A8_HAS_DIED, TRUE);
}
else{

View File

@@ -4,7 +4,7 @@
#include "variables.h"
#include "core2/ba/physics.h"
extern BKModelBin *func_8031C5DC(struct0 *);
extern int func_80258424(f32 vec[3], f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY, f32 maxZ);
extern f32 floor_getXPosition(struct0*);
extern void func_8031C5AC(struct0 *, f32 *);
@@ -13,13 +13,14 @@ extern void func_8031C5FC(struct0 *, f32);
extern void func_80244FC0(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3, s32 arg4, u32 arg5);
extern s32 func_80244E54(f32[3], f32[3], f32 [3], u32, f32, f32);
extern BKCollisionTri *func_802457C4(f32[3], f32[3], f32, f32, f32[3], s32, u32);
extern s32 func_8029463C(void);
extern BKCollisionTri *func_80320C94(f32[3], f32[3], f32, f32[3], s32, u32);
extern BKCollisionTri *func_8031C5F4(struct0 *);
void func_80294378(s32 arg0);
void func_80294384(s32 arg0);
void func_80294390(void);
BKCollisionTri *func_8029463C(void);
typedef struct {
f32 unk0[3];
f32 unkC[3];
@@ -480,7 +481,7 @@ u32 func_80294610(u32 mask){
return func_8031C59C(D_8037C200) & mask;
}
s32 func_8029463C(void){
BKCollisionTri *func_8029463C(void){
return func_8031C5F4(D_8037C200);
}
@@ -492,8 +493,8 @@ void func_80294684(void){
func_8031C5A4(D_8037C200);
}
void func_802946A8(void){
func_8031C5DC(D_8037C200);
BKModelBin *func_802946A8(void){
return func_8031C5DC(D_8037C200);
}
void func_802946CC(void){

View File

@@ -6,6 +6,8 @@
#include "core2/statetimer.h"
#include "ba/iFrame.h"
extern BKCollisionTri *func_8029463C(void);
/* .bss */
u8 hazardSfxId;
u8 frozenEffectsState;