diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-02-20 14:31:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 08:31:31 -0500 |
| commit | e51fd737040352ab366a2bc531b60858f3b00aae (patch) | |
| tree | 041379e266d374e502979ce966ea7162af01e810 /assets | |
| parent | a9526a3354d7da16051e41e0b599927a202331a2 (diff) | |
Fix misc 7 (#1149)
* Fixup `Math3D_LineClosestToPoint`
* `gDodongosCavernBossLavaFloorTex` is 32x64
* Name empty-dlist-making functions `_EmptyDList`
* Fix typos
* transitionRate -> morphFrames
* Compare `xyzDistToPlayerSq` to squared values
* Fix hookshot target/post collision header names being swapped
* Fix description of `z_bg_mizu_movebg.c`
* Add scene command comment to `func_80098508` to match other scene command handlers
* Some fixup in `Camera_Demo5`
* `1` -> `ALLOCTYPE_ABSOLUTE` in comment on `ActorContext.absoluteSpace`
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/xml/objects/object_d_hsblock.xml | 4 | ||||
| -rw-r--r-- | assets/xml/scenes/dungeons/ddan_boss.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/assets/xml/objects/object_d_hsblock.xml b/assets/xml/objects/object_d_hsblock.xml index b9111b38b..4bb50c2b4 100644 --- a/assets/xml/objects/object_d_hsblock.xml +++ b/assets/xml/objects/object_d_hsblock.xml @@ -1,7 +1,7 @@ <Root> <File Name="object_d_hsblock" Segment="6"> - <Collision Name="gHookshotPostCol" Offset="0x578"/> - <Collision Name="gHookshotTargetCol" Offset="0x730"/> + <Collision Name="gHookshotTargetCol" Offset="0x578"/> + <Collision Name="gHookshotPostCol" Offset="0x730"/> <DList Name="gHookshotPostDL" Offset="0x210"/> <DList Name="gHookshotTargetDL" Offset="0x470"/> <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/> diff --git a/assets/xml/scenes/dungeons/ddan_boss.xml b/assets/xml/scenes/dungeons/ddan_boss.xml index 03eb73ea3..2b6102490 100644 --- a/assets/xml/scenes/dungeons/ddan_boss.xml +++ b/assets/xml/scenes/dungeons/ddan_boss.xml @@ -6,7 +6,7 @@ <Room Name="ddan_boss_room_0" Offset="0x0"/> </File> <File Name="ddan_boss_room_1" Segment="3"> - <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="64" Height="32" Offset="0x21D8"/> + <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/> <Room Name="ddan_boss_room_1" Offset="0x0"/> </File> </Root> |