izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Introduce DamageTable formatting and macros (#211)

Browse Source 
* Improve match in EnFirefly_Draw

* Vestigial fishing files, add enums

* Improve scripts, add ColChkInfo one

* Some minor actor cleanup (static etc)

* C file for Fishing, remove some local vars from variables.h

* Remove comma and format

* Newline

* Review suggestions

* Fix colchkinfoinit, add damage_table

* DMG macros, format existing DamageTables

* Convert preset damage tables to new format
This commit is contained in:
EllipticEllipsis
2021-07-17 00:35:29 -04:00
committed by GitHub
parent e1219e7351
commit 184e67c841
14 changed files with 1290 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64collision_check.h
+37
View File
@@ -391,4 +391,41 @@ typedef enum {
#define OCLINE_NONE 0 // Did not have an OcLine collision
#define OCLINE_HIT (1 << 0) // Had an OcLine collision
#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_HORSE_TRAMPLE (1 << 0x02)
#define DMG_EXPLOSIVES (1 << 0x03)
#define DMG_ZORA_BOOMERANG (1 << 0x04)
#define DMG_NORMAL_ARROW (1 << 0x05)
#define DMG_UNK_0x06 (1 << 0x06)
#define DMG_HOOKSHOT (1 << 0x07)
#define DMG_GORON_PUNCH (1 << 0x08)
#define DMG_SWORD (1 << 0x09)
#define DMG_GORON_POUND (1 << 0x0A)
#define DMG_FIRE_ARROW (1 << 0x0B)
#define DMG_ICE_ARROW (1 << 0x0C)
#define DMG_LIGHT_ARROW (1 << 0x0D)
#define DMG_GORON_SPIKES (1 << 0x0E)
#define DMG_DEKU_SPIN (1 << 0x0F)
#define DMG_DEKU_BUBBLE (1 << 0x10)
#define DMG_DEKU_LAUNCH (1 << 0x11)
#define DMG_UNK_0x12 (1 << 0x12)
#define DMG_ZORA_BARRIER (1 << 0x13)
#define DMG_NORMAL_SHIELD (1 << 0x14)
#define DMG_LIGHT_RAY (1 << 0x15)
#define DMG_THROWN_OBJECT (1 << 0x16)
#define DMG_ZORA_PUNCH (1 << 0x17)
#define DMG_SPIN_ATTACK (1 << 0x18)
#define DMG_SWORD_BEAM (1 << 0x19)
#define DMG_NORMAL_ROLL (1 << 0x1A)
#define DMG_UNK_0x1B (1 << 0x1B)
#define DMG_UNK_0x1C (1 << 0x1C)
#define DMG_UNBLOCKABLE (1 << 0x1D)
#define DMG_UNK_0x1E (1 << 0x1E)
#define DMG_POWDER_KEG (1 << 0x1F)
#endif