diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2023-10-28 14:29:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 08:29:43 +1100 |
| commit | 2859cbbf5e0da927c8a61897ed23869442969bcb (patch) | |
| tree | 26955ac16b221d6d7da91c1ae0dfe2de5a025241 /assets/xml/objects | |
| parent | e634be7cd4b751ce19c1bb57a0c1d1b7d254e6ad (diff) | |
Boss01 (Odolwa) OK and documented (#1452)
* 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
Diffstat (limited to 'assets/xml/objects')
| -rw-r--r-- | assets/xml/objects/object_boss01.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/assets/xml/objects/object_boss01.xml b/assets/xml/objects/object_boss01.xml index 08730f034..ff37d2bc9 100644 --- a/assets/xml/objects/object_boss01.xml +++ b/assets/xml/objects/object_boss01.xml @@ -142,10 +142,10 @@ <!-- Odolwa Animations --> <Animation Name="gOdolwaClimbAnim" Offset="0xF918" /> <!-- Unused and glitchy. Original name might be "jmp_crym" --> - <Animation Name="gOdolwaDamageStartAnim" Offset="0xFDEC" /> <!-- Original name is "jmp_dam02" --> + <Animation Name="gOdolwaDamagedStartAnim" Offset="0xFDEC" /> <!-- Original name is "jmp_dam02" --> <Animation Name="gOdolwaShieldGuardAnim" Offset="0xFF94" /> <!-- Original name is "jmp_def" --> <Animation Name="gOdolwaSwordGuardAnim" Offset="0x10150" /> <!-- Original name is "jmp_def02" --> - <Animation Name="gOdolwaDamageLoopAnim" Offset="0x10980" /> <!-- Original name is "jmp_dm01" --> + <Animation Name="gOdolwaDamagedLoopAnim" Offset="0x10980" /> <!-- Original name is "jmp_dm01" --> <Animation Name="gOdolwaDeathAnim" Offset="0x124CC" /> <!-- Original name is "jmp_down" --> <Animation Name="gOdolwaMothSummonDanceAnim" Offset="0x12B70" /> <!-- Named "dance_bug" in MM3D, but it was probably renamed by Grezzo, since it doesn't fit with other names. --> <Animation Name="gOdolwaCrouchAnim" Offset="0x12D10" /> <!-- Original name is "jmp_jmp01" --> |