Merge branch 'mariopartyrd:main' into main

include/PowerPC_EABI_Support/Msl/MSL_C/MSL_Common/ansi_files.h

@@ -85,6 +85,7 @@ typedef struct _FILE {
 	file_modes file_mode;
 	file_states file_state;
 
+	unsigned char is_dynamically_allocated;
 	char char_buffer;
 	char char_buffer_overflow;
 	char ungetc_buffer[2];
@@ -104,19 +105,14 @@ typedef struct _FILE {
 	__io_proc write_fn;
 	__close_proc close_fn;
 	__idle_proc idle_fn;
+	struct _FILE* next_file_struct;
 } FILE;
 
-typedef struct _files {
-	FILE _stdin;
-	FILE _stdout;
-	FILE _stderr;
-} files;
-
 #define _IONBF 0
 #define _IOLBF 1
 #define _IOFBF 2
 
-extern files __files;
+extern FILE __files[];
 extern int __close_console(__file_handle file);
 extern int __write_console(__file_handle file, unsigned char* buf,
                            size_t* count, __idle_proc idle_fn);

include/PowerPC_EABI_Support/Msl/MSL_C/MSL_Common/ansi_fp.h

@@ -22,15 +22,6 @@ typedef struct decform {
 	short digits;
 } decform;
 
-/* void __ull2dec(decimal*, u64);
-void __timesdec(decimal*, const decimal*, const decimal*);
-void __str2dec(decimal*, const char*, short);
-void __two_exp(decimal*, s16);
-BOOL __equals_dec(const decimal*, const decimal*);
-BOOL __less_dec(const decimal*, const decimal*);
-void __minus_dec(decimal*, const decimal*, const decimal*);
-void __num2dec_internal(decimal*, f64);
-void __num2dec(const decform*, f64, decimal*);
-f64 __dec2num(const decimal*); */
+void __num2dec(const decform* form, double x, decimal* d);
 
 #endif

include/PowerPC_EABI_Support/Msl/MSL_C/MSL_Common/stdio.h

@@ -6,8 +6,8 @@
 #include "PowerPC_EABI_Support/Msl/MSL_C/MSL_Common/printf.h"  // IWYU pragma: export
 #include "PowerPC_EABI_Support/Msl/MSL_C/MSL_Common/extras.h"  // IWYU pragma: export
 
-#define stdin  (&__files._stdin)
-#define stdout (&__files._stdout)
-#define stderr (&__files._stderr)
+#define stdin  (&__files[0])
+#define stdout (&__files[1])
+#define stderr (&__files[2])
 
 #endif

include/REL/m427Dll.h

@@ -1,8 +1,16 @@
 #include "dolphin.h"
 #include "game/object.h"
 
-void fn_1_32F4(Process*);
+s32 fn_1_1788(void);                                  
+void fn_1_1798(s32 arg0, float arg8);                             
+s32 fn_1_1884(void);                                   
+s32 fn_1_32EC(void);    
+
+void fn_1_32F4(Process* arg0);
+void fn_1_3B20(s8 arg0, s16 arg1);                              
 void fn_1_3A88(void);
+void fn_1_91E0(s16 arg0, float arg8, float arg9, float argA, float argB);       
+float fn_1_AE78(s16 arg0, float arg8, float arg9);                      
 void fn_1_E98C(Process*);
 void fn_1_EC54(void);
 s32 fn_1_10FE8(s16, s32*);

include/game/hsfanim.h

@@ -11,10 +11,7 @@ typedef struct particle_data ParticleData;
 typedef void (*ParticleHook)(ModelData *model, ParticleData *particle, Mtx matrix);
 
 typedef struct {
-    /* 0x00 */ union {
-        u16 unk00;
-        s16 unk00_s16;
-    };
+    /* 0x00 */ s16 unk00;
     /* 0x02 */ s16 unk02;
     /* 0x04 */ s16 unk04;
     /* 0x06 */ s16 unk06;

include/game/hsfdraw.h

@@ -6,7 +6,7 @@
 
 typedef struct model_data ModelData;
 
-typedef struct {
+typedef struct hsfdraw_struct_01 {
     /* 0x00 */ u16 unk00;
     /* 0x02 */ s16 unk02;
     /* 0x04 */ s16 unk04;

include/game/hsfformat.h

@@ -99,7 +99,7 @@ typedef struct hsf_palette {
 
 typedef struct hsf_attribute {
     char *name;
-    void *unk04;
+    struct hsfdraw_struct_01 *unk04;
     u8 unk8[4];
     float unk0C;
     u8 unk10[4];

include/string.h

@@ -10,7 +10,7 @@ char* strrchr(const char* str, int c);
 char* strchr(const char* str, int c);
 int strncmp(const char* str1, const char* str2, size_t n);
 int strcmp(const char* str1, const char* str2);
-char* strcat(char* dst, const char* src);
+char* strcat(char* dst, const char* src, size_t n);
 char* strncpy(char* dst, const char* src, size_t n);
 char* strcpy(char* dst, const char* src);
 size_t strlen(const char* str);