Adjusted the camera functions to use the camera ids defined in dispdrv.h

Author: Zephiles

ttyd-tools/rel/include/mod.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <gc/OSModule.h>
+#include <ttyd/dispdrv.h>
 #include <ttyd/battle_unit.h>
 
 #include <cstdint>
@@ -26,7 +27,7 @@ class Mod
 	int32_t fixMarioKeyOn();
 	bool performRelPatches(gc::OSModule::OSModuleInfo *, void *);
 	void *disableBattles(uint32_t, void *);
-	void drawArtAttackHitboxes(uint32_t);
+	void drawArtAttackHitboxes(ttyd::dispdrv::CameraId);
 	int32_t displayActionCommandsTimingHook(void *, ttyd::battle_unit::AttackParams *);
 
 private:
@@ -45,7 +46,7 @@ class Mod
 	int32_t (*mPFN_marioKeyOn_trampoline)() = nullptr;
 	bool (*mPFN_OSLink_trampoline)(gc::OSModule::OSModuleInfo *, void *) = nullptr;
 	void *(*mPFN_fbatHitCheck_trampoline)(uint32_t, void *) = nullptr;
-	void (*mPFN_scissor_disp_control_trampoline)(uint32_t) = nullptr;
+	void (*mPFN_scissor_disp_control_trampoline)(ttyd::dispdrv::CameraId) = nullptr;
 
 	int32_t (*mPFN_BattleActionCommandCheckDefence_trampoline)(
 		void *, ttyd::battle_unit::AttackParams *) = nullptr;

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

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ttyd/dispdrv.h>
+
 #include <cstdint>
 
 namespace ttyd::camdrv {
@@ -14,15 +16,15 @@ extern "C" {
 // camCtrlOff
 // camCtrlOn
 // camDispOff
-void camDispOn(uint32_t camId);
+void camDispOn(ttyd::dispdrv::CameraId cameraId);
 // camSetMode
 // camEffMain
 // cam3dImgMain
 // cam3dMain
 // camSetCurNo
 // camGetCurNo
 // camGetCurPtr
-void *camGetPtr(uint32_t camId);
+void *camGetPtr(ttyd::dispdrv::CameraId cameraId);
 // camUnLoadRoad
 // camLoadRoad
 // camDraw

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

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ttyd/dispdrv.h>
+
 #include <cstdint>
 
 namespace ttyd::sac_scissor {
@@ -12,7 +14,7 @@ extern "C" {
 // scissor_init
 // scissor_disp_region
 // scissor_offscreen
-void scissor_disp_control(uint32_t camId);
+void scissor_disp_control(ttyd::dispdrv::CameraId cameraId);
 // scissor_capture
 // scissor_ofscreen_ok
 // scissor_damage_sub2

ttyd-tools/rel/source/codes.cpp

@@ -15,6 +15,7 @@
 #include <ttyd/seqdrv.h>
 #include <ttyd/seq_mapchange.h>
 #include <ttyd/camdrv.h>
+#include <ttyd/dispdrv.h>
 #include <ttyd/pmario_sound.h>
 #include <ttyd/mario_cam.h>
 #include <ttyd/mario_pouch.h>
@@ -541,7 +542,7 @@ void reloadRoomMain()
 	setSeqMapChange(tempNewMap, tempNewBero);
 
 	// Reset the camera - mainly for the black bars at the top and bottom of the screen
-	uint32_t CameraPointer = reinterpret_cast<uint32_t>(ttyd::camdrv::camGetPtr(8));
+	uint32_t CameraPointer = reinterpret_cast<uint32_t>(ttyd::camdrv::camGetPtr(ttyd::dispdrv::CameraId::k2d));
 	*reinterpret_cast<uint16_t *>(CameraPointer) &= ~((1 << 8) | (1 << 9)); // Turn off the 8 and 9 bits
 
 	uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();
@@ -553,8 +554,8 @@ void reloadRoomMain()
 	// Only run the following if the system level is not 0
 	if (SystemLevel == 15)
 	{
-		// Currently in pause menu, so re-enable the camera
-		ttyd::camdrv::camDispOn(4);
+		// Currently in pause menu, so re-enable the 3D camera
+		ttyd::camdrv::camDispOn(ttyd::dispdrv::CameraId::k3d);
 	}
 
 	// Enable sound effects, set the default camera id for Mario, and give back control to the player
@@ -596,7 +597,7 @@ void reloadRoom()
 	ReloadRoom.SystemLevelShouldBeLowered = true;
 
 	// Reset the camera - mainly for the black bars at the top and bottom of the screen
-	uint32_t CameraPointer = reinterpret_cast<uint32_t>(ttyd::camdrv::camGetPtr(8));
+	uint32_t CameraPointer = reinterpret_cast<uint32_t>(ttyd::camdrv::camGetPtr(ttyd::dispdrv::CameraId::k2d));
 	*reinterpret_cast<uint16_t *>(CameraPointer) &= ~((1 << 8) | (1 << 9)); // Turn off the 8 and 9 bits
 }
 

ttyd-tools/rel/source/draw.cpp

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

ttyd-tools/rel/source/mod.cpp

@@ -14,6 +14,7 @@
 #include <ttyd/evt_bero.h>
 #include <ttyd/mario.h>
 #include <ttyd/npcdrv.h>
+#include <ttyd/dispdrv.h>
 #include <ttyd/battle_ac.h>
 #include <ttyd/battle_unit.h>
 #include <ttyd/fontmgr.h>
@@ -115,9 +116,9 @@ void Mod::init()
 	});
 
 	mPFN_scissor_disp_control_trampoline = patch::hookFunction(
-		ttyd::sac_scissor::scissor_disp_control, [](uint32_t camId)
+		ttyd::sac_scissor::scissor_disp_control, [](ttyd::dispdrv::CameraId cameraId)
 	{
-		return gMod->drawArtAttackHitboxes(camId);
+		return gMod->drawArtAttackHitboxes(cameraId);
 	});
 
 	mPFN_BattleActionCommandCheckDefence_trampoline = patch::hookFunction(