Merge pull request #69 from LuigiBlood/libleo

libleo: leochk_err_reg match + add noppad
pret · Aug 15, 2023 · 8a192a3 · 8a192a3
2 parents d7b875a + ac6d84c
commit 8a192a3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/splat.yaml b/splat.yaml
@@ -130,6 +130,7 @@ segments:
     - [0x51BC0, c, libleo/readwrite]
     - [0x51C50, c, libleo/leofunc]
     - [0x520C0, c, libleo/leoint]
+    - [0x52AB0, bin, noppad_52AB0] # again with the weird nop padding.
     - [0x52AC0, c, libleo/leocmdex]
     - [0x53150, c, libleo/leoread]
     - [0x53310, c, libleo/lbatobyte]

diff --git a/src/libleo/leoint.c b/src/libleo/leoint.c
@@ -243,7 +243,6 @@ void leosetup_BM(void) {
     osEPiWriteIo(LEOPiInfo, 0x05000510U, LEOasic_bm_ctl_shadow);
 }
 
-#ifdef NON_MATCHING
 u32 leochk_err_reg(void) {
     u32 sense;
     u32 index_status;
@@ -272,6 +271,3 @@ u32 leochk_err_reg(void) {
     }
     return 0x18;
 }
-#else
-#pragma GLOBAL_ASM("asm/nonmatchings/libleo/leoint/leochk_err_reg.s")
-#endif