From b344fd4141c4d71cb927de15d3691673b24cc832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Israelson?=
 <57065102+israpps@users.noreply.github.com>
Date: Fri, 10 Nov 2023 13:09:28 -0300
Subject: [PATCH 1/2] Compact IRX externs

---
 engine/src/irx/irx_loader.cpp | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/engine/src/irx/irx_loader.cpp b/engine/src/irx/irx_loader.cpp
index c36f9b8..32b095d 100644
--- a/engine/src/irx/irx_loader.cpp
+++ b/engine/src/irx/irx_loader.cpp
@@ -20,30 +20,18 @@
 #include "file/file_utils.hpp"
 
 // external IRX modules
+#define EXTERN_IRX(_irx) \
+  extern u8 _irx[]; \
+  extern int size_##_irx
 
-extern u8 sio2man_irx[];
-extern int size_sio2man_irx;
-
-extern u8 padman_irx[];
-extern int size_padman_irx;
-
-extern u8 audsrv_irx[];
-extern int size_audsrv_irx;
-
-extern u8 libsd_irx[];
-extern int size_libsd_irx;
-
-extern u8 bdm_irx[];
-extern int size_bdm_irx;
-
-extern u8 bdmfs_fatfs_irx[];
-extern int size_bdmfs_fatfs_irx;
-
-extern u8 usbd_irx[];
-extern int size_usbd_irx;
-
-extern u8 usbmass_bd_irx[];
-extern int size_usbmass_bd_irx;
+EXTERN_IRX(io2man_irx);
+EXTERN_IRX(padman_irx);
+EXTERN_IRX(audsrv_irx);
+EXTERN_IRX(libsd_irx);
+EXTERN_IRX(bdm_irx);
+EXTERN_IRX(bdmfs_fatfs_irx);
+EXTERN_IRX(usbd_irx);
+EXTERN_IRX(usbmass_bd_irx);
 
 namespace Tyra {
 

From 795910de69cf42191a5f08660b8926a5aa39d904 Mon Sep 17 00:00:00 2001
From: israpps <57065102+israpps@users.noreply.github.com>
Date: Fri, 10 Nov 2023 14:45:57 -0300
Subject: [PATCH 2/2] Update irx_loader.cpp

---
 engine/src/irx/irx_loader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/src/irx/irx_loader.cpp b/engine/src/irx/irx_loader.cpp
index 32b095d..a60bef2 100644
--- a/engine/src/irx/irx_loader.cpp
+++ b/engine/src/irx/irx_loader.cpp
@@ -24,7 +24,7 @@
   extern u8 _irx[]; \
   extern int size_##_irx
 
-EXTERN_IRX(io2man_irx);
+EXTERN_IRX(sio2man_irx);
 EXTERN_IRX(padman_irx);
 EXTERN_IRX(audsrv_irx);
 EXTERN_IRX(libsd_irx);