mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-07 13:03:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sync Colliders Final (#1718)

Browse Source 
* ElementDamageInfoAT

* ElementDamageInfoAC

* colMaterial

* elemMaterial
This commit is contained in:
Derek Hensley
2024-10-18 05:54:54 -07:00
committed by GitHub
parent 001c6f0bff
commit 784c1724ff
329 changed files with 3222 additions and 3205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/sizes/code_functions.csv
+11 -11
View File
@@ -814,9 +814,9 @@ asm/non_matchings/code/z_camera/Camera_GetWaterYPos.s,Camera_GetWaterYPos,0x800E
asm/non_matchings/code/z_camera/func_800E0348.s,func_800E0348,0x800E0348,0x16
asm/non_matchings/code/z_collision_btltbls/DamageTable_Get.s,DamageTable_Get,0x800E03A0,0xB
asm/non_matchings/code/z_collision_btltbls/DamageTable_Clear.s,DamageTable_Clear,0x800E03CC,0xD
asm/non_matchings/code/z_collision_check/CollisionCheck_GetDamageAndEffectOnBumper.s,CollisionCheck_GetDamageAndEffectOnBumper,0x800E0410,0x2B
asm/non_matchings/code/z_collision_check/CollisionCheck_ApplyBumperDefense.s,CollisionCheck_ApplyBumperDefense,0x800E04BC,0xC
asm/non_matchings/code/z_collision_check/CollisionCheck_GetToucherDamage.s,CollisionCheck_GetToucherDamage,0x800E04EC,0x13
asm/non_matchings/code/z_collision_check/CollisionCheck_GetDamageAndEffectOnElementAC.s,CollisionCheck_GetDamageAndEffectOnElementAC,0x800E0410,0x2B
asm/non_matchings/code/z_collision_check/CollisionCheck_ApplyElementATDefense.s,CollisionCheck_ApplyElementATDefense,0x800E04BC,0xC
asm/non_matchings/code/z_collision_check/CollisionCheck_GetElementATDamage.s,CollisionCheck_GetElementATDamage,0x800E04EC,0x13
asm/non_matchings/code/z_collision_check/Collider_InitBase.s,Collider_InitBase,0x800E0538,0x12
asm/non_matchings/code/z_collision_check/Collider_DestroyBase.s,Collider_DestroyBase,0x800E0580,0x5
asm/non_matchings/code/z_collision_check/Collider_SetBaseToActor.s,Collider_SetBaseToActor,0x800E0594,0x10
@@ -825,13 +825,13 @@ asm/non_matchings/code/z_collision_check/Collider_SetBase.s,Collider_SetBase,0x8
asm/non_matchings/code/z_collision_check/Collider_ResetATBase.s,Collider_ResetATBase,0x800E065C,0x7
asm/non_matchings/code/z_collision_check/Collider_ResetACBase.s,Collider_ResetACBase,0x800E0678,0x7
asm/non_matchings/code/z_collision_check/Collider_ResetOCBase.s,Collider_ResetOCBase,0x800E0694,0xA
asm/non_matchings/code/z_collision_check/Collider_InitTouch.s,Collider_InitTouch,0x800E06BC,0xA
asm/non_matchings/code/z_collision_check/Collider_DestroyTouch.s,Collider_DestroyTouch,0x800E06E4,0x5
asm/non_matchings/code/z_collision_check/Collider_SetTouch.s,Collider_SetTouch,0x800E06F8,0xA
asm/non_matchings/code/z_collision_check/Collider_InitElementDamageInfoAT.s,Collider_InitElementDamageInfoAT,0x800E06BC,0xA
asm/non_matchings/code/z_collision_check/Collider_DestroyElementDamageInfoAT.s,Collider_DestroyElementDamageInfoAT,0x800E06E4,0x5
asm/non_matchings/code/z_collision_check/Collider_SetElementDamageInfoAT.s,Collider_SetElementDamageInfoAT,0x800E06F8,0xA
asm/non_matchings/code/z_collision_check/Collider_ResetATElementUnk.s,Collider_ResetATElementUnk,0x800E0720,0x4
asm/non_matchings/code/z_collision_check/Collider_InitBump.s,Collider_InitBump,0x800E0730,0xC
asm/non_matchings/code/z_collision_check/Collider_DestroyBump.s,Collider_DestroyBump,0x800E0760,0x5
asm/non_matchings/code/z_collision_check/Collider_SetBump.s,Collider_SetBump,0x800E0774,0xA
asm/non_matchings/code/z_collision_check/Collider_InitElementDamageInfoAC.s,Collider_InitElementDamageInfoAC,0x800E0730,0xC
asm/non_matchings/code/z_collision_check/Collider_DestroyElementDamageInfoAC.s,Collider_DestroyElementDamageInfoAC,0x800E0760,0x5
asm/non_matchings/code/z_collision_check/Collider_SetElementDamageInfoAC.s,Collider_SetElementDamageInfoAC,0x800E0774,0xA
asm/non_matchings/code/z_collision_check/Collider_InitElement.s,Collider_InitElement,0x800E079C,0x20
asm/non_matchings/code/z_collision_check/Collider_DestroyElement.s,Collider_DestroyElement,0x800E081C,0x10
asm/non_matchings/code/z_collision_check/Collider_SetElement.s,Collider_SetElement,0x800E085C,0x1E
@@ -925,8 +925,8 @@ asm/non_matchings/code/z_collision_check/CollisionCheck_SetAC_SAC.s,CollisionChe
asm/non_matchings/code/z_collision_check/CollisionCheck_SetOC.s,CollisionCheck_SetOC,0x800E2928,0x37
asm/non_matchings/code/z_collision_check/CollisionCheck_SetOC_SAC.s,CollisionCheck_SetOC_SAC,0x800E2A04,0x43
asm/non_matchings/code/z_collision_check/CollisionCheck_SetOCLine.s,CollisionCheck_SetOCLine,0x800E2B10,0x22
asm/non_matchings/code/z_collision_check/CollisionCheck_SkipTouch.s,CollisionCheck_SkipTouch,0x800E2B98,0x9
asm/non_matchings/code/z_collision_check/CollisionCheck_SkipBump.s,CollisionCheck_SkipBump,0x800E2BBC,0x9
asm/non_matchings/code/z_collision_check/CollisionCheck_IsElementNotAT.s,CollisionCheck_IsElementNotAT,0x800E2B98,0x9
asm/non_matchings/code/z_collision_check/CollisionCheck_IsElementNotAC.s,CollisionCheck_IsElementNotAC,0x800E2BBC,0x9
asm/non_matchings/code/z_collision_check/CollisionCheck_NoSharedFlags.s,CollisionCheck_NoSharedFlags,0x800E2BE0,0xA
asm/non_matchings/code/z_collision_check/CollisionCheck_NoBlood.s,CollisionCheck_NoBlood,0x800E2C08,0x5
asm/non_matchings/code/z_collision_check/CollisionCheck_BlueBlood.s,CollisionCheck_BlueBlood,0x800E2C1C,0x5B
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
814 asm/non_matchings/code/z_camera/func_800E0348.s func_800E0348 0x800E0348 0x16
815 asm/non_matchings/code/z_collision_btltbls/DamageTable_Get.s DamageTable_Get 0x800E03A0 0xB
816 asm/non_matchings/code/z_collision_btltbls/DamageTable_Clear.s DamageTable_Clear 0x800E03CC 0xD
817 asm/non_matchings/code/z_collision_check/CollisionCheck_GetDamageAndEffectOnBumper.s asm/non_matchings/code/z_collision_check/CollisionCheck_GetDamageAndEffectOnElementAC.s CollisionCheck_GetDamageAndEffectOnBumper CollisionCheck_GetDamageAndEffectOnElementAC 0x800E0410 0x2B
818 asm/non_matchings/code/z_collision_check/CollisionCheck_ApplyBumperDefense.s asm/non_matchings/code/z_collision_check/CollisionCheck_ApplyElementATDefense.s CollisionCheck_ApplyBumperDefense CollisionCheck_ApplyElementATDefense 0x800E04BC 0xC
819 asm/non_matchings/code/z_collision_check/CollisionCheck_GetToucherDamage.s asm/non_matchings/code/z_collision_check/CollisionCheck_GetElementATDamage.s CollisionCheck_GetToucherDamage CollisionCheck_GetElementATDamage 0x800E04EC 0x13
820 asm/non_matchings/code/z_collision_check/Collider_InitBase.s Collider_InitBase 0x800E0538 0x12
821 asm/non_matchings/code/z_collision_check/Collider_DestroyBase.s Collider_DestroyBase 0x800E0580 0x5
822 asm/non_matchings/code/z_collision_check/Collider_SetBaseToActor.s Collider_SetBaseToActor 0x800E0594 0x10
825 asm/non_matchings/code/z_collision_check/Collider_ResetATBase.s Collider_ResetATBase 0x800E065C 0x7
826 asm/non_matchings/code/z_collision_check/Collider_ResetACBase.s Collider_ResetACBase 0x800E0678 0x7
827 asm/non_matchings/code/z_collision_check/Collider_ResetOCBase.s Collider_ResetOCBase 0x800E0694 0xA
828 asm/non_matchings/code/z_collision_check/Collider_InitTouch.s asm/non_matchings/code/z_collision_check/Collider_InitElementDamageInfoAT.s Collider_InitTouch Collider_InitElementDamageInfoAT 0x800E06BC 0xA
829 asm/non_matchings/code/z_collision_check/Collider_DestroyTouch.s asm/non_matchings/code/z_collision_check/Collider_DestroyElementDamageInfoAT.s Collider_DestroyTouch Collider_DestroyElementDamageInfoAT 0x800E06E4 0x5
830 asm/non_matchings/code/z_collision_check/Collider_SetTouch.s asm/non_matchings/code/z_collision_check/Collider_SetElementDamageInfoAT.s Collider_SetTouch Collider_SetElementDamageInfoAT 0x800E06F8 0xA
831 asm/non_matchings/code/z_collision_check/Collider_ResetATElementUnk.s Collider_ResetATElementUnk 0x800E0720 0x4
832 asm/non_matchings/code/z_collision_check/Collider_InitBump.s asm/non_matchings/code/z_collision_check/Collider_InitElementDamageInfoAC.s Collider_InitBump Collider_InitElementDamageInfoAC 0x800E0730 0xC
833 asm/non_matchings/code/z_collision_check/Collider_DestroyBump.s asm/non_matchings/code/z_collision_check/Collider_DestroyElementDamageInfoAC.s Collider_DestroyBump Collider_DestroyElementDamageInfoAC 0x800E0760 0x5
834 asm/non_matchings/code/z_collision_check/Collider_SetBump.s asm/non_matchings/code/z_collision_check/Collider_SetElementDamageInfoAC.s Collider_SetBump Collider_SetElementDamageInfoAC 0x800E0774 0xA
835 asm/non_matchings/code/z_collision_check/Collider_InitElement.s Collider_InitElement 0x800E079C 0x20
836 asm/non_matchings/code/z_collision_check/Collider_DestroyElement.s Collider_DestroyElement 0x800E081C 0x10
837 asm/non_matchings/code/z_collision_check/Collider_SetElement.s Collider_SetElement 0x800E085C 0x1E
925 asm/non_matchings/code/z_collision_check/CollisionCheck_SetOC.s CollisionCheck_SetOC 0x800E2928 0x37
926 asm/non_matchings/code/z_collision_check/CollisionCheck_SetOC_SAC.s CollisionCheck_SetOC_SAC 0x800E2A04 0x43
927 asm/non_matchings/code/z_collision_check/CollisionCheck_SetOCLine.s CollisionCheck_SetOCLine 0x800E2B10 0x22
928 asm/non_matchings/code/z_collision_check/CollisionCheck_SkipTouch.s asm/non_matchings/code/z_collision_check/CollisionCheck_IsElementNotAT.s CollisionCheck_SkipTouch CollisionCheck_IsElementNotAT 0x800E2B98 0x9
929 asm/non_matchings/code/z_collision_check/CollisionCheck_SkipBump.s asm/non_matchings/code/z_collision_check/CollisionCheck_IsElementNotAC.s CollisionCheck_SkipBump CollisionCheck_IsElementNotAC 0x800E2BBC 0x9
930 asm/non_matchings/code/z_collision_check/CollisionCheck_NoSharedFlags.s CollisionCheck_NoSharedFlags 0x800E2BE0 0xA
931 asm/non_matchings/code/z_collision_check/CollisionCheck_NoBlood.s CollisionCheck_NoBlood 0x800E2C08 0x5
932 asm/non_matchings/code/z_collision_check/CollisionCheck_BlueBlood.s CollisionCheck_BlueBlood 0x800E2C1C 0x5B