falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup and fixed build

This commit is contained in:
rozlette 2018-10-28 01:43:30 -05:00
parent 6b2198e6e1
commit 0418ad11d3
5 changed files with 78 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
disasm.py
View File

@ -586,7 +586,7 @@ class Disassembler:
with open(path + "functions.h", 'w', newline='\n') as f: with open(path + "functions.h", 'w', newline='\n') as f:
f.write("#ifndef _FUNCTIONS_H_\n#define _FUNCTIONS_H_\n\n"); f.write("#ifndef _FUNCTIONS_H_\n#define _FUNCTIONS_H_\n\n");
f.write('#include <PR/ultratypes.h>\n#include <osint.h>\n#include <unk.h>\n#include <structs.h>\n\n'); f.write('#include <PR/ultratypes.h>\n#include <osint.h>\n#include <viint.h>\n#include <unk.h>\n#include <structs.h>\n\n');
for addr in sorted(self.functions): for addr in sorted(self.functions):
if addr in known_funcs: if addr in known_funcs:
@ -599,7 +599,7 @@ class Disassembler:
with open(path + "variables.h", 'w', newline='\n') as f: with open(path + "variables.h", 'w', newline='\n') as f:
f.write("#ifndef _VARIABLES_H_\n#define _VARIABLES_H_\n\n"); f.write("#ifndef _VARIABLES_H_\n#define _VARIABLES_H_\n\n");
f.write('#include <PR/ultratypes.h>\n#include <osint.h>\n#include <unk.h>\n#include <structs.h>\n\n'); f.write('#include <PR/ultratypes.h>\n#include <osint.h>\n#include <viint.h>\n#include <unk.h>\n#include <structs.h>\n\n');
for addr in sorted(self.vars): for addr in sorted(self.vars):
if addr in known_vars: if addr in known_vars:

2
functions.py
View File

@ -214,7 +214,7 @@ known_funcs = {
0x800CAF24:("func_800CAF24","UNK_RET","UNK_TYPE"), 0x800CAF24:("func_800CAF24","UNK_RET","UNK_TYPE"),
0x800CAF38:("func_800CAF38","UNK_RET","UNK_TYPE"), 0x800CAF38:("func_800CAF38","UNK_RET","UNK_TYPE"),
0x800E03A0:("func_800E03A0","s800E03A0*","s32"), 0x800E03A0:("func_800E03A0","s800E03A0*","s32"),
0x800E03A0:("func_800E03CC","u8*","void"), 0x800E03CC:("func_800E03CC","void","u8*"),
0x800E11EC:("func_800E11EC","UNK_RET","UNK_TYPE, UNK_PTR"), 0x800E11EC:("func_800E11EC","UNK_RET","UNK_TYPE, UNK_PTR"),
0x800E1374:("func_800E1374","UNK_RET","UNK_TYPE, UNK_PTR, struct s800A5AC0*, UNK_PTR"), 0x800E1374:("func_800E1374","UNK_RET","UNK_TYPE, UNK_PTR, struct s800A5AC0*, UNK_PTR"),
0x800E2928:("func_800E2928","UNK_RET","UNK_TYPE, UNK_TYPE, UNK_PTR"), 0x800E2928:("func_800E2928","UNK_RET","UNK_TYPE, UNK_TYPE, UNK_PTR"),

8
include/functions.h
View File

@ -1333,8 +1333,8 @@ UNK_RET func_800CAF38(UNK_TYPE); // func_800CAF38
// UNK_RET func_800E0308(UNK_ARGS); // UNK_RET func_800E0308(UNK_ARGS);
// UNK_RET func_800E031C(UNK_ARGS); // UNK_RET func_800E031C(UNK_ARGS);
// UNK_RET func_800E0348(UNK_ARGS); // UNK_RET func_800E0348(UNK_ARGS);
s800E03A0* func_800E03A0(s32); s800E03A0* func_800E03A0(s32); // func_800E03A0
void func_800E03CC(u8* a0); void func_800E03CC(u8*); // func_800E03CC
// UNK_RET func_800E0410(UNK_ARGS); // UNK_RET func_800E0410(UNK_ARGS);
// UNK_RET func_800E04BC(UNK_ARGS); // UNK_RET func_800E04BC(UNK_ARGS);
// UNK_RET func_800E04EC(UNK_ARGS); // UNK_RET func_800E04EC(UNK_ARGS);
@ -4416,7 +4416,6 @@ UNK_RET func_8018349C(UNK_TYPE, UNK_TYPE); // func_8018349C
// UNK_RET func_801AAA58(UNK_ARGS); // UNK_RET func_801AAA58(UNK_ARGS);
// UNK_RET func_801AAA8C(UNK_ARGS); // UNK_RET func_801AAA8C(UNK_ARGS);
// UNK_RET func_801AAAA0(UNK_ARGS); // UNK_RET func_801AAAA0(UNK_ARGS);
// UNK_RET func_801AAAB0(UNK_ARGS);
// UNK_RET func_80862B70(UNK_ARGS); // UNK_RET func_80862B70(UNK_ARGS);
// UNK_RET func_80862CBC(UNK_ARGS); // UNK_RET func_80862CBC(UNK_ARGS);
// UNK_RET func_80862EDC(UNK_ARGS); // UNK_RET func_80862EDC(UNK_ARGS);
@ -19484,8 +19483,5 @@ UNK_RET func_8018349C(UNK_TYPE, UNK_TYPE); // func_8018349C
// UNK_RET func_80C25E38(UNK_ARGS); // UNK_RET func_80C25E38(UNK_ARGS);
// UNK_RET func_80C25EF0(UNK_ARGS); // UNK_RET func_80C25EF0(UNK_ARGS);
// UNK_RET func_80C25F4C(UNK_ARGS); // UNK_RET func_80C25F4C(UNK_ARGS);
// UNK_RET func_84001060(UNK_ARGS);
// UNK_RET func_840010CC(UNK_ARGS);
// UNK_RET func_84001B0C(UNK_ARGS);
#endif #endif

3
include/variables.h
View File

@ -2186,6 +2186,7 @@ extern UNK_TYPE D_8009E624; // D_8009E624
//extern UNK_TYPE D_8009F8B0; //extern UNK_TYPE D_8009F8B0;
//extern UNK_TYPE D_800A0004; //extern UNK_TYPE D_800A0004;
//extern UNK_TYPE D_80186028; //extern UNK_TYPE D_80186028;
//extern UNK_TYPE D_801AAAB0;
extern UNK_TYPE D_801ADE80; // D_801ADE80 extern UNK_TYPE D_801ADE80; // D_801ADE80
extern UNK_TYPE D_801ADEAC; // D_801ADEAC extern UNK_TYPE D_801ADEAC; // D_801ADEAC
extern int D_801ADEB0[]; // D_801ADEB0 extern int D_801ADEB0[]; // D_801ADEB0
@ -2312,7 +2313,7 @@ extern UNK_TYPE D_801B4610; // D_801B4610
//extern UNK_TYPE D_801B9F04; //extern UNK_TYPE D_801B9F04;
//extern UNK_TYPE D_801B9F0C; //extern UNK_TYPE D_801B9F0C;
//extern UNK_TYPE D_801B9F10; //extern UNK_TYPE D_801B9F10;
extern s800E03A0 D_801B9F20; extern s800E03A0 D_801B9F20; // D_801B9F20
//extern UNK_TYPE D_801BA200; //extern UNK_TYPE D_801BA200;
//extern UNK_TYPE D_801BA240; //extern UNK_TYPE D_801BA240;
//extern UNK_TYPE D_801BA258; //extern UNK_TYPE D_801BA258;

1
undef.txt
View File

@ -2177,6 +2177,7 @@ D_8009F8A0 = 0x8009F8A0;
D_8009F8B0 = 0x8009F8B0; D_8009F8B0 = 0x8009F8B0;
D_800A0004 = 0x800A0004; D_800A0004 = 0x800A0004;
D_80186028 = 0x80186028; D_80186028 = 0x80186028;
D_801AAAB0 = 0x801AAAB0;
D_801ADE80 = 0x801ADE80; D_801ADE80 = 0x801ADE80;
D_801ADEAC = 0x801ADEAC; D_801ADEAC = 0x801ADEAC;
D_801ADEB0 = 0x801ADEB0; D_801ADEB0 = 0x801ADEB0;