diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 106f7560..59241971 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -25,15 +25,15 @@ func_02000a78 kind:function(arm,size=0xe8) addr:0x02000a78 func_02000b60 kind:function(arm,size=0x4) addr:0x02000b60 BuildInfo kind:data(any) addr:0x02000b64 main kind:function(arm,size=0x30) addr:0x02000c30 -func_02000c60 kind:function(arm,size=0x318) addr:0x02000c60 -func_02000f78 kind:function(arm,size=0x104) addr:0x02000f78 +_dadd kind:function(arm,size=0x318) addr:0x02000c60 +_fflt kind:function(arm,size=0x104) addr:0x02000f78 func_0200107c kind:function(arm,size=0x4c) addr:0x0200107c func_020010c8 kind:function(arm,size=0x8c) addr:0x020010c8 -func_02001154 kind:function(arm,size=0x40) addr:0x02001154 +_dflt kind:function(arm,size=0x40) addr:0x02001154 func_02001194 kind:function(arm,size=0x3c) addr:0x02001194 -func_020011d0 kind:function(arm,size=0x364) addr:0x020011d0 +_dmul kind:function(arm,size=0x364) addr:0x020011d0 func_02001534 kind:function(arm,size=0x19c) addr:0x02001534 -func_020016e8 kind:function(arm,size=0x3b4) addr:0x020016e8 +_dsub kind:function(arm,size=0x3b4) addr:0x020016e8 func_02001a9c kind:function(arm,size=0x21c) addr:0x02001a9c func_02001cb8 kind:function(arm,size=0x8) addr:0x02001cb8 func_02001cc0 kind:function(arm,size=0x98) addr:0x02001cc0 @@ -53,13 +53,13 @@ func_02002588 kind:function(arm,size=0x1e0) addr:0x02002588 func_02002774 kind:function(arm,size=0x278) addr:0x02002774 func_020029ec kind:function(arm,size=0x10) addr:0x020029ec func_020029fc kind:function(arm,size=0x1b0) addr:0x020029fc -func_02002bac kind:function(arm,size=0xc) addr:0x02002bac +_ll_udiv kind:function(arm,size=0xc) addr:0x02002bac func_02002bb8 kind:function(arm,size=0x3c) addr:0x02002bb8 func_02002bf4 kind:function(arm,size=0x20) addr:0x02002bf4 _s32_div_f kind:function(arm,size=0x20c) addr:0x02002c14 -SoftDivide kind:function(arm,size=0x1e4) addr:0x02002e20 +_u32_div_f kind:function(arm,size=0x1e4) addr:0x02002e20 .L_02002e28 kind:label(arm) addr:0x02002e28 -func_0200301c kind:function(arm,size=0x544) addr:0x0200301c +_ddiv kind:function(arm,size=0x544) addr:0x0200301c .L_02003154 kind:data(byte[256]) addr:0x02003154 func_02003560 kind:function(arm,size=0x4) addr:0x02003560 func_02003564 kind:function(arm,size=0x40) addr:0x02003564 @@ -510,7 +510,7 @@ func_0200d9a4 kind:function(arm,size=0xb8) addr:0x0200d9a4 func_0200da5c kind:function(arm,size=0x1c) addr:0x0200da5c func_0200da78 kind:function(arm,size=0xa8) addr:0x0200da78 func_0200db20 kind:function(arm,size=0x8) addr:0x0200db20 -func_0200db28 kind:function(arm,size=0xa8) addr:0x0200db28 +OS_Sleep kind:function(arm,size=0xa8) addr:0x0200db28 func_0200dbd0 kind:function(arm,size=0x20) addr:0x0200dbd0 func_0200dbf0 kind:function(arm,size=0x28) addr:0x0200dbf0 func_0200dc18 kind:function(arm,size=0x10) addr:0x0200dc18 @@ -568,9 +568,9 @@ func_0200e734 kind:function(arm,size=0x90) addr:0x0200e734 func_0200e7c4 kind:function(arm,size=0x54) addr:0x0200e7c4 func_0200e818 kind:function(arm,size=0x1c) addr:0x0200e818 func_0200e834 kind:function(thumb,size=0x4c) addr:0x0200e834 -func_0200e880 kind:function(arm,size=0x10) addr:0x0200e880 +OS_IsTickAvailable kind:function(arm,size=0x10) addr:0x0200e880 func_0200e890 kind:function(arm,size=0x68) addr:0x0200e890 -func_0200e8f8 kind:function(arm,size=0xa0) addr:0x0200e8f8 +OS_GetTick kind:function(arm,size=0xa0) addr:0x0200e8f8 func_0200e998 kind:function(arm,size=0x10) addr:0x0200e998 func_0200e9a8 kind:function(arm,size=0x8c) addr:0x0200e9a8 func_0200ea34 kind:function(thumb,size=0x28) addr:0x0200ea34 @@ -2283,15 +2283,15 @@ func_020457cc kind:function(arm,size=0x44) addr:0x020457cc func_02045810 kind:function(arm,size=0x118) addr:0x02045810 func_02045928 kind:function(arm,size=0x68) addr:0x02045928 func_02045990 kind:function(arm,size=0x28) addr:0x02045990 -func_020459b8 kind:function(arm,size=0x2c) addr:0x020459b8 -func_020459e4 kind:function(arm,size=0x164) addr:0x020459e4 -func_02045b48 kind:function(arm,size=0x34) addr:0x02045b48 -func_02045b7c kind:function(arm,size=0x10) addr:0x02045b7c +sprintf kind:function(arm,size=0x2c) addr:0x020459b8 +qsort kind:function(arm,size=0x164) addr:0x020459e4 +rand kind:function(arm,size=0x34) addr:0x02045b48 +srand kind:function(arm,size=0x10) addr:0x02045b7c func_02045b8c kind:function(arm,size=0x4f8) addr:0x02045b8c func_02046084 kind:function(arm,size=0xd54) addr:0x02046084 func_02046dd8 kind:function(arm,size=0x84) addr:0x02046dd8 func_02046e5c kind:function(arm,size=0x54) addr:0x02046e5c -func_02046eb0 kind:function(arm,size=0x28) addr:0x02046eb0 +sscanf kind:function(arm,size=0x28) addr:0x02046eb0 func_02046ed8 kind:function(arm,size=0x130) addr:0x02046ed8 strlen kind:function(arm,size=0x1c) addr:0x02047008 strcpy kind:function(arm,size=0xc8) addr:0x02047024 @@ -2303,12 +2303,12 @@ strchr kind:function(arm,size=0x3c) addr:0x020472b4 strstr kind:function(arm,size=0x6c) addr:0x020472f0 func_0204735c kind:function(arm,size=0x124c) addr:0x0204735c func_020485a8 kind:function(arm,size=0xe0) addr:0x020485a8 -func_02048688 kind:function(arm,size=0x10) addr:0x02048688 +atof kind:function(arm,size=0x10) addr:0x02048688 func_02048698 kind:function(arm,size=0x3e8) addr:0x02048698 func_02048a80 kind:function(arm,size=0x44c) addr:0x02048a80 func_02048ecc kind:function(arm,size=0x98) addr:0x02048ecc func_02048f64 kind:function(arm,size=0xc8) addr:0x02048f64 -func_0204902c kind:function(arm,size=0x14) addr:0x0204902c +atoi kind:function(arm,size=0x14) addr:0x0204902c func_02049040 kind:function(arm,size=0x74) addr:0x02049040 func_020490b4 kind:function(arm,size=0x10) addr:0x020490b4 func_020490c4 kind:function(arm,size=0x28) addr:0x020490c4 @@ -2369,7 +2369,7 @@ func_0204dd40 kind:function(arm,size=0x30) addr:0x0204dd40 func_0204dd70 kind:function(arm,size=0x2c) addr:0x0204dd70 func_0204dd9c kind:function(arm,size=0x90) addr:0x0204dd9c func_0204de2c kind:function(arm,size=0x68) addr:0x0204de2c -func_0204de94 kind:function(arm,size=0xc) addr:0x0204de94 +strcasecmp kind:function(arm,size=0xc) addr:0x0204de94 func_0204dea0 kind:function(arm,size=0x14) addr:0x0204dea0 func_0204deb4 kind:function(arm,size=0x14) addr:0x0204deb4 func_0204dec8 kind:function(arm,size=0x10) addr:0x0204dec8 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 1d349630..68451708 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -25,15 +25,15 @@ func_02000a78 kind:function(arm,size=0xe8) addr:0x02000a78 func_02000b60 kind:function(arm,size=0x4) addr:0x02000b60 BuildInfo kind:data(any) addr:0x02000b64 main kind:function(arm,size=0x30) addr:0x02000c30 -func_02000c60 kind:function(arm,size=0x318) addr:0x02000c60 -func_02000f78 kind:function(arm,size=0x104) addr:0x02000f78 +_dadd kind:function(arm,size=0x318) addr:0x02000c60 +_fflt kind:function(arm,size=0x104) addr:0x02000f78 func_0200107c kind:function(arm,size=0x4c) addr:0x0200107c func_020010c8 kind:function(arm,size=0x8c) addr:0x020010c8 -func_02001154 kind:function(arm,size=0x40) addr:0x02001154 +_dflt kind:function(arm,size=0x40) addr:0x02001154 func_02001194 kind:function(arm,size=0x3c) addr:0x02001194 -func_020011d0 kind:function(arm,size=0x364) addr:0x020011d0 +_dmul kind:function(arm,size=0x364) addr:0x020011d0 func_02001534 kind:function(arm,size=0x19c) addr:0x02001534 -func_020016e8 kind:function(arm,size=0x3b4) addr:0x020016e8 +_dsub kind:function(arm,size=0x3b4) addr:0x020016e8 func_02001a9c kind:function(arm,size=0x21c) addr:0x02001a9c func_02001cb8 kind:function(arm,size=0x8) addr:0x02001cb8 func_02001cc0 kind:function(arm,size=0x98) addr:0x02001cc0 @@ -53,13 +53,13 @@ func_02002588 kind:function(arm,size=0x1e0) addr:0x02002588 func_02002774 kind:function(arm,size=0x278) addr:0x02002774 func_020029ec kind:function(arm,size=0x10) addr:0x020029ec func_020029fc kind:function(arm,size=0x1b0) addr:0x020029fc -func_02002bac kind:function(arm,size=0xc) addr:0x02002bac +_ll_udiv kind:function(arm,size=0xc) addr:0x02002bac func_02002bb8 kind:function(arm,size=0x3c) addr:0x02002bb8 func_02002bf4 kind:function(arm,size=0x20) addr:0x02002bf4 _s32_div_f kind:function(arm,size=0x20c) addr:0x02002c14 -SoftDivide kind:function(arm,size=0x1e4) addr:0x02002e20 +_u32_div_f kind:function(arm,size=0x1e4) addr:0x02002e20 .L_02002e28 kind:label(arm) addr:0x02002e28 -func_0200301c kind:function(arm,size=0x544) addr:0x0200301c +_ddiv kind:function(arm,size=0x544) addr:0x0200301c .L_02003154 kind:data(byte[256]) addr:0x02003154 func_02003560 kind:function(arm,size=0x4) addr:0x02003560 func_02003564 kind:function(arm,size=0x40) addr:0x02003564 @@ -478,7 +478,7 @@ func_0200c7c4 kind:function(arm,size=0x30) addr:0x0200c7c4 func_0200c7f4 kind:function(arm,size=0x30) addr:0x0200c7f4 func_0200c824 kind:function(arm,size=0x54) addr:0x0200c824 func_0200c878 kind:function(arm,size=0x58) addr:0x0200c878 -sprintf kind:function(arm,size=0x28) addr:0x0200c8d0 +func_0200c8d0 kind:function(arm,size=0x28) addr:0x0200c8d0 vsprintf kind:function(arm,size=0x18) addr:0x0200c8f8 va_sprintf kind:function(arm,size=0x28) addr:0x0200c910 vsnprintf kind:function(arm,size=0x8fc) addr:0x0200c938 @@ -510,7 +510,7 @@ func_0200d9a4 kind:function(arm,size=0xb8) addr:0x0200d9a4 func_0200da5c kind:function(arm,size=0x1c) addr:0x0200da5c func_0200da78 kind:function(arm,size=0xa8) addr:0x0200da78 func_0200db20 kind:function(arm,size=0x8) addr:0x0200db20 -func_0200db28 kind:function(arm,size=0xa8) addr:0x0200db28 +OS_Sleep kind:function(arm,size=0xa8) addr:0x0200db28 func_0200dbd0 kind:function(arm,size=0x20) addr:0x0200dbd0 func_0200dbf0 kind:function(arm,size=0x28) addr:0x0200dbf0 func_0200dc18 kind:function(arm,size=0x10) addr:0x0200dc18 @@ -568,9 +568,9 @@ func_0200e734 kind:function(arm,size=0x90) addr:0x0200e734 func_0200e7c4 kind:function(arm,size=0x54) addr:0x0200e7c4 func_0200e818 kind:function(arm,size=0x1c) addr:0x0200e818 func_0200e834 kind:function(thumb,size=0x4c) addr:0x0200e834 -func_0200e880 kind:function(arm,size=0x10) addr:0x0200e880 +OS_IsTickAvailable kind:function(arm,size=0x10) addr:0x0200e880 func_0200e890 kind:function(arm,size=0x68) addr:0x0200e890 -func_0200e8f8 kind:function(arm,size=0xa0) addr:0x0200e8f8 +OS_GetTick kind:function(arm,size=0xa0) addr:0x0200e8f8 func_0200e998 kind:function(arm,size=0x10) addr:0x0200e998 func_0200e9a8 kind:function(arm,size=0x8c) addr:0x0200e9a8 func_0200ea34 kind:function(thumb,size=0x28) addr:0x0200ea34 @@ -2283,15 +2283,15 @@ func_020457cc kind:function(arm,size=0x44) addr:0x02045788 func_02045810 kind:function(arm,size=0x118) addr:0x020457cc func_02045928 kind:function(arm,size=0x68) addr:0x020458e4 func_02045990 kind:function(arm,size=0x28) addr:0x0204594c -func_020459b8 kind:function(arm,size=0x2c) addr:0x02045974 -func_020459e4 kind:function(arm,size=0x164) addr:0x020459a0 -func_02045b48 kind:function(arm,size=0x34) addr:0x02045b04 -func_02045b7c kind:function(arm,size=0x10) addr:0x02045b38 +sprintf kind:function(arm,size=0x2c) addr:0x02045974 +qsort kind:function(arm,size=0x164) addr:0x020459a0 +rand kind:function(arm,size=0x34) addr:0x02045b04 +srand kind:function(arm,size=0x10) addr:0x02045b38 func_02045b8c kind:function(arm,size=0x4f8) addr:0x02045b48 func_02046084 kind:function(arm,size=0xd54) addr:0x02046040 func_02046dd8 kind:function(arm,size=0x84) addr:0x02046d94 func_02046e5c kind:function(arm,size=0x54) addr:0x02046e18 -func_02046eb0 kind:function(arm,size=0x28) addr:0x02046e6c +sscanf kind:function(arm,size=0x28) addr:0x02046e6c func_02046ed8 kind:function(arm,size=0x130) addr:0x02046e94 strlen kind:function(arm,size=0x1c) addr:0x02046fc4 strcpy kind:function(arm,size=0xc8) addr:0x02046fe0 @@ -2303,12 +2303,12 @@ strchr kind:function(arm,size=0x3c) addr:0x02047270 strstr kind:function(arm,size=0x6c) addr:0x020472ac func_0204735c kind:function(arm,size=0x124c) addr:0x02047318 func_020485a8 kind:function(arm,size=0xe0) addr:0x02048564 -func_02048688 kind:function(arm,size=0x10) addr:0x02048644 +atof kind:function(arm,size=0x10) addr:0x02048644 func_02048698 kind:function(arm,size=0x3e8) addr:0x02048654 func_02048a80 kind:function(arm,size=0x44c) addr:0x02048a3c func_02048ecc kind:function(arm,size=0x98) addr:0x02048e88 func_02048f64 kind:function(arm,size=0xc8) addr:0x02048f20 -func_0204902c kind:function(arm,size=0x14) addr:0x02048fe8 +atoi kind:function(arm,size=0x14) addr:0x02048fe8 func_02049040 kind:function(arm,size=0x74) addr:0x02048ffc func_020490b4 kind:function(arm,size=0x10) addr:0x02049070 func_020490c4 kind:function(arm,size=0x28) addr:0x02049080 @@ -2369,7 +2369,7 @@ func_0204dd40 kind:function(arm,size=0x30) addr:0x0204dcfc func_0204dd70 kind:function(arm,size=0x2c) addr:0x0204dd2c func_0204dd9c kind:function(arm,size=0x90) addr:0x0204dd58 func_0204de2c kind:function(arm,size=0x68) addr:0x0204dde8 -func_0204de94 kind:function(arm,size=0xc) addr:0x0204de50 +strcasecmp kind:function(arm,size=0xc) addr:0x0204de50 func_0204dea0 kind:function(arm,size=0x14) addr:0x0204de5c func_0204deb4 kind:function(arm,size=0x14) addr:0x0204de70 func_0204dec8 kind:function(arm,size=0x10) addr:0x0204de84 diff --git a/libs/nds/include/nds/math.h b/libs/nds/include/nds/math.h index 18332db1..ea1d1d88 100644 --- a/libs/nds/include/nds/math.h +++ b/libs/nds/include/nds/math.h @@ -30,7 +30,6 @@ typedef s16 q4; u32 func_01ff9f3c(s32 a, s32 b); s32 Atan2(s32 x, s32 y); -u32 SoftDivide(u32 a, u32 b); u32 CoDivide64By32(u32 a, u32 b); u32 func_01ff98f0(u32 a, u32 b); u32 CoReciprocal(u32 x); diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index d378ebe0..9682a614 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -38,7 +38,7 @@ THUMB void ItemManager::Save(SaveItemManager *save) { save->inventory.numArrows = (u8) (*mAmmo)[ItemFlag_Bow]; save->inventory.equippedItem = (u8) mEquippedItem; save->inventory.salvagedTreasureFlags = mSalvagedTreasureFlags; - save->inventory.hourglassSeconds = SoftDivide(mHourglassSandFrames, 60); + save->inventory.hourglassSeconds = mHourglassSandFrames / 60; for (s32 i = 0; i < Gem_COUNT; ++i) { save->inventory.numGems[i] = mNumGems[i]; }