Matches, and split game.c into two (#393)

* Cleanup func_8007B46C, and WIP func_800143A8

* Match func_800143A8

* Match render_fade_circle and put the WIP func_8007CDC0

* Near match func_800B3740

* Add decomp me links to WIP funcs, and fix previous commit.

* Match func_800B3740

* Matched render_fade_waves

* Much better score for func_80066CDC

* WIP func_80080580

* Minor work in progress being saved

* Finish __osFinalrom naming mixup

* Move weather and particles rodata to fix a file split.

* Split game.c into another file thread3_main.c

* Update src/camera.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/fade_transition.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/fade_transition.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/objects.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/objects.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/objects.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/objects.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

---------

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
This commit is contained in:
Ryan Myers
2023-05-19 13:13:26 -04:00
committed by GitHub
co-authored by Fazana
parent 9aff97c71e
commit df514e5f4e
34 changed files with 2313 additions and 2749 deletions
@@ -11,6 +11,7 @@ glabel __ll_lshift
/* 0CF728 800CEB28 03E00008 */ jr $ra
/* 0CF72C 800CEB2C 0002103F */ dsra32 $v0, $v0, 0
glabel func_800CEB30
/* 0CF730 800CEB30 AFA40000 */ sw $a0, ($sp)
/* 0CF734 800CEB34 AFA50004 */ sw $a1, 4($sp)
/* 0CF738 800CEB38 AFA60008 */ sw $a2, 8($sp)
@@ -26,6 +26,7 @@ glabel __ull_divremi
/* 0CF850 800CEC50 03E00008 */ jr $ra
/* 0CF854 800CEC54 00000000 */ nop
glabel func_800CEC58
/* 0CF858 800CEC58 27BDFFF8 */ addiu $sp, $sp, -8
/* 0CF85C 800CEC5C AFA40008 */ sw $a0, 8($sp)
/* 0CF860 800CEC60 AFA5000C */ sw $a1, 0xc($sp)
@@ -71,6 +72,7 @@ glabel __ull_divremi
/* 0CF8EC 800CECEC 03E00008 */ jr $ra
/* 0CF8F0 800CECF0 27BD0008 */ addiu $sp, $sp, 8
glabel func_800CECF4
/* 0CF8F4 800CECF4 AFA40000 */ sw $a0, ($sp)
/* 0CF8F8 800CECF8 AFA50004 */ sw $a1, 4($sp)
/* 0CF8FC 800CECFC AFA60008 */ sw $a2, 8($sp)
+1 -1
View File
@@ -36,7 +36,7 @@ glabel ldiv
/* 0D81EC 800D75EC 03E00008 */ jr $ra
/* 0D81F0 800D75F0 AC880004 */ sw $t0, 4($a0)
/* 0D81F4 800D75F0 00000000 */ nop
/* 0D81F4 800D75F4 00000000 */ nop
/* 0D81F8 800D75F8 00000000 */ nop
/* 0D81FC 800D75FC 00000000 */ nop
-1
View File
@@ -5,7 +5,6 @@
#include "sched.h"
#include "types.h"
#include "macros.h"
#include "f3ddkr.h"
#include "libultra_internal.h"
#include "viint.h"
+2 -4
View File
@@ -21,15 +21,13 @@ s32 gLeoFound = FALSE;
s32 __osLeoInterrupt(void);
extern s32 osViClock; //This is defined in another file somehow
extern u64 *gThread30StackPointer; //TODO: This should be __osFinalrom. Is this reused?
//u32 __osFinalrom;
extern u32 __osFinalrom; //This is defined in another file somehow
void osInitialize() {
u32 pifdata;
u32 clock = 0;
u32 leostatus;
u32 pistatus;
//__osFinalrom = TRUE;
gThread30StackPointer = (u64 *) TRUE; //TODO: This should be __osFinalrom. Is this reused?
__osFinalrom = TRUE;
__osSetSR(__osGetSR() | SR_CU1); //enable fpu
__osSetFpcCsr(FPCSR_FS | FPCSR_EV); //flush denorm to zero, enable invalid operation
+1 -1
View File
@@ -13,7 +13,7 @@ extern u32 __osViIntrCount;
OSDevMgr __osViDevMgr = {0};
u64 gThread30Stack[0x400];
u64 *gThread30StackPointer;
u32 __osFinalrom;
extern OSThread viThread;
extern OSMesgQueue viEventQueue;