Add missing unused user param to scissor_disp_control for correctness

Author: Zephiles

ttyd-tools/rel/include/mod.h

@@ -32,7 +32,7 @@ class Mod
     int32_t fixMarioKeyOn();
     bool performRelPatches(gc::OSModule::OSModuleInfo *, void *);
     ttyd::npcdrv::NpcEntry *fbatHitCheck_Work(uint32_t, void *);
-    void drawArtAttackHitboxes(ttyd::dispdrv::CameraId);
+    void drawArtAttackHitboxes(ttyd::dispdrv::CameraId, void *);
     int32_t displayActionCommandsTimingHook(void *, ttyd::battle_unit::AttackParams *);
     void errorHandler(uint16_t, gc::OSContext::OSContext *, uint32_t, uint32_t);
     ttyd::npcdrv::NpcEntry *checkForNpcNameToPtrError(const char *);
@@ -65,7 +65,7 @@ class Mod
     int32_t (*mPFN_marioKeyOn_trampoline)() = nullptr;
     bool (*mPFN_OSLink_trampoline)(gc::OSModule::OSModuleInfo *, void *) = nullptr;
     ttyd::npcdrv::NpcEntry *(*mPFN_fbatHitCheck_trampoline)(uint32_t, void *) = nullptr;
-    void (*mPFN_scissor_disp_control_trampoline)(ttyd::dispdrv::CameraId) = nullptr;
+    void (*mPFN_scissor_disp_control_trampoline)(ttyd::dispdrv::CameraId, void *) = nullptr;
 
     int32_t (*mPFN_BattleActionCommandCheckDefence_trampoline)(
         void *, ttyd::battle_unit::AttackParams *) = nullptr;

ttyd-tools/rel/include/ttyd/sac_scissor.h

@@ -14,7 +14,7 @@ extern "C" {
 // scissor_init
 // scissor_disp_region
 // scissor_offscreen
-void scissor_disp_control(ttyd::dispdrv::CameraId cameraId);
+void scissor_disp_control(ttyd::dispdrv::CameraId cameraId, void *user);
 // scissor_capture
 // scissor_ofscreen_ok
 // scissor_damage_sub2

ttyd-tools/rel/source/draw.cpp

@@ -6080,10 +6080,10 @@ void drawFileSelectScreenInfo()
     drawTextAndInit(String, PosX, PosY, Alpha, TextColor, false, Scale);
 }
 
-void Mod::drawArtAttackHitboxes(ttyd::dispdrv::CameraId cameraId)
+void Mod::drawArtAttackHitboxes(ttyd::dispdrv::CameraId cameraId, void *user)
 {
     // Call the original function immediately, as several functions need to run for the lines to be drawn properly
-    mPFN_scissor_disp_control_trampoline(cameraId);
+    mPFN_scissor_disp_control_trampoline(cameraId, user);
 
     if (!Displays[ART_ATTACK_HITBOXES])
     {

ttyd-tools/rel/source/mod.cpp

@@ -133,9 +133,9 @@ void Mod::init()
     });
 
     mPFN_scissor_disp_control_trampoline = patch::hookFunction(
-        ttyd::sac_scissor::scissor_disp_control, [](ttyd::dispdrv::CameraId cameraId)
+        ttyd::sac_scissor::scissor_disp_control, [](ttyd::dispdrv::CameraId cameraId, void *user)
     {
-        return gMod->drawArtAttackHitboxes(cameraId);
+        return gMod->drawArtAttackHitboxes(cameraId, user);
     });
 
     mPFN_BattleActionCommandCheckDefence_trampoline = patch::hookFunction(