diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-13 00:04:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-12 21:04:03 -0800 |
| commit | 1b8ea3206dbbaa6e4ebe7b4dfadffd8d85f37480 (patch) | |
| tree | 334a6f146edd70f260a6d3156e1aad8221b22e42 /src/d | |
| parent | 7e514502d2e97781aa0488c08e39e505f29f36f5 (diff) | |
J3D debug work (#2949)
* J3D debug work
* Clean up JSystem GXColor ctors, remove a couple fakematches
* Update symbols.txt
* Fix res include syntax
* Remove fakematch that isn't necessary anymore
* Fix some Shield regressions
Diffstat (limited to 'src/d')
| -rw-r--r-- | src/d/actor/d_a_arrow.cpp | 4 | ||||
| -rw-r--r-- | src/d/actor/d_a_e_gb.cpp | 2 | ||||
| -rw-r--r-- | src/d/actor/d_a_e_hz.cpp | 2 | ||||
| -rw-r--r-- | src/d/actor/d_a_npc_zelda.cpp | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 79cb8dd9db..d0b6a7b226 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1069,8 +1069,8 @@ int daArrow_c::draw() { return TRUE; } - static const GXColorS10 tmpColor = {0, 0, 0}; - J3DGXColorS10 color = (tmpColor); + static const GXColorS10 tmpColor = {0x00, 0x00, 0x00, 0x00}; + J3DGXColorS10 color = tmpColor; daAlink_c* link = daAlink_getAlinkActorClass(); if (fopAcM_GetParam(this) == 0 && field_0x940 != 0) { diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index a0f43bbac6..46593a7671 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_gb.h" -#include "../assets/GZ2E01/res/Object/E_gb.h" +#include "res/Object/E_gb.h" #include "d/d_cc_d.h" #include "d/d_camera.h" #include "d/d_bomb.h" diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 4bc16b0d61..c7b54ecaba 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -7,7 +7,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_e_hz.h" -#include "../assets/GZ2E01/res/Object/E_hz.h" +#include "res/Object/E_hz.h" #include "d/d_camera.h" #include "f_op/f_op_actor_enemy.h" #include "d/d_debug_viewer.h" diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index b0f4cab482..e3c3239c5b 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -473,6 +473,7 @@ void daNpc_Zelda_c::srchActors() { switch (field_0xf80) { case 0: default: + break; } #endif } @@ -625,7 +626,7 @@ int daNpc_Zelda_c::drawDbgInfo() { attention_info.distances[fopAc_attn_JUEL_e]).mDistMax; f32 distMax2 = dComIfGp_getAttention()->getDistTable( attention_info.distances[fopAc_attn_TALK_e]).mDistMax; - GXColor circle1Color = { 0xc8, 0x00, 0xff }; + GXColor circle1Color = { 0xc8, 0x00, 0xff, 0x00 }; dDbVw_drawCircleOpa(attention_info.position, distMax1, circle1Color, 1, 0xc); GXColor circle2Color = { 0xc8, 0x00, 0x00, 0xff }; dDbVw_drawCircleOpa(attention_info.position, distMax2, circle2Color, 1, 0xc); |