We are collecting silver coins in Treasure Caves. (1/8 silver coins) (#422)

* 3 new matches

* Fix arrays

* Get llcvt compiling finally

* Finsh 2 more libultra files

* Match func_80022E18

* Match func_8001BF20

* func_8001CD28 NON_MATCHING

* Match func_80026C14

* Match func_8005FF40

* Match func_80061A00

* Match func_8005FCD0

* Update score

* Fix NON_EQUIVALENT builds
This commit is contained in:
Ryan Myers
2023-10-16 08:12:02 -04:00
committed by GitHub
parent 658ab3f5f0
commit 38a76249f9
39 changed files with 822 additions and 2301 deletions
+1 -7
View File
@@ -1,10 +1,8 @@
/* The comment below is needed for this file to be picked up by generate_ld */
/* RAM_POS: 0x800D7470 */
#include "macros.h"
#include <stdlib.h>
#ifdef NON_EQUIVALENT
//This needs to be compiled with mips3, which isn't yet supported
ldiv_t ldiv(long num, long denom)
{
ldiv_t ret;
@@ -34,7 +32,3 @@ lldiv_t lldiv(long long num, long long denom)
return ret;
}
#else
GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/lldiv.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/ldiv.s")
#endif
-14
View File
@@ -1,11 +1,6 @@
/* The comment below is needed for this file to be picked up by generate_ld */
/* RAM_POS: 0x800CE730 */
#include "types.h"
#include "macros.h"
#ifdef NON_EQUIVALENT
//Thse need to be compiled with -mips3, and linked differently
unsigned long long __ull_rshift(unsigned long long a0, unsigned long long a1)
{
return a0 >> a1;
@@ -58,12 +53,3 @@ long long __ll_rshift(long long a0, long long a1)
{
return a0 >> a1;
}
#else
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ull_rshift.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ull_rem.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ull_div.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ll_lshift.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ll_div.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ll_mul.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ull_divremi.s")
#endif
-9
View File
@@ -1,8 +1,6 @@
/* The comment below is needed for this file to be picked up by generate_ld */
/* RAM_POS: 0x800C9B30 */
#ifdef NON_EQUIVALENT
//This needs to be compiled with mips3, which isn't yet supported
long long __d_to_ll(double d) {
return d;
}
@@ -27,10 +25,3 @@ double __ull_to_d(unsigned long long u) {
float __ull_to_f(unsigned long long u) {
return u;
}
#else
#include "types.h"
#include "macros.h"
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__d_to_ll.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__f_to_ll.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__ll_to_f.s")
#endif