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

Boss01 (Odolwa) OK and documented (#1452)

Browse Source 
* Boss01 (Odolwa) OK and documented

* Unify existing InitRand implementations

* Remove newlines after `// fallthrough`

* Respond to the rest of engineer's review

* Respond to most of anon's review

* Try to comment the shadow thing correctly

* Fix boss_01 after merge

* SEGMENTED_TO_VIRTUAL -> SEGMENTED_TO_K0

* Review

* Use DMG_SWORD_BEAM and update the comment in z64collision_check.h

* Respond to engineer's review
This commit is contained in:
Tom Overton
2023-10-28 14:29:43 -07:00
committed by GitHub
parent e634be7cd4
commit 2859cbbf5e
12 changed files with 3827 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64actor.h
+3 -3
View File
@@ -649,12 +649,12 @@ typedef enum {
/* 0x5B */ TATL_HINT_ID_SKULLFISH,
/* 0x5C */ TATL_HINT_ID_DESBREKO,
/* 0x5D */ TATL_HINT_ID_GREEN_CHUCHU,
/* 0x5E */ TATL_HINT_ID_ODOLWA_1,
/* 0x5E */ TATL_HINT_ID_ODOLWA_PHASE_ONE, // 799 or fewer frames have passed, says Odolwa is dangerous to get close to
/* 0x5F */ TATL_HINT_ID_GEKKO_GIANT_SLIME,
/* 0x60 */ TATL_HINT_ID_BAD_BAT,
/* 0x61 */ TATL_HINT_ID_REAL_BOMBCHU,
/* 0x62 */ TATL_HINT_ID_ODOLWA_2,
/* 0x63 */ TATL_HINT_ID_ODOLWA_3,
/* 0x62 */ TATL_HINT_ID_ODOLWA_CLOSE_TO_PHASE_TWO, // 800 frames have passed, warns that Odolwa will attack after dancing
/* 0x63 */ TATL_HINT_ID_ODOLWA_PHASE_TWO, // 1000 or more frames have passed, explains that the bugs are drawn to fire
/* 0x64 */ TATL_HINT_ID_MUSHROOM,
/* 0xFF */ TATL_HINT_ID_NONE = 0xFF
} TatlHintId;
include/z64collision_check.h
+2 -1
View File
@@ -394,7 +394,8 @@ 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
// Don't use combinations of these flags in code until we figure out how we want to format them.
// It's okay to use these flags if the code is only checking a single flag, though.
#define DMG_DEKU_NUT (1 << 0x00)
#define DMG_DEKU_STICK (1 << 0x01)
#define DMG_HORSE_TRAMPLE (1 << 0x02)