mirror of
https://github.com/zeldaret/st
synced 2026-07-09 06:43:27 -04:00
sync .clang-format with ph
This commit is contained in:
+36
-28
@@ -3,24 +3,24 @@
|
||||
#include "global.h"
|
||||
|
||||
extern "C" {
|
||||
void* func_02001654(void);
|
||||
void* func_020145b0(UnkId*, s32);
|
||||
void* func_020010c0(void);
|
||||
void* func_02001308(void);
|
||||
UnkId* func_02001488(void);
|
||||
UnkId* func_02014704(void);
|
||||
UnkId* func_020011c8(UnkId*, void*);
|
||||
UnkId* func_02014630(UnkId*, void*);
|
||||
UnkId* func_02001684(UnkId*, void*);
|
||||
void func_020011f4(void*);
|
||||
void *func_02001654(void);
|
||||
void *func_020145b0(UnkId *, s32);
|
||||
void *func_020010c0(void);
|
||||
void *func_02001308(void);
|
||||
UnkId *func_02001488(void);
|
||||
UnkId *func_02014704(void);
|
||||
UnkId *func_020011c8(UnkId *, void *);
|
||||
UnkId *func_02014630(UnkId *, void *);
|
||||
UnkId *func_02001684(UnkId *, void *);
|
||||
void func_020011f4(void *);
|
||||
}
|
||||
extern char* data_0204372c[];
|
||||
extern UnkStruct_02011e10* data_0204999c[4];
|
||||
extern char *data_0204372c[];
|
||||
extern UnkStruct_02011e10 *data_0204999c[4];
|
||||
|
||||
// non-matching
|
||||
ARM void* SysNew(UnkStruct_02011e10* param1, s32 length, s32 param3) {
|
||||
void* newPtr = NULL;
|
||||
void* ret;
|
||||
ARM void *SysNew(UnkStruct_02011e10 *param1, s32 length, s32 param3) {
|
||||
void *newPtr = NULL;
|
||||
void *ret;
|
||||
|
||||
switch (param1->mId) {
|
||||
case UnkId_EXPH:
|
||||
@@ -42,8 +42,8 @@ ARM void* SysNew(UnkStruct_02011e10* param1, s32 length, s32 param3) {
|
||||
return newPtr;
|
||||
}
|
||||
|
||||
ARM void SysDelete(void* ptr) {
|
||||
UnkId* pUnkId;
|
||||
ARM void SysDelete(void *ptr) {
|
||||
UnkId *pUnkId;
|
||||
|
||||
if (ptr != NULL) {
|
||||
pUnkId = func_02001488();
|
||||
@@ -64,17 +64,21 @@ ARM void SysDelete(void* ptr) {
|
||||
}
|
||||
}
|
||||
|
||||
ARM void* func_02011f10(s32 length) { return SysNew(data_0204999c[1], length, 4); }
|
||||
ARM void *func_02011f10(s32 length) {
|
||||
return SysNew(data_0204999c[1], length, 4);
|
||||
}
|
||||
|
||||
ARM void* func_02011f30(s32 length) { return func_02011f10(length); }
|
||||
ARM void *func_02011f30(s32 length) {
|
||||
return func_02011f10(length);
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM void* SysObject::operator new(unsigned long length, u32 id, u32 idLength) {
|
||||
void* pvVar1;
|
||||
char* uVar2;
|
||||
ARM void *SysObject::operator new(unsigned long length, u32 id, u32 idLength) {
|
||||
void *pvVar1;
|
||||
char *uVar2;
|
||||
u16 line;
|
||||
char* uVar4;
|
||||
UnkStruct_02011e10* pUVar5;
|
||||
char *uVar4;
|
||||
UnkStruct_02011e10 *pUVar5;
|
||||
|
||||
pUVar5 = data_0204999c[id];
|
||||
pvVar1 = SysNew(pUVar5, length, idLength);
|
||||
@@ -84,11 +88,11 @@ ARM void* SysObject::operator new(unsigned long length, u32 id, u32 idLength) {
|
||||
func_020011f4(pUVar5);
|
||||
uVar2 = data_0204372c[id];
|
||||
uVar4 = "%sノメモリガタリマセン.\nサイズ=%d\nノコリ =%d";
|
||||
line = 183;
|
||||
line = 183;
|
||||
} else if (id == 0) {
|
||||
uVar2 = data_0204372c[id];
|
||||
uVar4 = "%sノメモリガタリマセン.\nサイズ=%d";
|
||||
line = 187;
|
||||
line = 187;
|
||||
}
|
||||
|
||||
data_02049984.func_020125a4(__FILE__, line, uVar4, uVar2, length);
|
||||
@@ -97,6 +101,10 @@ ARM void* SysObject::operator new(unsigned long length, u32 id, u32 idLength) {
|
||||
return pvVar1;
|
||||
}
|
||||
|
||||
ARM void SysObject::operator delete(void* ptr) { SysDelete(ptr); }
|
||||
ARM void SysObject::operator delete(void *ptr) {
|
||||
SysDelete(ptr);
|
||||
}
|
||||
|
||||
ARM void SysObject::operator delete[](void* ptr) { SysDelete(ptr); }
|
||||
ARM void SysObject::operator delete[](void *ptr) {
|
||||
SysDelete(ptr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user