izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest ghidra project

Browse Source
This commit is contained in:
rozlette
2020-02-24 23:55:51 -06:00
parent 73699c5c48
commit 81c4300015
5 changed files with 331 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+7 -7
View File
@@ -111,12 +111,12 @@ void FaultDrawer_SetInputCallback(func_ptr func); // func_800848A4
void FaultDrawer_Init(void); // func_800848B8
void func_80084940(void); // func_80084940
void func_80084968(void); // func_80084968
void func_800849A0(void); // func_800849A0
void func_80084C0C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5); // func_80084C0C
void func_80084CD0(void); // func_80084CD0
void handle_overlay_relocations(u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 vRamStart); // func_80084DB0
s32 load_and_relocate_overlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u32 allocatedVRamAddr); // func_8008501C
void* load_game_state_overlay(u32 vromStart, u32 vromEnd, u32 vramStart, u32 vramEnd); // func_800850C8
void Load_Relocate(u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 vRamStart); // func_800849A0
unsigned int Load_LoadOverlay(u32 vRomStart, int vRomEnd, u32 vRamStart, u32 allocatedVRamAddr, u32 allocatedBytes); // func_80084C0C
void* Load_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, u32 vRamStart); // func_80084CD0
void Load2_Relocate(u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 vRamStart); // func_80084DB0
s32 Load2_LoadOverlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u32 allocatedVRamAddr); // func_8008501C
void* Load2_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd); // func_800850C8
void func_80085130(void); // func_80085130
void func_80085150(void); // func_80085150
void func_80085158(s32 param_1); // func_80085158
@@ -487,7 +487,7 @@ void func_80096410(void); // func_80096410
void func_800964D0(void); // func_800964D0
s32 __osSpSetPc(u32 data); // func_80096510
void func_80096540(void); // func_80096540
void FUN_80096770(int param_1, UNK_PTR param_2, UNK_PTR param_3); // func_80096770
void func_80096770(int param_1, UNK_PTR param_2, UNK_PTR param_3); // func_80096770
void func_800967A0(void); // func_800967A0
u32 __osGetWatchLo(void); // func_80096810
void __osSetWatchLo(u32 value); // func_80096820
include/structs.h
+282 -290
View File
File diff suppressed because it is too large Load Diff
include/variables.h
+2 -2
View File
@@ -1556,7 +1556,7 @@ extern UNK_TYPE1 D_801C2410; // D_801C2410
extern UNK_TYPE1 D_801C2650; // D_801C2650
extern UNK_TYPE1 D_801C2660; // D_801C2660
extern scene_header_func sceneHeaderFuncTable[31]; // D_801C26A8
extern s16 D_801C2730[0x08]; // D_801C2730
extern s16 D_801C2730[8]; // D_801C2730
extern ObjectFileTableEntry objectFileTable[643]; // D_801C2740
extern Gfx gSceneProcDefaultDl[11]; // D_801C3B60
extern global_context_func gSceneProcSceneDrawFuncs[8]; // D_801C3BB8
@@ -11716,7 +11716,7 @@ extern UNK_TYPE4 D_80A167E8; // D_80A167E8
extern UNK_TYPE4 D_80A167EC; // D_80A167EC
extern UNK_TYPE4 D_80A167F0; // D_80A167F0
extern UNK_TYPE4 D_80A167F4; // D_80A167F4
extern UNK_TYPE1 D_80A167F8; // D_80A167F8
extern UNK_TYPE4 D_80A167F8; // D_80A167F8
extern UNK_TYPE4 D_80A167FC; // D_80A167FC
extern OverlayBlockSizes enGoOverlayInfo; // D_80A16830
extern u32 enGoOverlayRelocations[315]; // D_80A16844
tables/functions.txt
+38 -38
View File
@@ -108,12 +108,12 @@
0x800848B8:("FaultDrawer_Init","void","void"),
0x80084940:("func_80084940","void","void"),
0x80084968:("func_80084968","void","void"),
0x800849A0:("func_800849A0","void","void"),
0x80084C0C:("func_80084C0C","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5"),
0x80084CD0:("func_80084CD0","void","void"),
0x80084DB0:("handle_overlay_relocations","void","u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 vRamStart"),
0x8008501C:("load_and_relocate_overlay","s32","u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u32 allocatedVRamAddr"),
0x800850C8:("load_game_state_overlay","void*","u32 vromStart, u32 vromEnd, u32 vramStart, u32 vramEnd"),
0x800849A0:("Load_Relocate","void","u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 vRamStart"),
0x80084C0C:("Load_LoadOverlay","unsigned int","u32 vRomStart, int vRomEnd, u32 vRamStart, u32 allocatedVRamAddr, u32 allocatedBytes"),
0x80084CD0:("Load_AllocateAndLoad","void*","u32 vRomStart, u32 vRomEnd, u32 vRamStart"),
0x80084DB0:("Load2_Relocate","void","u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 vRamStart"),
0x8008501C:("Load2_LoadOverlay","s32","u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u32 allocatedVRamAddr"),
0x800850C8:("Load2_AllocateAndLoad","void*","u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd"),
0x80085130:("func_80085130","void","void"),
0x80085150:("func_80085150","void","void"),
0x80085158:("func_80085158","void","s32 param_1"),
@@ -484,7 +484,7 @@
0x800964D0:("func_800964D0","void","void"),
0x80096510:("__osSpSetPc","s32","u32 data"),
0x80096540:("func_80096540","void","void"),
0x80096770:("FUN_80096770","void","int param_1, UNK_PTR param_2, UNK_PTR param_3"),
0x80096770:("func_80096770","void","int param_1, UNK_PTR param_2, UNK_PTR param_3"),
0x800967A0:("func_800967A0","void","void"),
0x80096810:("__osGetWatchLo","u32","void"),
0x80096820:("__osSetWatchLo","void","u32 value"),
@@ -2404,40 +2404,40 @@
0x8012F668:("Scene_IsObjectLoaded","s32","SceneContext* iParm1, s32 index"),
0x8012F698:("Scene_DmaAllObjects","void","SceneContext* sceneCtxt"),
0x8012F73C:("func_8012F73C","u32","SceneContext* sceneCtxt, s32 iParm2, s16 id"),
0x8012F79C:("Scene_HeaderCommand00","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012F90C:("Scene_HeaderCommand01","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012F954:("Scene_HeaderCommand02","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012F984:("Scene_HeaderCommand03","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FA24:("Scene_HeaderCommand04","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FA68:("Scene_HeaderCommand06","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FA98:("Scene_HeaderCommand07","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FB60:("Scene_HeaderCommand08","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FBE8:("Scene_HeaderCommand0A","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FC18:("Scene_HeaderCommand0B","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FDA4:("Scene_HeaderCommand0C","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FE2C:("Scene_HeaderCommand0D","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FE5C:("Scene_HeaderCommand0E","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012F79C:("Scene_HeaderCommand00","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012F90C:("Scene_HeaderCommand01","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012F954:("Scene_HeaderCommand02","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012F984:("Scene_HeaderCommand03","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FA24:("Scene_HeaderCommand04","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FA68:("Scene_HeaderCommand06","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FA98:("Scene_HeaderCommand07","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FB60:("Scene_HeaderCommand08","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FBE8:("Scene_HeaderCommand0A","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FC18:("Scene_HeaderCommand0B","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FDA4:("Scene_HeaderCommand0C","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FE2C:("Scene_HeaderCommand0D","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FE5C:("Scene_HeaderCommand0E","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FEBC:("func_8012FEBC","void","void"),
0x8012FECC:("Scene_HeaderCommand0F","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FECC:("Scene_HeaderCommand0F","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FF10:("func_8012FF10","void","GlobalContext* ctxt, int iParm2"),
0x8012FF8C:("Scene_HeaderCommand11","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FFF0:("Scene_HeaderCommand12","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x80130018:("Scene_HeaderCommand10","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8013033C:("Scene_HeaderCommand05","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x801303A0:("Scene_HeaderCommand13","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x801303D0:("Scene_HeaderCommand09","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x801303E0:("Scene_HeaderCommand15","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8013043C:("Scene_HeaderCommand16","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x80130454:("Scene_HeaderCommand18","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x801304CC:("Scene_HeaderCommand17","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x80130500:("Scene_HeaderCommand1B","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x80130540:("Scene_HeaderCommand1C","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x80130578:("Scene_HeaderCommand1D","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x80130588:("Scene_HeaderCommand1E","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x801305B0:("Scene_HeaderCommand19","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x80130674:("Scene_HeaderCommand1A","void","GlobalContext* ctxt, SceneHeaderEntry* entry"),
0x8012FF8C:("Scene_HeaderCommand11","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8012FFF0:("Scene_HeaderCommand12","void","GlobalContext* ctxt, SceneCmd* entry"),
0x80130018:("Scene_HeaderCommand10","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8013033C:("Scene_HeaderCommand05","void","GlobalContext* ctxt, SceneCmd* entry"),
0x801303A0:("Scene_HeaderCommand13","void","GlobalContext* ctxt, SceneCmd* entry"),
0x801303D0:("Scene_HeaderCommand09","void","GlobalContext* ctxt, SceneCmd* entry"),
0x801303E0:("Scene_HeaderCommand15","void","GlobalContext* ctxt, SceneCmd* entry"),
0x8013043C:("Scene_HeaderCommand16","void","GlobalContext* ctxt, SceneCmd* entry"),
0x80130454:("Scene_HeaderCommand18","void","GlobalContext* ctxt, SceneCmd* entry"),
0x801304CC:("Scene_HeaderCommand17","void","GlobalContext* ctxt, SceneCmd* entry"),
0x80130500:("Scene_HeaderCommand1B","void","GlobalContext* ctxt, SceneCmd* entry"),
0x80130540:("Scene_HeaderCommand1C","void","GlobalContext* ctxt, SceneCmd* entry"),
0x80130578:("Scene_HeaderCommand1D","void","GlobalContext* ctxt, SceneCmd* entry"),
0x80130588:("Scene_HeaderCommand1E","void","GlobalContext* ctxt, SceneCmd* entry"),
0x801305B0:("Scene_HeaderCommand19","void","GlobalContext* ctxt, SceneCmd* entry"),
0x80130674:("Scene_HeaderCommand1A","void","GlobalContext* ctxt, SceneCmd* entry"),
0x801306A4:("func_801306A4","void","GlobalContext* ctxt"),
0x801306E8:("Scene_ProcessHeader","s32","GlobalContext* ctxt, SceneHeaderEntry* header"),
0x801306E8:("Scene_ProcessHeader","s32","GlobalContext* ctxt, SceneCmd* header"),
0x80130768:("Scene_CreateEntrance","u32","u32 sceneIndex, u32 spawnIndex, u32 offset"),
0x80130784:("func_80130784","void","void"),
0x801307C0:("SceneProc_DrawCurrentSceneAnimatedTextures","void","GlobalContext* ctxt"),
tables/variables.txt
+2 -2
View File
@@ -1553,7 +1553,7 @@
0x801C2650:("D_801C2650","UNK_TYPE1","",0x1),
0x801C2660:("D_801C2660","UNK_TYPE1","",0x1),
0x801C26A8:("sceneHeaderFuncTable","scene_header_func","[31]",0x7c),
0x801C2730:("D_801C2730","UNK_TYPE1","",0x1),
0x801C2730:("D_801C2730","s16","[8]",0x10),
0x801C2740:("objectFileTable","ObjectFileTableEntry","[643]",0x1418),
0x801C3B60:("gSceneProcDefaultDl","Gfx","[11]",0x58),
0x801C3BB8:("gSceneProcSceneDrawFuncs","global_context_func","[8]",0x20),
@@ -11965,7 +11965,7 @@
0x80A167EC:("D_80A167EC","UNK_TYPE4","",0x4),
0x80A167F0:("D_80A167F0","UNK_TYPE4","",0x4),
0x80A167F4:("D_80A167F4","UNK_TYPE4","",0x4),
0x80A167F8:("D_80A167F8","UNK_TYPE1","",0x1),
0x80A167F8:("D_80A167F8","UNK_TYPE4","",0x4),
0x80A167FC:("D_80A167FC","UNK_TYPE4","",0x4),
0x80A16800:("__switch_D_80A16800","UNK_PTR","",0x4),
0x80A16818:("__switch_D_80A16818","UNK_PTR","",0x4),