diff --git a/config/GMPE01_00/splits.txt b/config/GMPE01_00/splits.txt index d864a28b..4798b47f 100644 --- a/config/GMPE01_00/splits.txt +++ b/config/GMPE01_00/splits.txt @@ -22,6 +22,23 @@ game/memory.c: .text start:0x8000A938 end:0x8000AEF0 .data start:0x80121FC8 end:0x80122140 +game/sprman.c: + .text start:0x8000D348 end:0x8000F6A0 + .rodata start:0x8011DD00 end:0x8011DD10 + .data start:0x801221D0 end:0x801222F0 + .bss start:0x8014C490 end:0x8015C690 + .sdata start:0x801D3460 end:0x801D3470 + .sbss start:0x801D3B48 end:0x801D3B50 + .sdata2 start:0x801D49C8 end:0x801D49F0 + +game/sprput.c: + .text start:0x8000F6A0 end:0x80010B30 + .rodata start:0x8011DD10 end:0x8011DD20 + .data start:0x801222F0 end:0x80122320 + .bss start:0x8015C690 end:0x8015C6C0 + .sbss start:0x801D3B50 end:0x801D3B58 + .sdata2 start:0x801D49F0 end:0x801D4A28 + Runtime.PPCEABI.H/global_destructor_chain.c: .text start:0x800E2008 end:0x800E2068 .dtors start:0x8011DCE8 end:0x8011DCEC diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 7b255f4e..146d27ca 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -153,53 +153,53 @@ fn_8000D21C = .text:0x8000D21C; // type:function size:0x10 fn_8000D22C = .text:0x8000D22C; // type:function size:0x14 fn_8000D240 = .text:0x8000D240; // type:function size:0x84 fn_8000D2C4 = .text:0x8000D2C4; // type:function size:0x84 -fn_8000D348 = .text:0x8000D348; // type:function size:0xA0 -fn_8000D3E8 = .text:0x8000D3E8; // type:function size:0xB0 -fn_8000D498 = .text:0x8000D498; // type:function size:0x64 -fn_8000D4FC = .text:0x8000D4FC; // type:function size:0x188 -fn_8000D684 = .text:0x8000D684; // type:function size:0x14C -fn_8000D7D0 = .text:0x8000D7D0; // type:function size:0xF4 -fn_8000D8C4 = .text:0x8000D8C4; // type:function size:0x458 -fn_8000DD1C = .text:0x8000DD1C; // type:function size:0x8 -fn_8000DD24 = .text:0x8000DD24; // type:function size:0x114 -fn_8000DE38 = .text:0x8000DE38; // type:function size:0x10 -fn_8000DE48 = .text:0x8000DE48; // type:function size:0x128 -fn_8000DF70 = .text:0x8000DF70; // type:function size:0x188 -fn_8000E0F8 = .text:0x8000E0F8; // type:function size:0xF4 -fn_8000E1EC = .text:0x8000E1EC; // type:function size:0x334 -fn_8000E520 = .text:0x8000E520; // type:function size:0x8C -fn_8000E5AC = .text:0x8000E5AC; // type:function size:0xAC -fn_8000E658 = .text:0x8000E658; // type:function size:0x9C -fn_8000E6F4 = .text:0x8000E6F4; // type:function size:0x84 -fn_8000E778 = .text:0x8000E778; // type:function size:0x90 -fn_8000E808 = .text:0x8000E808; // type:function size:0xAC -fn_8000E8B4 = .text:0x8000E8B4; // type:function size:0xAC -fn_8000E960 = .text:0x8000E960; // type:function size:0x60 -fn_8000E9C0 = .text:0x8000E9C0; // type:function size:0x5C -fn_8000EA1C = .text:0x8000EA1C; // type:function size:0x60 -fn_8000EA7C = .text:0x8000EA7C; // type:function size:0x64 -fn_8000EAE0 = .text:0x8000EAE0; // type:function size:0x64 -fn_8000EB44 = .text:0x8000EB44; // type:function size:0x4C -fn_8000EB90 = .text:0x8000EB90; // type:function size:0xF0 -fn_8000EC80 = .text:0x8000EC80; // type:function size:0x9C -fn_8000ED1C = .text:0x8000ED1C; // type:function size:0x9C -fn_8000EDB8 = .text:0x8000EDB8; // type:function size:0x98 -fn_8000EE50 = .text:0x8000EE50; // type:function size:0x9C -fn_8000EEEC = .text:0x8000EEEC; // type:function size:0xC0 -fn_8000EFAC = .text:0x8000EFAC; // type:function size:0x8C -fn_8000F038 = .text:0x8000F038; // type:function size:0x50 -fn_8000F088 = .text:0x8000F088; // type:function size:0x4C -fn_8000F0D4 = .text:0x8000F0D4; // type:function size:0xAC -fn_8000F180 = .text:0x8000F180; // type:function size:0x58 -fn_8000F1D8 = .text:0x8000F1D8; // type:function size:0x1FC -fn_8000F3D4 = .text:0x8000F3D4; // type:function size:0x68 -fn_8000F43C = .text:0x8000F43C; // type:function size:0x50 -fn_8000F48C = .text:0x8000F48C; // type:function size:0x214 -fn_8000F6A0 = .text:0x8000F6A0; // type:function size:0x158 -fn_8000F7F8 = .text:0x8000F7F8; // type:function size:0xECC -fn_800106C4 = .text:0x800106C4; // type:function size:0x29C -fn_80010960 = .text:0x80010960; // type:function size:0x58 -fn_800109B8 = .text:0x800109B8; // type:function size:0x178 +HuSprInit = .text:0x8000D348; // type:function size:0xA0 +HuSprClose = .text:0x8000D3E8; // type:function size:0xB0 +HuSprExec = .text:0x8000D498; // type:function size:0x64 +HuSprBegin = .text:0x8000D4FC; // type:function size:0x188 +HuSprOrderEntry = .text:0x8000D684; // type:function size:0x14C +HuSprCall = .text:0x8000D7D0; // type:function size:0xF4 +HuSprFinish = .text:0x8000D8C4; // type:function size:0x458 +HuSprPauseSet = .text:0x8000DD1C; // type:function size:0x8 +HuSprAnimRead = .text:0x8000DD24; // type:function size:0x114 +HuSprAnimLock = .text:0x8000DE38; // type:function size:0x10 +HuSprCreate = .text:0x8000DE48; // type:function size:0x128 +HuSprFuncCreate = .text:0x8000DF70; // type:function size:0x188 +HuSprGrpCreate = .text:0x8000E0F8; // type:function size:0xF4 +HuSprGrpCopy = .text:0x8000E1EC; // type:function size:0x334 +HuSprGrpMemberSet = .text:0x8000E520; // type:function size:0x8C +HuSprGrpMemberKill = .text:0x8000E5AC; // type:function size:0xAC +HuSprGrpKill = .text:0x8000E658; // type:function size:0x9C +HuSprKill = .text:0x8000E6F4; // type:function size:0x84 +HuSprAnimKill = .text:0x8000E778; // type:function size:0x90 +HuSprAttrSet = .text:0x8000E808; // type:function size:0xAC +HuSprAttrReset = .text:0x8000E8B4; // type:function size:0xAC +HuSprPosSet = .text:0x8000E960; // type:function size:0x60 +HuSprZRotSet = .text:0x8000E9C0; // type:function size:0x5C +HuSprScaleSet = .text:0x8000EA1C; // type:function size:0x60 +HuSprTPLvlSet = .text:0x8000EA7C; // type:function size:0x64 +HuSprColorSet = .text:0x8000EAE0; // type:function size:0x64 +HuSprSpeedSet = .text:0x8000EB44; // type:function size:0x4C +HuSprBankSet = .text:0x8000EB90; // type:function size:0xF0 +HuSprGrpPosSet = .text:0x8000EC80; // type:function size:0x9C +HuSprGrpCenterSet = .text:0x8000ED1C; // type:function size:0x9C +HuSprGrpZRotSet = .text:0x8000EDB8; // type:function size:0x98 +HuSprGrpScaleSet = .text:0x8000EE50; // type:function size:0x9C +HuSprGrpTPLvlSet = .text:0x8000EEEC; // type:function size:0xC0 +HuSprGrpDrawNoSet = .text:0x8000EFAC; // type:function size:0x8C +HuSprDrawNoSet = .text:0x8000F038; // type:function size:0x50 +HuSprPriSet = .text:0x8000F088; // type:function size:0x4C +HuSprGrpScissorSet = .text:0x8000F0D4; // type:function size:0xAC +HuSprScissorSet = .text:0x8000F180; // type:function size:0x58 +HuSprAnimMake = .text:0x8000F1D8; // type:function size:0x1FC +HuSprBGSet = .text:0x8000F3D4; // type:function size:0x68 +HuSprSprBGSet = .text:0x8000F43C; // type:function size:0x50 +AnimDebug = .text:0x8000F48C; // type:function size:0x214 +HuSprDispInit = .text:0x8000F6A0; // type:function size:0x158 +HuSprDisp = .text:0x8000F7F8; // type:function size:0xECC +HuSprTexLoad = .text:0x800106C4; // type:function size:0x29C +HuSprExecLayerSet = .text:0x80010960; // type:function size:0x58 +HuSprLayerHook = .text:0x800109B8; // type:function size:0x178 fn_80010B30 = .text:0x80010B30; // type:function size:0xB0 fn_80010BE0 = .text:0x80010BE0; // type:function size:0xA0 fn_80010C80 = .text:0x80010C80; // type:function size:0xC8 @@ -4847,7 +4847,7 @@ fcoltbl = .data:0x80122140; // type:object size:0x40 align:32 lbl_80122180 = .data:0x80122180; // type:object size:0x1F data:string lbl_8012219F = .data:0x8012219F; // type:object size:0x31 lbl_801221D0 = .data:0x801221D0; // type:object size:0x12 -lbl_801221E2 = .data:0x801221E2; // type:object size:0x10E +bitSizeTbl = .data:0x801221E2; // type:object size:0x10E scope:local jumptable_801222F0 = .data:0x801222F0; // type:object size:0x2C scope:local jumptable_80122320 = .data:0x80122320; // type:object size:0x28 scope:local jumptable_80122348 = .data:0x80122348; // type:object size:0x2C scope:local @@ -5360,11 +5360,11 @@ HeapTbl = .bss:0x80145A80; // type:object size:0x14 scope:local lbl_80145A98 = .bss:0x80145A98; // type:object size:0x6800 lbl_8014C298 = .bss:0x8014C298; // type:object size:0x100 data:byte lbl_8014C398 = .bss:0x8014C398; // type:object size:0xF8 -lbl_8014C490 = .bss:0x8014C490; // type:object size:0x9600 -lbl_80155A90 = .bss:0x80155A90; // type:object size:0x5400 data:2byte -lbl_8015AE90 = .bss:0x8015AE90; // type:object size:0x1800 -lbl_8015C690 = .bss:0x8015C690; // type:object size:0x20 -lbl_8015C6B0 = .bss:0x8015C6B0; // type:object size:0x10 +HuSprData = .bss:0x8014C490; // type:object size:0x9600 +HuSprGrpData = .bss:0x80155A90; // type:object size:0x5400 data:2byte +HuSprOrder = .bss:0x8015AE90; // type:object size:0x1800 +bmpNoCC = .bss:0x8015C690; // type:object size:0x20 +HuSprLayerDrawNo = .bss:0x8015C6B0; // type:object size:0x10 lbl_8015C6C0 = .bss:0x8015C6C0; // type:object size:0x80 lbl_8015C740 = .bss:0x8015C740; // type:object size:0x240 lbl_8015C980 = .bss:0x8015C980; // type:object size:0x300 data:byte @@ -5962,10 +5962,10 @@ lbl_801D3B38 = .sbss:0x801D3B38; // type:object size:0x4 data:4byte lbl_801D3B3C = .sbss:0x801D3B3C; // type:object size:0x2 data:2byte lbl_801D3B40 = .sbss:0x801D3B40; // type:object size:0x4 data:4byte lbl_801D3B44 = .sbss:0x801D3B44; // type:object size:0x4 data:4byte -lbl_801D3B48 = .sbss:0x801D3B48; // type:object size:0x4 data:4byte -lbl_801D3B4C = .sbss:0x801D3B4C; // type:object size:0x2 data:2byte -lbl_801D3B4E = .sbss:0x801D3B4E; // type:object size:0x2 data:2byte -lbl_801D3B50 = .sbss:0x801D3B50; // type:object size:0x8 data:2byte +HuSprPauseF = .sbss:0x801D3B48; // type:object size:0x4 data:4byte +HuSprOrderNo = .sbss:0x801D3B4C; // type:object size:0x2 data:2byte +HuSprOrderNum = .sbss:0x801D3B4E; // type:object size:0x2 data:2byte +bmpCCIdx = .sbss:0x801D3B50; // type:object size:0x8 data:2byte lbl_801D3B58 = .sbss:0x801D3B58; // type:object size:0x4 data:4byte lbl_801D3B5C = .sbss:0x801D3B5C; // type:object size:0x4 data:4byte lbl_801D3B60 = .sbss:0x801D3B60; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index c86dab57..7a49715c 100755 --- a/configure.py +++ b/configure.py @@ -224,6 +224,8 @@ config.libs = [ "objects": [ Object(Matching, "game/malloc.c"), Object(Matching, "game/memory.c"), + Object(NonMatching, "game/sprman.c"), + Object(NonMatching, "game/sprput.c"), ], }, {