From 4f99cac9f1707d859fe115bf2ad0da68ec643d6c Mon Sep 17 00:00:00 2001 From: Banjo Kazooie Date: Fri, 13 Sep 2024 22:20:01 -0500 Subject: [PATCH] PAL: match core1/code_39D0.c --- decompressed.pal.yaml | 10 +++++----- manual_syms.pal.txt | 29 +++++++++++++++++++++++++++-- src/core2/code_39D0.c | 2 -- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index 46058eba..94d23624 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -511,8 +511,8 @@ segments: - [0xF7B410, c, code_2240] - [0xF7BA60, c, ba/anim] - [0xF7C650, c, snackerctl] - - [0xF7CBA0, bin, core2_untouched_text] - # - [0xF59330, c, code_39D0] #DONE + - [0xF7CBA0, c, code_39D0] + - [0xF7D990, bin, core2_untouched_text] # - [0xF5A120, c, ba/marker] #DONE # - [0xF5C490, c, code_6B30] #DONE # - [0xF5C9C0, c, code_7060] #DONE @@ -1125,8 +1125,8 @@ segments: - [0x10667D0, .rodata, code_1930] - [0x10667F0, .rodata, ba/anim] - [0x1066860, .rodata, snackerctl] - - [0x1066870, bin, core2_untouched_rodata] - # - [0x10428A0, .rodata, code_39D0] + - [0x1066870, .rodata, code_39D0] + - [0x1066910, bin, core2_untouched_rodata] # - [0x1042940, .rodata, ba/marker] # - [0x1042D70, .rodata, code_6B30] # - [0x1042E60, .rodata, code_7060] @@ -1378,7 +1378,7 @@ segments: - [0x0106C980, .bss, code_1930] - [0x0106C980, .bss, ba/anim] - [0x0106C980, .bss, snackerctl] - # - [0x0106C980, .bss, code_39D0] + - [0x0106C980, .bss, code_39D0] # - [0x0106C980, .bss, ba/marker] # - [0x0106C980, .bss, code_6B30] # - [0x0106C980, .bss, code_7060] diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index 441f82d4..46763f5f 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -33,13 +33,13 @@ boot_func_8023DA20 = func_8023DA20; /* Temporary*/ - /* Temporary Correct*/ -func_8028B470 = 0x8028b290; player_getTransformation = 0x8028e5ec; func_8028E964 = 0x8028e784; player_getPosition = 0x8028e7c4; player_getPosition_s32 = 0x8028e95c; +player_getYaw = 0x8028e9c4; +func_8028ECAC = 0x8028eacc; player_getWaterState = 0x8028eca4; player_is_present = 0x8028eff4; func_8028F22C = 0x8028f04c; @@ -48,18 +48,40 @@ func_8028F918 = 0x8028f738; func_8028F94C = 0x8028f76c; func_8028FB88 = 0x8028f9a8; +stateTimer_isActive = 0x802914b8; +bafalldamage_get_damage = 0x80292ffc; miscFlag_isTrue = 0x802931e0; +miscFlag_isFalse = 0x802931f0; + +func_80294438 = 0x80294258; +func_80294500 = 0x80294320; +func_80294548 = 0x80294368; +func_80294554 = 0x80294374; +func_80294610 = 0x80294430; +get_slope_timer = 0x802947f4; +ability_hasLearned = 0x80295618; baphysics_get_velocity = 0x802978c8; baphysics_get_vertical_velocity = 0x802978ec; _player_getPosition = 0x80298314; +player_getYPosition = 0x80298338; +yaw_get = 0x8029905c; +yaw_getIdeal = 0x80299068; +bs_getState = 0x8029a608; +func_8029C0D0 = 0x8029bf10; +func_8029CF20 = 0x8029cd60; +func_8029D66C = 0x8029d4ac; +bsant_inSet = 0x8029e3d8; + +bspumpkin_inSet = 0x802b2154; func_802BB360 = 0x802bb1d0; func_802BB378 = 0x802bb1e8; func_802BB3AC = 0x802bb21c; func_802BB3C4 = 0x802bb234; func_802BB3DC = 0x802bb24c; ncFirstPersonCamera_getZoomedInRotation = 0x802c295c; +ncFirstPersonCamera_getState = 0x802c2980; spawnQueue_func_802C3A18 = 0x802C3898; spawnQueue_flush = 0x802c38b8; func_802C5A30 = 0x802c5b20; @@ -122,6 +144,7 @@ sfxsource_setSfxId = 0x8030dc20; sfxsource_setSampleRate = 0x8030dc5c; func_8030DBB4 = 0x8030dd54; func_8030E2C4 = 0x8030e464; +func_8030E58C = 0x8030e72c; func_8030E6A4 = 0x8030e844; func_8030ED70 = 0x8030ef10; func_8030E394 = 0x8030e534; @@ -141,6 +164,8 @@ func_80320B98 = 0x80320f88; func_80320C94 = 0x80321084; func_80320DB0 = 0x803211a0; jiggyscore_isCollected = 0x803213d0; +level_get = 0x80321cf0; +func_8032190C = 0x80321cfc; func_80321960 = 0x80321d50; func_803219F4 = 0x80321de4; levelSpecificFlags_get = 0x803222d4; diff --git a/src/core2/code_39D0.c b/src/core2/code_39D0.c index e7a427ff..c69d34ca 100644 --- a/src/core2/code_39D0.c +++ b/src/core2/code_39D0.c @@ -316,5 +316,3 @@ void func_8028B71C(void){ D_8037BF60 = func_80294548(); func_8028B534(); } - -