izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Decompiled fox_demo (#61)

Browse Source 
* Decompiled func_8004990C, func_8004A700, func_8004A840, func_8004C90C, func_8004D3C8 and func_8004D3D4

* Fixed format issues

* Decompiled func_8004AA84

* Decompiled func_80049A9C

* Matched func_80049B44

* Matched func_8004D738

* Matched func_8004E3D8

* Matched func_8004F798

* Matched func_80049968

* Reverted note_data

* Matched func_80048AC0

* Matched func_80049630

* Changed variable order

* Matched func_8004A52C

* Matched func_8004A888

* Matched func_8004C930

* Matched func_8004DEF8

* Matched func_8004CCC0

* Matched func_8004D828

* Matched func_80048CC4

* Matched func_8004AAF4 and func_8004FEC0

* Matched func_8004FCB8

* Swapped returns with break

* Fixed incorrect return types on externs

* Matched func_8004F8AC

* Match func_8004EBD0

* Moved code out of the if

* Matched func_80048E40 and func_800515C4

* Cleaned externs and enums

* Cleaned up and matched func_80049C0C

* Matched func_8004D440

* Matched func_8004B368

* Matched func_8004E4D4

* Matching func_8004F05C

* Fixed weird rodata

* Imported data

* Fixed PR needed changes

* PR Changes suggested

* More cleanup

* Fixed upstream issues

* Fixed warnings
This commit is contained in:
Lywx
2024-01-05 13:19:25 -06:00
committed by GitHub
parent ec3bc32c5c
commit d1ae1f4891
6 changed files with 2919 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+17 -16
View File
@@ -7,6 +7,7 @@
#include "sf64object.h"
#include "sf64thread.h"
#include "sf64player.h"
#include "sf64mesg.h"
s32 Lib_vsPrintf(char* dst, const char* fmt, va_list args);
void Lib_Perspective(Gfx** dList);
@@ -34,9 +35,9 @@ s32 func_8001AE78(void);
s32 func_8001AED4(void);
void func_8001AF40(s32);
u8* func_8001C3EC(void);
void func_8001C8B8(u8);
void func_8001CA24(u8);
void func_8001CB80(u8, u8);
void func_8001C8B8(u8);
void func_8001CA24(u8);
void func_8001CB80(u8, u8);
void func_8001CCDC(u8, Vec3f *);
void func_8001CE28(u8, Vec3f *);
void func_8001D10C(Vec3f*, u32);
@@ -204,7 +205,7 @@ s32 func_8005F9DC(Vec3f*);
void func_80060714(s32 );
void func_8006089C(u8 );
void func_80060968(void);
void func_80060D94(s32);
void func_80060D94(s32);
void func_80060F30(Vec3f* , u32 , s32 );
void Object_Kill(Object*, Vec3f*);
s32 func_80060FE4(Vec3f*, f32);
@@ -222,7 +223,7 @@ void func_80061F0C(Object_2F4* , ObjectInit* , s32 );
void Object_Load(ObjectInit* , f32 , f32 , f32 , f32 );
void func_80062568(void);
void func_80062B60(f32 xPos, f32 zPos, s32 arg2, f32 arg3);
void func_80062C38(f32, f32);
void func_80062C38(f32, f32);
s32 func_800631A8(Vec3f*, f32*, Vec3f*);
s32 func_8006326C(Vec3f* , Vec3f* , ObjectId , Object* );
s32 func_8006351C(s32 , Vec3f* , Vec3f* , s32 );
@@ -507,7 +508,7 @@ s32 func_800A78C4(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 );
void func_800A8BA4(Player* player);
void func_800AA800(Player *player);
void func_800ACDC0(Player *, PlayerShot *, PlayerShotId );
void func_800B0F50(Player *);
void func_800B0F50(Player *);
void func_800B44C4(Player *);
void func_800B5FBC(Player *, s32 , s32 );
void func_800B63BC(Player *, s32);
@@ -533,7 +534,7 @@ bool func_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a
// fox_radio
s32 func_800BA7BC(u16*, s32);
void func_800BA808(u16*, s32);
void func_800BA808(u16*, RadioCharacterId);
void func_800BB388(void);
void func_800BB5D0(void);
@@ -541,7 +542,7 @@ void func_800BB5D0(void);
void Graphics_NMIWipe(void);
// sf_versus
s32 func_800C1E9C(void);
s32 func_800C1E9C(void);
void func_800C1ED4(void);
void func_800C20B0(void);
void func_800C2190(void);
@@ -549,7 +550,7 @@ void func_800C26C8(void);
// fox_save
s32 Save_Write(void);
s32 Save_Read(void);
s32 Save_Read(void);
void func_EFFA40_80187520(s32, void*);
@@ -557,13 +558,13 @@ void func_DF4260_80187530(Object_80*);
void func_DF4260_8018753C(Object_80*);
void func_DF4260_801878D8(Object_408 *);
void func_DF4260_8018B0B4(Object_2F4 *);
void func_DF4260_8018BE7C(Object_408 *);
void func_DF4260_8018BE7C(Object_408 *);
void func_DF4260_8018ED78(Object_408*);
void func_DF4260_801924A8(Object_80* );
void func_DF4260_8019250C(Object_2F4 *);
void func_DF4260_80192CB0(Object_2F4 *);
void func_DF4260_8019250C(Object_2F4 *);
void func_DF4260_80192CB0(Object_2F4 *);
void func_DF4260_80192EA4(Object_2F4 *);
void func_DF4260_801933B4(Object_2F4 *);
void func_DF4260_801933B4(Object_2F4 *);
void func_DF4260_801935CC(Object_408 *);
void func_DF4260_80198310(Object_408 *);
void func_DF4260_80198594(Object_408 *);
@@ -636,8 +637,8 @@ void func_E6A810_8018BFB0(Object_2F4 *);
void func_E6A810_8018E3B0(Object_2F4 *);
void func_E6A810_8018E3CC(Object_2F4 *);
void func_E6A810_8018E5E8(Object_2F4 *);
void func_E6A810_8018EFF0(Object_4C *);
void func_E6A810_8018F0D8(Object_80 *);
void func_E6A810_8018EFF0(Object_4C *);
void func_E6A810_8018F0D8(Object_80 *);
void func_E6A810_8018FA48(Object_408 *);
void func_E6A810_801990DC(Object_408 *);
void func_E6A810_80199920(void);
@@ -647,7 +648,7 @@ void func_E6A810_801A4660(Object_2F4 *);
void func_E6A810_801A4AF8(Object_2F4 *);
void func_E6A810_801A5E2C(Object_2F4 *);
void func_E6A810_801A6134(Object_2F4 *);
void func_E6A810_801A65E0(Object_80 *);
void func_E6A810_801A65E0(Object_80 *);
void func_E6A810_801A7D98(Object_2F4 *);
void func_E6A810_801ACFBC(ObjectInit*);
void func_E6A810_801AD080(void);
src/main/fox_demo.c
+2896
View File
File diff suppressed because it is too large Load Diff
src/main/fox_radio.c
+1 -1
View File
@@ -36,7 +36,7 @@ s32 func_800BA7BC(u16* msg, s32 priority) {
}
}
void func_800BA808(u16* msg, s32 character) {
void func_800BA808(u16* msg, RadioCharacterId character) {
s32 var_v1;
s32 temp_v0;
s32 priority;
src/main/sf_496C0.c
-71
View File
@@ -1,71 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80048AC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80048CC4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80048E40.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049630.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004990C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049968.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049A9C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049B44.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049C0C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004A52C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004A700.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004A840.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004A888.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004AA84.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004AAF4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004B368.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004C90C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004C930.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004CCC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D3C8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D3D4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D440.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D738.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D828.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004DEF8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004E3D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004E4D4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004EBD0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004F05C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004F798.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004F8AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004FCB8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004FEC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_800515C4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/D_800D5750.s")
tools/format.py
+1 -1
View File
@@ -52,7 +52,7 @@ def get_tidy_version(tidy_executable: str):
return int(match.group(1))
CLANG_FORMAT = get_clang_executable([f"clang-format-{CLANG_VER}"])
CLANG_FORMAT = get_clang_executable([f"clang-format-{CLANG_VER}", "clang-format"])
if CLANG_FORMAT is None:
sys.exit(f"Error: clang-format-{CLANG_VER} not found")
yamls/us/main.yaml
+4 -4
View File
@@ -5,7 +5,7 @@
- {start: 0x0, type: header, name: header}
- {start: 0x40, type: bin, name: ipl3}
- {start: 0x1000, type: asm, vram: 0x80000400, name: entry}
- name: main
type: code
dir: main
@@ -175,7 +175,7 @@
- [0x3E6F0, c, fox_bg]
- [0x43AC0, c, fox_43AC0]
- [0x43E80, c, sf_43E80]
- [0x496C0, c, sf_496C0]
- [0x496C0, c, fox_demo]
- [0x52730, c, fox_display]
- [0x59780, c, fox_load]
- [0x5A0F0, c, fox_edata]
@@ -268,7 +268,7 @@
- [0xCA830, .data, fox_bg]
- [0xCAA90, .data, fox_43AC0]
- [0xCAB00, .data, sf_43E80]
- [0xCAB60, data, sf_496C0]
- [0xCAB60, .data, fox_demo]
- [0xCAE20, .data, fox_display]
- [0xCAFB0, .data, fox_load]
- [0xCCA70, .data, fox_edata]
@@ -293,7 +293,7 @@
- [0xD5F90, .rodata, fox_bg]
- [0xD61D0, .rodata, fox_43AC0]
- [0xD61F0, .rodata, sf_43E80]
- [0xD6350, .rodata, sf_496C0]
- [0xD6350, .rodata, fox_demo]
- [0xD69A0, .rodata, fox_display]
- [0xD6BA0, .rodata, fox_load]
- [0xD6C20, .rodata, fox_edisplay]