mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-09 22:51:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use DMG_ defines in code (#1245)

Browse Source 
* Use `DMG_` defines for `dmgFlags` when single bits are used

* Pass on several (in code, no colliders)

* Conditional cleanup

* Remove wip comment, just use the flags 4head
This commit is contained in:
Dragorn421
2022-06-03 11:36:04 -07:00
committed by GitHub
parent b2752a6a2e
commit b3b913d33d
53 changed files with 201 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64collision_check.h
+32 -33
View File
@@ -346,39 +346,38 @@ typedef enum {
#define DMG_ENTRY(damage, effect) ((damage) | ((effect) << 4))
// These flags are not to be used in code until we figure out how we want to format them. They are only here for reference
#define DMG_DEKU_NUT (1 << 0x00)
#define DMG_DEKU_STICK (1 << 0x01)
#define DMG_SLINGSHOT (1 << 0x02)
#define DMG_EXPLOSIVE (1 << 0x03)
#define DMG_BOOMERANG (1 << 0x04)
#define DMG_ARROW_NORMAL (1 << 0x05)
#define DMG_HAMMER_SWING (1 << 0x06)
#define DMG_HOOKSHOT (1 << 0x07)
#define DMG_SLASH_KOKIRI (1 << 0x08)
#define DMG_SLASH_MASTER (1 << 0x09)
#define DMG_SLASH_GIANT (1 << 0x0A)
#define DMG_ARROW_FIRE (1 << 0x0B)
#define DMG_ARROW_ICE (1 << 0x0C)
#define DMG_ARROW_LIGHT (1 << 0x0D)
#define DMG_ARROW_UNK1 (1 << 0x0E)
#define DMG_ARROW_UNK2 (1 << 0x0F)
#define DMG_ARROW_UNK3 (1 << 0x10)
#define DMG_MAGIC_FIRE (1 << 0x11)
#define DMG_MAGIC_ICE (1 << 0x12)
#define DMG_MAGIC_LIGHT (1 << 0x13)
#define DMG_SHIELD (1 << 0x14)
#define DMG_MIR_RAY (1 << 0x15)
#define DMG_SPIN_KOKIRI (1 << 0x16)
#define DMG_SPIN_GIANT (1 << 0x17)
#define DMG_SPIN_MASTER (1 << 0x18)
#define DMG_JUMP_KOKIRI (1 << 0x19)
#define DMG_JUMP_GIANT (1 << 0x1A)
#define DMG_JUMP_MASTER (1 << 0x1B)
#define DMG_UNKNOWN_1 (1 << 0x1C)
#define DMG_UNBLOCKABLE (1 << 0x1D)
#define DMG_HAMMER_JUMP (1 << 0x1E)
#define DMG_UNKNOWN_2 (1 << 0x1F)
#define DMG_DEKU_NUT (1 << 0)
#define DMG_DEKU_STICK (1 << 1)
#define DMG_SLINGSHOT (1 << 2)
#define DMG_EXPLOSIVE (1 << 3)
#define DMG_BOOMERANG (1 << 4)
#define DMG_ARROW_NORMAL (1 << 5)
#define DMG_HAMMER_SWING (1 << 6)
#define DMG_HOOKSHOT (1 << 7)
#define DMG_SLASH_KOKIRI (1 << 8)
#define DMG_SLASH_MASTER (1 << 9)
#define DMG_SLASH_GIANT (1 << 10)
#define DMG_ARROW_FIRE (1 << 11)
#define DMG_ARROW_ICE (1 << 12)
#define DMG_ARROW_LIGHT (1 << 13)
#define DMG_ARROW_UNK1 (1 << 14)
#define DMG_ARROW_UNK2 (1 << 15)
#define DMG_ARROW_UNK3 (1 << 16)
#define DMG_MAGIC_FIRE (1 << 17)
#define DMG_MAGIC_ICE (1 << 18)
#define DMG_MAGIC_LIGHT (1 << 19)
#define DMG_SHIELD (1 << 20)
#define DMG_MIR_RAY (1 << 21)
#define DMG_SPIN_KOKIRI (1 << 22)
#define DMG_SPIN_GIANT (1 << 23)
#define DMG_SPIN_MASTER (1 << 24)
#define DMG_JUMP_KOKIRI (1 << 25)
#define DMG_JUMP_GIANT (1 << 26)
#define DMG_JUMP_MASTER (1 << 27)
#define DMG_UNKNOWN_1 (1 << 28)
#define DMG_UNBLOCKABLE (1 << 29)
#define DMG_HAMMER_JUMP (1 << 30)
#define DMG_UNKNOWN_2 (1 << 31)
#define DMG_SLASH (DMG_SLASH_KOKIRI | DMG_SLASH_MASTER | DMG_SLASH_GIANT)
#define DMG_SPIN_ATTACK (DMG_SPIN_KOKIRI | DMG_SPIN_MASTER | DMG_SPIN_GIANT)