From ba269b80963b509e36a4277e7beaee801571a9b3 Mon Sep 17 00:00:00 2001 From: cadmic Date: Fri, 26 Jan 2024 16:33:54 -0800 Subject: [PATCH] Sync z_collision_check functions.txt --- tools/disasm/gc-eu-mq/functions.txt | 62 ++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tools/disasm/gc-eu-mq/functions.txt b/tools/disasm/gc-eu-mq/functions.txt index 33d941920e..c6f4c0b2c5 100644 --- a/tools/disasm/gc-eu-mq/functions.txt +++ b/tools/disasm/gc-eu-mq/functions.txt @@ -900,19 +900,19 @@ Collider_SetBase = 0x80049B10; // type:func Collider_ResetATBase = 0x80049B54; // type:func Collider_ResetACBase = 0x80049B70; // type:func Collider_ResetOCBase = 0x80049B8C; // type:func -Collider_InitTouch = 0x80049BB4; // type:func -Collider_DestroyTouch = 0x80049BDC; // type:func -Collider_SetTouch = 0x80049BF0; // type:func -Collider_ResetATInfo_Unk = 0x80049C18; // type:func -Collider_InitBump = 0x80049C28; // type:func -Collider_DestroyBump = 0x80049C58; // type:func -Collider_SetBump = 0x80049C6C; // type:func -Collider_InitInfo = 0x80049C94; // type:func -Collider_DestroyInfo = 0x80049D14; // type:func -Collider_SetInfo = 0x80049D54; // type:func -Collider_ResetATInfo = 0x80049DCC; // type:func -Collider_ResetACInfo = 0x80049E04; // type:func -Collider_ResetOCInfo = 0x80049E3C; // type:func +Collider_InitElementTouch = 0x80049BB4; // type:func +Collider_DestroyElementTouch = 0x80049BDC; // type:func +Collider_SetElementTouch = 0x80049BF0; // type:func +Collider_ResetATElement_Unk = 0x80049C18; // type:func +Collider_InitElementBump = 0x80049C28; // type:func +Collider_DestroyElementBump = 0x80049C58; // type:func +Collider_SetElementBump = 0x80049C6C; // type:func +Collider_InitElement = 0x80049C94; // type:func +Collider_DestroyElement = 0x80049D14; // type:func +Collider_SetElement = 0x80049D54; // type:func +Collider_ResetATElement = 0x80049DCC; // type:func +Collider_ResetACElement = 0x80049E04; // type:func +Collider_ResetOCElement = 0x80049E3C; // type:func Collider_InitJntSphElementDim = 0x80049E54; // type:func Collider_DestroyJntSphElementDim = 0x80049E9C; // type:func Collider_SetJntSphElementDim = 0x80049EB0; // type:func @@ -991,8 +991,8 @@ CollisionCheck_SetAC_SAC = 0x8004BBE0; // type:func CollisionCheck_SetOC = 0x8004BCF0; // type:func CollisionCheck_SetOC_SAC = 0x8004BDD0; // type:func CollisionCheck_SetOCLine = 0x8004BEE0; // type:func -CollisionCheck_SkipTouch = 0x8004BF6C; // type:func -CollisionCheck_SkipBump = 0x8004BF90; // type:func +CollisionCheck_SkipElementTouch = 0x8004BF6C; // type:func +CollisionCheck_SkipElementBump = 0x8004BF90; // type:func CollisionCheck_NoSharedFlags = 0x8004BFB4; // type:func CollisionCheck_NoBlood = 0x8004BFDC; // type:func CollisionCheck_BlueBlood = 0x8004BFF0; // type:func @@ -1005,22 +1005,22 @@ CollisionCheck_SwordHitAudio = 0x8004C55C; // type:func CollisionCheck_HitEffects = 0x8004C668; // type:func CollisionCheck_SetBounce = 0x8004C868; // type:func CollisionCheck_SetATvsAC = 0x8004C888; // type:func -CollisionCheck_AC_JntSphVsJntSph = 0x8004CA30; // type:func -CollisionCheck_AC_JntSphVsCyl = 0x8004CCDC; // type:func -CollisionCheck_AC_CylVsJntSph = 0x8004CF50; // type:func -CollisionCheck_AC_JntSphVsTris = 0x8004D1F0; // type:func -CollisionCheck_AC_TrisVsJntSph = 0x8004D410; // type:func -CollisionCheck_AC_JntSphVsQuad = 0x8004D624; // type:func -CollisionCheck_AC_QuadVsJntSph = 0x8004D844; // type:func -CollisionCheck_AC_CylVsCyl = 0x8004DAA8; // type:func -CollisionCheck_AC_CylVsTris = 0x8004DC7C; // type:func -CollisionCheck_AC_TrisVsCyl = 0x8004DE40; // type:func -CollisionCheck_AC_CylVsQuad = 0x8004E000; // type:func -CollisionCheck_AC_QuadVsCyl = 0x8004E274; // type:func -CollisionCheck_AC_TrisVsTris = 0x8004E520; // type:func -CollisionCheck_AC_TrisVsQuad = 0x8004E774; // type:func -CollisionCheck_AC_QuadVsTris = 0x8004EA04; // type:func -CollisionCheck_AC_QuadVsQuad = 0x8004EC9C; // type:func +CollisionCheck_ATJntSphVsACJntSph = 0x8004CA30; // type:func +CollisionCheck_ATJntSphVsACCyl = 0x8004CCDC; // type:func +CollisionCheck_ATCylVsACJntSph = 0x8004CF50; // type:func +CollisionCheck_ATJntSphVsACTris = 0x8004D1F0; // type:func +CollisionCheck_ATTrisVsACJntSph = 0x8004D410; // type:func +CollisionCheck_ATJntSphVsACQuad = 0x8004D624; // type:func +CollisionCheck_ATQuadVsACJntSph = 0x8004D844; // type:func +CollisionCheck_ATCylVsACCyl = 0x8004DAA8; // type:func +CollisionCheck_ATCylVsACTris = 0x8004DC7C; // type:func +CollisionCheck_ATTrisVsACCyl = 0x8004DE40; // type:func +CollisionCheck_ATCylVsACQuad = 0x8004E000; // type:func +CollisionCheck_ATQuadVsACCyl = 0x8004E274; // type:func +CollisionCheck_ATTrisVsACTris = 0x8004E520; // type:func +CollisionCheck_ATTrisVsACQuad = 0x8004E774; // type:func +CollisionCheck_ATQuadVsACTris = 0x8004EA04; // type:func +CollisionCheck_ATQuadVsACQuad = 0x8004EC9C; // type:func CollisionCheck_SetJntSphHitFX = 0x8004EF2C; // type:func CollisionCheck_SetCylHitFX = 0x8004F00C; // type:func CollisionCheck_SetTrisHitFX = 0x8004F0A4; // type:func