From 9912785eeb1df8792de66796a965325e5ed76b34 Mon Sep 17 00:00:00 2001 From: Banjo Kazooie Date: Sun, 17 Aug 2025 00:04:11 -0500 Subject: [PATCH] update asm-differ, pal progress --- decompressed.pal.yaml | 118 ++++++++++++++-------------- include/enums.h | 11 ++- manual_syms.pal.txt | 174 ++++++++++++++++++++++++++---------------- src/core2/bakey.c | 8 +- src/core2/code_A960.c | 2 +- src/core2/code_C4B0.c | 4 +- tools/asm-differ | 2 +- 7 files changed, 185 insertions(+), 134 deletions(-) diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index 8a8fb49d..5106050b 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -517,28 +517,28 @@ segments: - [0xF7FFA0, c, ba/carriedobj] - [0xF80230, c, code_7060] - [0xF81F70, c, ba/flap] - - [0xF822B0, bin, core2_untouched_text] - # - [0xF5EA40, c, code_90E0] #DONE - # - [0xF5EBF0, c, code_9290] #DONE - # - [0xF5EDB0, c, code_9450] #DONE - # - [0xF5F260, c, babuzz] #DONE - # - [0xF5F530, c, code_9BD0] #DONE - # - [0xF5FF60, c, code_A600] #DONE - # - [0xF60040, c, statetimer] #DONE - # - [0xF602C0, c, code_A960] #DONE - # - [0xF603C0, c, ba/model] #DONE - # - [0xF60FB0, c, ba/drone] #DONE - # - [0xF611B0, c, code_B850] #DONE - # - [0xF614B0, c, eggshatter] #DONE - # - [0xF61680, c, baeyes] #DONE - # - [0xF61A40, c, ba/falldamage] #DONE - # - [0xF61D50, c, baflag] #DONE - # - [0xF61E10, c, code_C4B0] - # - [0xF63160, c, ba/carry] #DONE - # - [0xF63310, c, code_D9B0] #DONE - # - [0xF638D0, c, bainput] #DONE - # - [0xF63D70, c, bakey] #DONE - # - [0xF63FE0, c, abilityprogress] #DONE + - [0xF822B0, c, code_90E0] + - [0xF82460, c, code_9290] + - [0xF82620, c, code_9450] + - [0xF82AD0, c, babuzz] + - [0xF82DA0, c, code_9BD0] + - [0xF837D0, c, code_A600] + - [0xF838B0, c, statetimer] + - [0xF83B30, c, code_A960] + - [0xF83C30, c, ba/model] + - [0xF84820, c, ba/drone] + - [0xF84A20, c, code_B850] + - [0xF84D20, c, eggshatter] + - [0xF84EF0, c, baeyes] + - [0xF852B0, c, ba/falldamage] + - [0xF855C0, c, baflag] + - [0xF85680, c, code_C4B0] + - [0xF869D0, c, ba/carry] + - [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 @@ -905,12 +905,12 @@ segments: - [0x1055EA0, .data, snackerctl] - [0x1055EC0, .data, ba/marker] - [0x1055F20, .data, code_7060] - - [0x1055F60, bin, core2_untouched_data] - # - [0x10320A0, .data, code_90E0] - # - [0x1032150, .data, ba/model] - # - [0x1032150, .data, code_B850] - # - [0x1032170, .data, eggshatter] - # - [0x10321C0, .data, ba/falldamage] + - [0x1055F60, .data, code_90E0] + - [0x1056010, .data, ba/model] + - [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] @@ -1130,18 +1130,18 @@ segments: - [0x1066910, .rodata, ba/marker] - [0x1066D40, .rodata, code_6B30] - [0x1066E30, .rodata, code_7060] - - [0x1066F60, bin, core2_untouched_rodata] - # - [0x1042F90, .rodata, code_9450] - # - [0x1042FC0, .rodata, babuzz] - # - [0x1042FD0, .rodata, code_9BD0] - # - [0x1043010, .rodata, ba/model] - # - [0x10430C0, .rodata, ba/drone] - # - [0x10430D0, .rodata, code_B850] - # - [0x10430F0, .rodata, baeyes] - # - [0x1043110, .rodata, ba/falldamage] - # - [0x1043130, .rodata, code_C4B0] - # - [0x1043170, .rodata, code_D9B0] - # - [0x1043180, .rodata, abilityprogress] + - [0x1066F60, .rodata, code_9450] + - [0x1066F90, .rodata, babuzz] + - [0x1066FA0, .rodata, code_9BD0] + - [0x1066FE0, .rodata, ba/model] + - [0x1067090, .rodata, ba/drone] + - [0x10670A0, .rodata, code_B850] + - [0x10670C0, .rodata, baeyes] + - [0x10670E0, .rodata, ba/falldamage] + - [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] @@ -1384,25 +1384,25 @@ segments: - [0x0106C980, .bss, code_6B30] - [0x0106C980, .bss, code_7060] - [0x0106C980, .bss, ba/flap] - # - [0x0106C980, .bss, code_90E0] - # - [0x0106C980, .bss, code_9290] - # - [0x0106C980, .bss, code_9450] - # - [0x0106C980, .bss, babuzz] - # - [0x0106C980, .bss, code_9BD0] - # - [0x0106C980, .bss, code_A600] - # - [0x0106C980, .bss, statetimer] - # - [0x0106C980, .bss, ba/model] - # - [0x0106C980, .bss, ba/drone] - # - [0x0106C980, .bss, eggshatter] - # - [0x0106C980, .bss, baeyes] - # - [0x0106C980, .bss, ba/falldamage] - # - [0x0106C980, .bss, baflag] - # - [0x0106C980, .bss, code_C4B0] - # - [0x0106C980, .bss, ba/carry] - # - [0x0106C980, .bss, code_D9B0] - # - [0x0106C980, .bss, bainput] - # - [0x0106C980, .bss, bakey] - # - [0x0106C980, .bss, abilityprogress] + - [0x0106C980, .bss, code_90E0] + - [0x0106C980, .bss, code_9290] + - [0x0106C980, .bss, code_9450] + - [0x0106C980, .bss, babuzz] + - [0x0106C980, .bss, code_9BD0] + - [0x0106C980, .bss, code_A600] + - [0x0106C980, .bss, statetimer] + - [0x0106C980, .bss, ba/model] + - [0x0106C980, .bss, ba/drone] + - [0x0106C980, .bss, eggshatter] + - [0x0106C980, .bss, baeyes] + - [0x0106C980, .bss, ba/falldamage] + - [0x0106C980, .bss, baflag] + - [0x0106C980, .bss, code_C4B0] + - [0x0106C980, .bss, ba/carry] + - [0x0106C980, .bss, code_D9B0] + - [0x0106C980, .bss, bainput] + - [0x0106C980, .bss, bakey] + - [0x0106C980, .bss, abilityprogress] # - [0x0106C980, .bss, code_E910] # - [0x0106C980, .bss, code_EE40] # - [0x0106C980, .bss, code_EF50] diff --git a/include/enums.h b/include/enums.h index d3caed64..a95d7fb7 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4310,18 +4310,17 @@ enum asset_e ASSET_B44_DIALOG_JUJU_MEET, ASSET_B45_DIALOG_JIGGY_COLLECT_10, ASSET_B46_DIALOG_COLLECT_ORANGE, - ASSET_B47_DIALOG_EGGS_LEARN = 0xB47, + ASSET_B47_DIALOG_EGGS_LEARN, ASSET_B48_DIALOG_BEAKBUSTER_LEARN, ASSET_B49_DIALOG_TALON_TROT_LEARN, ASSET_B4A_DIALOG_TALON_TROT_REFRESHER, ASSET_B4B_DIALOG_EGGS_REFRESHER, ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER, ASSET_B4D_DIALOG_BOTTLES_SLIPPERY, - - ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E, + ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED, ASSET_B50_DIALOG_BOTTLES_UNUSED_UNKNOWN_ITEM_COLLECT = 0xB50, - ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL = 0xB51, + ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL, ASSET_B9F_DIALOG_UNKNOWN = 0xb9f, ASSET_BA0_DIALOG_GRUNTY_RBB_RED_HOT_OVENS = 0xBA0, @@ -4469,7 +4468,7 @@ enum asset_e ASSET_DB5_DIALOG_ICE_KEY_TEXT, ASSET_DB6_DIALOG_MUMBO_WISHYWASHY, - ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION = 0xDF3, + ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION = VER_SELECT(0xdf3, 0xa35, 0, 0), ASSET_DF4_DIALOG_BOTTLES_CAMERA_CONTROL_LEARN, ASSET_DF5_DIALOG_BOTTLES_CAMERA_CONTROL_REFRESHER, ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN, @@ -4482,7 +4481,7 @@ enum asset_e ASSET_DFD_DIALOG_BOTTLES_SWIM_LEARN, ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER, ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN, - ASSET_E00_DIALOG_BOTTLES_ATTACK_REFRESHER = 0xE00, + ASSET_E00_DIALOG_BOTTLES_ATTACK_REFRESHER, ASSET_E01_DIALOG_BOTTLES_CLIMB_LEARN, ASSET_E02_DIALOG_BOTTLES_CLIMB_OTHER, ASSET_E03_DIALOG_BOTTLES_CLIMB_REFRESHER, diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index 35e37c82..75228eee 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -32,60 +32,8 @@ boot_gOverlayTable = gOverlayTable; boot_func_8023DA20 = func_8023DA20; /* Temporary*/ -/* Temporary Correct*/ -func_8029026C = 0x8029008c; -func_80290B6C = 0x8029098c; -cameraMode_update = 0x80291178; -func_8029151C = 0x8029133c; -func_802915D8 = 0x802913f8; -func_80291604 = 0x80291424; -func_80291610 = 0x80291430; -func_80291634 = 0x80291454; -stateTimer_get = 0x80291490; -stateTimer_isActive = 0x802914b8; -stateTimer_set = 0x80291604; -baModel_80291AAC = 0x802918cc; -baModel_draw = 0x80291910; -baModel_setVisible = 0x80291fe8; -baModel_8029223C = 0x8029205c; -baModel_80292260 = 0x80292080; -baModel_80292284 = 0x802920a4; -baModel_getPosition = 0x80292288; -baModel_802924E8 = 0x80292308; -baModel_isVisible = 0x80292368; -badrone_goto = 0x80292478; -eggShatter_draw = 0x80292900; -bafalldamage_get_damage = 0x80292ffc; -baflag_isTrue = 0x802931e0; -baflag_isFalse = 0x802931f0; -baflag_set = 0x80293208; -baflag_clear = 0x8029321c; -func_80293D2C = 0x80293b4c; -func_80293F0C = 0x80293d2c; -func_80294438 = 0x80294258; -func_80294480 = 0x802942a0; -floor_getCurrentFloorYPosition = 0x80294320; -func_8029453C = 0x8029435c; -func_80294548 = 0x80294368; -func_80294554 = 0x80294374; -floor_isCurrentFloorunk59 = 0x80294394; -func_80294610 = 0x80294430; -func_802946F0 = 0x80294510; -bacarry_reset_marker = 0x80294700; -bacarry_get_marker = 0x8029470c; -bacarry_set_marker = 0x80294718; -bacarry_set_offsets = 0x80294744; -func_802949C8 = 0x802947e8; -get_slope_timer = 0x802947f4; -get_throw_target_position = 0x8029483c; -set_talk_target_position = 0x802948b8; -set_throw_target_position = 0x802948e0; -set_turbo_duration = 0x80294908; -func_80294AF4 = 0x80294914; -func_80294E54 = 0x80294c74; -bakey_getAndSetState = 0x802953c4; -bakey_disableAll = 0x802953dc; +/* Temporary Correct*/ ability_hasLearned = 0x80295618; ability_setLearned = 0x80295658; func_80295914 = 0x80295754; @@ -98,9 +46,11 @@ 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; @@ -109,13 +59,17 @@ 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; @@ -130,27 +84,43 @@ 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; +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; +isPlayerInHazard = 0x8029d4ac; +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; @@ -168,12 +138,34 @@ bsswim_inset = 0x802b5594; bstwirl_hitboxActive = 0x802b68b0; func_802B6F9C = 0x802b6e0c; bswalrus_inSledSet = 0x802b8000; -gcStaticCamera_activate = 0x802bae54; +ncCameraNodeList_getCameraNodeType4 = 0x802b9ca4; +ncCameraNodeList_getCameraNodeType3 = 0x802b9cb8; +ncCameraNodeList_getCameraNodeType1 = 0x802b9ccc; +ncCameraNodeList_getNodeType = 0x802b9cfc; +ncCameraNodeList_nodeIsValid = 0x802b9d18; +code33250_func_802BA234 = 0x802ba0a4; +code33310_func_802BA4D0 = 0x802ba340; +code336F0_func_802BA89C = 0x802ba70c; +gcStaticCamera_activate = 0x802bae54; func_802BB360 = 0x802bb1d0; func_802BB378 = 0x802bb1e8; func_802BB3AC = 0x802bb21c; func_802BB3C4 = 0x802bb234; func_802BB3DC = 0x802bb24c; +func_802BC538 = 0x802bc3a8; +func_802BC5CC = 0x802bc43c; +ncDynamicCamera_getState = 0x802bcf3c; +ncDynamicCamera_setState = 0x802bcf48; +func_802BD8A4 = 0x802bd718; +func_802BF798 = 0x802bf618; +ncDynamicCam8_func_802BF9B8 = 0x802bf838; + +func_802C0640 = 0x802c04c0; +func_802C095C = 0x802c07dc; +func_802C189C = 0x802c171c; +func_802C1B20 = 0x802c19a0; +ncDynamicCamA_func_802C1DB0 = 0x802c1c30; +ncDynamicCamA_func_802C1EE0 = 0x802c1d60; ncFirstPersonCamera_getZoomedInRotation = 0x802c295c; ncFirstPersonCamera_getState = 0x802c2980; @@ -181,6 +173,7 @@ ncFirstPersonCamera_getState = 0x802c2980; spawnQueue_func_802C3A18 = 0x802C3898; spawnQueue_flush = 0x802c38b8; __spawnQueue_add_4 = 0x802c3d84; +spawnQueue_actor_f32 = 0x802c3fc0; spawnQueue_actor_s16 = 0x802c400c; gameSelect_getGameNumber = 0x802c5b20; chjiggy_getJiggyId = 0x802c8248; @@ -229,6 +222,7 @@ func_802E4AC0 = 0x802e4cb0; func_802E4AD4 = 0x802e4cc4; func_802E4B38 = 0x802e4d28; func_802E6820 = 0x802e6a04; +func_802E73C8 = 0x802e75a8; animMtxList_setBoned = 0x802ea388; vector_clear = 0x802ed800; vector_getBegin = 0x802ed80c; @@ -246,7 +240,25 @@ freelist_new = 0x802ede64; freelist_freeElement = 0x802edebc; freelist_defrag = 0x802edee0; func_802EE354 = 0x802ee534; -dustEmitter_emit = 0x802ee8ac; +dustEmitter_emit = 0x802ee8ac; + +particleEmitter_draw = 0x802ef588; +particleEmitter_emitN = 0x802ef7a8; +particleEmitter_free = 0x802ef864; +particleEmitter_new = 0x802ef88c; +particleEmitter_setModel = 0x802efca8; +particleEmitter_func_802EF9F8 = 0x802efbd8; +particleEmitter_func_802EFA18 = 0x802efbf8; +particleEmitter_setPosition = 0x802efd34; +particleEmitter_setStartingScaleRange = 0x802efd50; +particleEmitter_setVelocityAccelerationAndPositionRanges = 0x802eff5c; +particleEmitter_setAngularVelocityRange = 0x802f0004; +particleEmitter_setSpawnIntervalRange = 0x802f003c; +particleEmitter_setParticleLifeTimeRange = 0x802f00a0; +particleEmitter_setParticleVelocityRange = 0x802f00b4; +particleEmitter_update = 0x802f01c4; +partEmitMgr_defragEmitter = 0x802f0f54; + pem_freeEmitters = 0x802f1474; fxSparkle_emptyHoneycomb = 0x802f38bc; fxSparkle_honeycomb = 0x802f391c; @@ -259,6 +271,8 @@ func_802F9F80 = 0x802fa160; func_802F9FD0 = 0x802fa1b0; func_802FA060 = 0x802fa240; func_802FADD4 = 0x802fafb4; + +func_80303F6C = 0x8030410C; cubeList_findNodePropByActorIdAndPosition_s32 = 0x80304b6c; nodeprop_findByActorIdAndActorPosition = 0x80304dd8; nodeprop_findByActorIdAndPosition_f32 = 0x80304e4c; @@ -267,6 +281,8 @@ nodeprop_getPosition = 0x80304f08; nodeprop_findPositionFromActorId = 0x80304f70; func_80305248 = 0x803053e8; func_80305344 = 0x803054e4; +func_80306D40 = 0x80306EE0; +func_803077FC = 0x8030799C; func_803084F0 = 0x80308690; func_80309B48 = 0x80309ce8; func_80309D58 = 0x80309ef8; @@ -281,9 +297,10 @@ sfxsource_createSfxsourceAndReturnIndex = 0x8030daac; sfxsource_freeSfxsourceByIndex = 0x8030dbe4; sfxsource_setSfxId = 0x8030dc20; sfxsource_setSampleRate = 0x8030dc5c; -sfxsource_playSfxAtVolume = 0x8030dd54; -sfxSource_func_8030E2C4 = 0x8030e464; -sfxsource_playHighPriority = 0x8030e624; +sfxsource_playSfxAtVolume = 0x8030dd54; +sfxSource_setunk43_7ByIndex = 0x8030DEB4; +sfxSource_func_8030E2C4 = 0x8030e464; +sfxsource_playHighPriority = 0x8030e624; func_8030E58C = 0x8030e72c; func_8030E624 = 0x8030e7c4; gcsfx_playWithPitch = 0x8030e844; @@ -297,9 +314,21 @@ gcdialog_hasCurrentTextId = 0x803116fc; gcpausemenu_80314AC8 = 0x80314e1c; func_8031B908 = 0x8031bce8; +func_8031B9D8 = 0x8031bdb8; +func_8031BA7C = 0x8031be5c; +func_8031BA9C = 0x8031be7c; func_8031C44C = 0x8031c82c; +func_8031C594 = 0x8031c974; +func_8031C59C = 0x8031c97c; +func_8031C5A4 = 0x8031c984; func_8031C5AC = 0x8031c98c; -floor_getXPosition = 0x8031c9b4; +floor_getXPosition = 0x8031c9b4; +func_8031C5DC = 0x8031c9bc; +floor_getYPosition = 0x8031c9c4; +func_8031C5EC = 0x8031c9cc; +func_8031C5F4 = 0x8031c9d4; +func_8031C5FC = 0x8031c9dc; +func_8031C608 = 0x8031c9e8; func_8031C618 = 0x8031c9f8; func_8031C638 = 0x8031ca18; fileProgressFlag_get = 0x8032030c; @@ -326,6 +355,7 @@ levelSpecificFlags_validateCRC1 = 0x8032243c; func_8032274C = 0x80322b4c; func_80322758 = 0x80322b58; func_80323240 = 0x80323690; +func_803246B4 = 0x80324b04; func_80324DBC = 0x8032520c; timedFunc_set_1 = 0x80325334; timedFunc_set_2 = 0x80325370; @@ -351,10 +381,16 @@ exit_get = 0x80334d1c; func_80334904 = 0x80334d54; func_80335134 = 0x80335584; sfxInstruments_init = 0x80335670; -modelRender_setBoneTransformList = 0x8033A688; +modelRender_draw = 0x803395f4; +modelRender_setBoneTransformList = 0x8033a688; +func_8033A280 = 0x8033a6d0; +modelRender_preDraw = 0x8033a724; +modelRender_setEnvColor = 0x8033a7d8; +func_8033A450 = 0x8033a8a0; +modelRender_setDepthMode = 0x8033a91c; boneTransformList_free = 0x8033ab40; boneTransformList_new = 0x8033ab60; -boneTransformList_interpolate = 0x8033ABA0; +boneTransformList_interpolate = 0x8033aba0; boneTransformList_defrag = 0x8033ae34; animationFile_getBoneTransformList = 0x8033AEA0; boneTransformList_reset = 0X8033A960; @@ -390,15 +426,25 @@ item_adjustByDiffWithHud = 0x80346824; item_adjustByDiffWithoutHud = 0x80346844; carriedobj_actorId2ItemId = 0x80347144; demo_readInput = 0x8034a334; +func_8034A130 = 0x8034a580; +func_8034A174 = 0x8034a5c4; +func_8034A2A8 = 0x8034a6f8; +func_8034A2C8 = 0x8034a718; +func_8034A348 = 0x8034a798; randf = 0x8034a7e0; +randf2 = 0x8034ABA4; +randi2 = 0x8034AC0C; func_8034B9BC = 0x8034be20; func_8034BB48 = 0x8034bfac; func_8034C630 = 0x8034ca90; func_8034E698 = 0x8034eaf8; +func_80352CF4 = 0x80353154; + progressDialog_showDialogMaskZero = 0x803568ac; progressDialog_showDialogMaskFour = 0x803568cc; progressDialog_setAndTriggerDialog_4 = 0x803569a0; + core2_TEXT_END = 0x80363a00; core2_DATA_START = 0x80363a00; diff --git a/src/core2/bakey.c b/src/core2/bakey.c index 2100bb0e..990f79b9 100644 --- a/src/core2/bakey.c +++ b/src/core2/bakey.c @@ -44,7 +44,6 @@ void bakey_update(void){ } } - int bakey_heldCount(s32 button_indx){ return bakey.pressed_count[button_indx]; } @@ -80,3 +79,10 @@ void bakey_disableAll(s32 arg0){ bakey_getAndSetState(i, arg0); } } + + +#if VERSION != VERSION_USA_1_0 +void func_8029542C(s32 arg0) { + bakey.pressed_count[arg0] = 1; +} +#endif diff --git a/src/core2/code_A960.c b/src/core2/code_A960.c index 99b359d1..20de373b 100644 --- a/src/core2/code_A960.c +++ b/src/core2/code_A960.c @@ -27,7 +27,7 @@ void codeA960_forceLoadzone(s32 arg0){ } } } - + void func_802919A0(void){ if(isLoadzoneFlagSet() && batimer_decrement(5)){ func_8029B890(); diff --git a/src/core2/code_C4B0.c b/src/core2/code_C4B0.c index dac61324..8ac319e7 100644 --- a/src/core2/code_C4B0.c +++ b/src/core2/code_C4B0.c @@ -145,7 +145,7 @@ void func_80293668(void) { temp_f0 = ((D_8037C1F8[1] * 2) - 4.0f); if ((sp380[0]*sp380[0] + sp380[1]*sp380[1] + sp380[2]*sp380[2]) > (temp_f0 * temp_f0)) { sp38C = sp88->unk0[1]; - sp88->unk40 = func_80244E54(sp88->unkC, sp88->unk0, sp88->unk44, temp_v0 | 0x1E0000, D_8037C1F8[1] - 1.0f, D_8037C1F8[0]); + sp88->unk40 = func_80244E54(sp88->unkC, sp88->unk0, (f32*)sp88->unk44, temp_v0 | 0x1E0000, D_8037C1F8[1] - 1.0f, D_8037C1F8[0]); if (sp88->unk40 != 0) { ml_vec3f_normalize(sp380); temp_f0 = sp380[0]*sp88->unk44[0][0] + sp380[1]*sp88->unk44[0][1] + sp380[2]*sp88->unk44[0][2]; @@ -397,7 +397,7 @@ void func_80294384(s32 arg0){ void func_80294390(void) { void *sp1C; - sp1C = func_8029463C(); + sp1C = (void *)func_8029463C(); if (sp1C != 0) { if (func_803246B4(map_get(), ((s32*)sp1C)[2]) == 3) { func_80294384(4); diff --git a/tools/asm-differ b/tools/asm-differ index eaf72269..ddb2fad1 160000 --- a/tools/asm-differ +++ b/tools/asm-differ @@ -1 +1 @@ -Subproject commit eaf72269cf7329bc061e50d8788229575f656f06 +Subproject commit ddb2fad1b73d4d7483d483fb833cad4564a5fc01