Split staffDll and selmenuDll

This commit is contained in:
gamemasterplc 2023-12-30 15:01:28 -06:00
parent 863b4c50ac
commit 4fc890c362
7 changed files with 122 additions and 83 deletions

View file

@ -5,3 +5,12 @@ Sections:
.rodata type:rodata align:8 .rodata type:rodata align:8
.data type:data align:8 .data type:data align:8
.bss type:bss align:8 .bss type:bss align:8
REL/executor.c:
.text start:0x00000000 end:0x000000A0
REL/selmenuDll/selmenuDll.c:
.text start:0x000000A0 end:0x00005198
.rodata start:0x00000000 end:0x00000084
.data start:0x00000000 end:0x00000B3F
.bss start:0x00000000 end:0x00000098

View file

@ -1,28 +1,28 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global _prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global
fn_1_A0 = .text:0x000000A0; // type:function size:0x4B8 ModuleProlog = .text:0x000000A0; // type:function size:0x4B8
fn_1_558 = .text:0x00000558; // type:function size:0x60 CopyPlayerCfg = .text:0x00000558; // type:function size:0x60 scope:local
fn_1_5B8 = .text:0x000005B8; // type:function size:0x324 CalcBtns = .text:0x000005B8; // type:function size:0x324 scope:local
fn_1_8DC = .text:0x000008DC; // type:function size:0x170 DrawPage = .text:0x000008DC; // type:function size:0x170 scope:local
fn_1_A4C = .text:0x00000A4C; // type:function size:0x180 MoveChar = .text:0x00000A4C; // type:function size:0x180 scope:local
fn_1_BCC = .text:0x00000BCC; // type:function size:0x88 MoveCursor = .text:0x00000BCC; // type:function size:0x88 scope:local
fn_1_C54 = .text:0x00000C54; // type:function size:0x474 SMInit = .text:0x00000C54; // type:function size:0x474 scope:local
fn_1_10C8 = .text:0x000010C8; // type:function size:0xA78 SMUpdate = .text:0x000010C8; // type:function size:0xA78 scope:local
fn_1_1B40 = .text:0x00001B40; // type:function size:0x334 SMCfgUpdate = .text:0x00001B40; // type:function size:0x334 scope:local
fn_1_1E74 = .text:0x00001E74; // type:function size:0x110 SMComCharGet = .text:0x00001E74; // type:function size:0x110 scope:local
fn_1_1F84 = .text:0x00001F84; // type:function size:0x50 SMCharKill = .text:0x00001F84; // type:function size:0x50 scope:local
fn_1_1FD4 = .text:0x00001FD4; // type:function size:0x10C fn_1_1FD4 = .text:0x00001FD4; // type:function size:0x10C
fn_1_20E0 = .text:0x000020E0; // type:function size:0x1F8 SMCharInit = .text:0x000020E0; // type:function size:0x1F8 scope:local
fn_1_22D8 = .text:0x000022D8; // type:function size:0xD6C SMCharUpdate = .text:0x000022D8; // type:function size:0xD6C scope:local
fn_1_3044 = .text:0x00003044; // type:function size:0x2FC SMExit = .text:0x00003044; // type:function size:0x2FC scope:local
fn_1_3340 = .text:0x00003340; // type:function size:0x804 SMPlayerCfgDraw = .text:0x00003340; // type:function size:0x804 scope:local
fn_1_3B44 = .text:0x00003B44; // type:function size:0x40 SMPlayerCfgInit = .text:0x00003B44; // type:function size:0x40 scope:local
fn_1_3B84 = .text:0x00003B84; // type:function size:0x968 SMPlayerCfgUpdate = .text:0x00003B84; // type:function size:0x968 scope:local
fn_1_44EC = .text:0x000044EC; // type:function size:0x20 SMRand8Tick = .text:0x000044EC; // type:function size:0x20 scope:local
fn_1_450C = .text:0x0000450C; // type:function size:0x4 fn_1_450C = .text:0x0000450C; // type:function size:0x4
fn_1_4510 = .text:0x00004510; // type:function size:0x64 SMSound3DInit = .text:0x00004510; // type:function size:0x64 scope:local
fn_1_4574 = .text:0x00004574; // type:function size:0x854 SMSound3DUpdate = .text:0x00004574; // type:function size:0x854 scope:local
fn_1_4DC8 = .text:0x00004DC8; // type:function size:0x3D0 SMSound3DDraw = .text:0x00004DC8; // type:function size:0x3D0 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte _ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float
@ -56,7 +56,7 @@ lbl_1_data_18 = .data:0x00000018; // type:object size:0x6 data:string
lbl_1_data_1E = .data:0x0000001E; // type:object size:0x7 data:string lbl_1_data_1E = .data:0x0000001E; // type:object size:0x7 data:string
lbl_1_data_25 = .data:0x00000025; // type:object size:0x6 data:string lbl_1_data_25 = .data:0x00000025; // type:object size:0x6 data:string
lbl_1_data_2B = .data:0x0000002B; // type:object size:0x9 lbl_1_data_2B = .data:0x0000002B; // type:object size:0x9
lbl_1_data_34 = .data:0x00000034; // type:object size:0x20 charTbl = .data:0x00000034; // type:object size:0x20 scope:local
lbl_1_data_54 = .data:0x00000054; // type:object size:0x14 data:string lbl_1_data_54 = .data:0x00000054; // type:object size:0x14 data:string
lbl_1_data_68 = .data:0x00000068; // type:object size:0x16 data:string lbl_1_data_68 = .data:0x00000068; // type:object size:0x16 data:string
lbl_1_data_7E = .data:0x0000007E; // type:object size:0x11 data:string lbl_1_data_7E = .data:0x0000007E; // type:object size:0x11 data:string
@ -127,8 +127,8 @@ lbl_1_data_4B6 = .data:0x000004B6; // type:object size:0xE data:string
lbl_1_data_4C4 = .data:0x000004C4; // type:object size:0xE data:string lbl_1_data_4C4 = .data:0x000004C4; // type:object size:0xE data:string
lbl_1_data_4D2 = .data:0x000004D2; // type:object size:0xA data:string lbl_1_data_4D2 = .data:0x000004D2; // type:object size:0xA data:string
lbl_1_data_4DC = .data:0x000004DC; // type:object size:0x10 lbl_1_data_4DC = .data:0x000004DC; // type:object size:0x10
lbl_1_data_4EC = .data:0x000004EC; // type:object size:0x348 menuTbl = .data:0x000004EC; // type:object size:0x348 scope:local
lbl_1_data_834 = .data:0x00000834; // type:object size:0x28 lbl_1_data_844 = .data:0x00000834; // type:object size:0x18
lbl_1_data_85C = .data:0x0000085C; // type:object size:0x12 data:string lbl_1_data_85C = .data:0x0000085C; // type:object size:0x12 data:string
lbl_1_data_86E = .data:0x0000086E; // type:object size:0x12 data:string lbl_1_data_86E = .data:0x0000086E; // type:object size:0x12 data:string
lbl_1_data_880 = .data:0x00000880; // type:object size:0x12 data:string lbl_1_data_880 = .data:0x00000880; // type:object size:0x12 data:string
@ -136,18 +136,19 @@ lbl_1_data_892 = .data:0x00000892; // type:object size:0x12 data:string
lbl_1_data_8A4 = .data:0x000008A4; // type:object size:0x12 data:string lbl_1_data_8A4 = .data:0x000008A4; // type:object size:0x12 data:string
lbl_1_data_8B6 = .data:0x000008B6; // type:object size:0x12 data:string lbl_1_data_8B6 = .data:0x000008B6; // type:object size:0x12 data:string
lbl_1_data_8C8 = .data:0x000008C8; // type:object size:0x11 data:string lbl_1_data_8C8 = .data:0x000008C8; // type:object size:0x11 data:string
lbl_1_data_8D9 = .data:0x000008D9; // type:object size:0x23 lbl_1_data_8D9 = .data:0x000008D9; // type:object size:0x3
lbl_1_data_8FC = .data:0x000008FC; // type:object size:0x2 data:2byte sndTable = .data:0x000008DC; // type:object size:0x20 scope:local
lbl_1_data_8FE = .data:0x000008FE; // type:object size:0x8 cursorPosBackup = .data:0x000008FC; // type:object size:0x2 data:2byte
btnPrev = .data:0x000008FE; // type:object size:0x8 scope:local
lbl_1_data_906 = .data:0x00000906; // type:object size:0x12 lbl_1_data_906 = .data:0x00000906; // type:object size:0x12
lbl_1_data_918 = .data:0x00000918; // type:object size:0x4 data:4byte funcNameStr = .data:0x00000918; // type:object size:0x4 scope:local data:4byte
lbl_1_data_91C = .data:0x0000091C; // type:object size:0x12 data:string lbl_1_data_91C = .data:0x0000091C; // type:object size:0x12 data:string
lbl_1_data_92E = .data:0x0000092E; // type:object size:0x24 data:string lbl_1_data_92E = .data:0x0000092E; // type:object size:0x24 data:string
lbl_1_data_952 = .data:0x00000952; // type:object size:0xB data:string lbl_1_data_952 = .data:0x00000952; // type:object size:0xB data:string
lbl_1_data_95D = .data:0x0000095D; // type:object size:0x3 data:string lbl_1_data_95D = .data:0x0000095D; // type:object size:0x3 data:string
lbl_1_data_960 = .data:0x00000960; // type:object size:0x10 lbl_1_data_960 = .data:0x00000960; // type:object size:0x10
lbl_1_data_970 = .data:0x00000970; // type:object size:0x20 charMdlTbl = .data:0x00000970; // type:object size:0x20 scope:local
lbl_1_data_990 = .data:0x00000990; // type:object size:0x20 charMdlAnimTbl = .data:0x00000990; // type:object size:0x20 scope:local
lbl_1_data_9B0 = .data:0x000009B0; // type:object size:0xD data:string lbl_1_data_9B0 = .data:0x000009B0; // type:object size:0xD data:string
lbl_1_data_9BD = .data:0x000009BD; // type:object size:0x5 lbl_1_data_9BD = .data:0x000009BD; // type:object size:0x5
lbl_1_data_9C2 = .data:0x000009C2; // type:object size:0x5 lbl_1_data_9C2 = .data:0x000009C2; // type:object size:0x5
@ -158,7 +159,7 @@ lbl_1_data_9E0 = .data:0x000009E0; // type:object size:0xA data:string
lbl_1_data_9EA = .data:0x000009EA; // type:object size:0x9 data:string lbl_1_data_9EA = .data:0x000009EA; // type:object size:0x9 data:string
lbl_1_data_9F3 = .data:0x000009F3; // type:object size:0x9 data:string lbl_1_data_9F3 = .data:0x000009F3; // type:object size:0x9 data:string
lbl_1_data_9FC = .data:0x000009FC; // type:object size:0xC lbl_1_data_9FC = .data:0x000009FC; // type:object size:0xC
lbl_1_data_A08 = .data:0x00000A08; // type:object size:0x14 data:4byte padCfgStrTbl = .data:0x00000A08; // type:object size:0x14 scope:local data:4byte
lbl_1_data_A1C = .data:0x00000A1C; // type:object size:0x6 data:string lbl_1_data_A1C = .data:0x00000A1C; // type:object size:0x6 data:string
lbl_1_data_A22 = .data:0x00000A22; // type:object size:0x4 data:string lbl_1_data_A22 = .data:0x00000A22; // type:object size:0x4 data:string
lbl_1_data_A26 = .data:0x00000A26; // type:object size:0x5 data:string lbl_1_data_A26 = .data:0x00000A26; // type:object size:0x5 data:string
@ -178,24 +179,24 @@ lbl_1_data_AEC = .data:0x00000AEC; // type:object size:0x15 data:string
lbl_1_data_B01 = .data:0x00000B01; // type:object size:0x15 data:string lbl_1_data_B01 = .data:0x00000B01; // type:object size:0x15 data:string
lbl_1_data_B16 = .data:0x00000B16; // type:object size:0x15 data:string lbl_1_data_B16 = .data:0x00000B16; // type:object size:0x15 data:string
lbl_1_data_B2B = .data:0x00000B2B; // type:object size:0x14 data:string lbl_1_data_B2B = .data:0x00000B2B; // type:object size:0x14 data:string
lbl_1_bss_2 = .bss:0x00000002; // type:object size:0x2 data:2byte sound3DCursorPos = .bss:0x00000002; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x2 data:2byte emiCompVal = .bss:0x00000004; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_6 = .bss:0x00000006; // type:object size:0x2 data:2byte emiCompDataNo = .bss:0x00000006; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x2 data:2byte playerCfgField = .bss:0x00000008; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_A = .bss:0x0000000A; // type:object size:0x2 data:2byte playerCfgPos = .bss:0x0000000A; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x2 data:2byte playerCfgSelF = .bss:0x0000000C; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_E = .bss:0x0000000E; // type:object size:0x10 charSelDisallowF = .bss:0x0000000E; // type:object size:0x10 scope:local
lbl_1_bss_1E = .bss:0x0000001E; // type:object size:0x8 playerCharSelF = .bss:0x0000001E; // type:object size:0x8 scope:local
lbl_1_bss_26 = .bss:0x00000026; // type:object size:0x10 charModelID = .bss:0x00000026; // type:object size:0x10 scope:local
lbl_1_bss_36 = .bss:0x00000036; // type:object size:0x8 bntReleaseAll = .bss:0x00000036; // type:object size:0x8 scope:local
lbl_1_bss_3E = .bss:0x0000003E; // type:object size:0x8 btnAll = .bss:0x0000003E; // type:object size:0x8 scope:local
lbl_1_bss_46 = .bss:0x00000046; // type:object size:0x8 btnDownAll = .bss:0x00000046; // type:object size:0x8 scope:local
lbl_1_bss_4E = .bss:0x0000004E; // type:object size:0x2 data:2byte btnReleaseCurr = .bss:0x0000004E; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x2 data:2byte btnCurr = .bss:0x00000050; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_52 = .bss:0x00000052; // type:object size:0x2 data:2byte btnDownCurr = .bss:0x00000052; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x2 data:2byte smSelectPos = .bss:0x00000054; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_56 = .bss:0x00000056; // type:object size:0x2A data:2byte smPlayerCfg = .bss:0x00000056; // type:object size:0x28 scope:local data:2byte
lbl_1_bss_80 = .bss:0x00000080; // type:object size:0x4 data:4byte outViewObj = .bss:0x00000080; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_84 = .bss:0x00000084; // type:object size:0x4 data:4byte smMainObj = .bss:0x00000084; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_88 = .bss:0x00000088; // type:object size:0xE smPagePos = .bss:0x00000088; // type:object size:0xE scope:local
lbl_1_bss_96 = .bss:0x00000096; // type:object size:0x2 data:2byte smPage = .bss:0x00000096; // type:object size:0x2 scope:local data:2byte

View file

@ -5,3 +5,12 @@ Sections:
.rodata type:rodata align:8 .rodata type:rodata align:8
.data type:data align:8 .data type:data align:8
.bss type:bss align:8 .bss type:bss align:8
REL/executor.c:
.text start:0x00000000 end:0x000000A0
REL/staffDll/staffDll.c:
.text start:0x000000A0 end:0x00001290
.rodata start:0x00000000 end:0x00000094
.data start:0x00000000 end:0x00001178
.bss start:0x00000000 end:0x0000004A

View file

@ -1,12 +1,12 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global _prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global
fn_1_A0 = .text:0x000000A0; // type:function size:0x218 ModuleProlog = .text:0x000000A0; // type:function size:0x218
fn_1_2B8 = .text:0x000002B8; // type:function size:0x60 ExitProc = .text:0x000002B8; // type:function size:0x60 scope:local
fn_1_318 = .text:0x00000318; // type:function size:0x3DC CreateStaff = .text:0x00000318; // type:function size:0x3DC scope:local
fn_1_6F4 = .text:0x000006F4; // type:function size:0x3AC MoveStaff = .text:0x000006F4; // type:function size:0x3AC scope:local
fn_1_AA0 = .text:0x00000AA0; // type:function size:0x12C HidePicture = .text:0x00000AA0; // type:function size:0x12C scope:local
fn_1_BCC = .text:0x00000BCC; // type:function size:0x1C4 ShowPicture = .text:0x00000BCC; // type:function size:0x1C4 scope:local
fn_1_D90 = .text:0x00000D90; // type:function size:0x500 MainProc = .text:0x00000D90; // type:function size:0x500 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte _ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float
@ -42,13 +42,13 @@ lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 data:float
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x1158 staffData = .data:0x00000000; // type:object size:0x1158 scope:local
lbl_1_data_1158 = .data:0x00001158; // type:object size:0xC data:float staffLogoPosTbl = .data:0x00001158; // type:object size:0xC scope:local data:float
lbl_1_data_1164 = .data:0x00001164; // type:object size:0x14 data:string lbl_1_data_1164 = .data:0x00001164; // type:object size:0x14 data:string
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte multiViewObj = .bss:0x00000000; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte currImg = .bss:0x00000004; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte staffSide = .bss:0x00000008; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x2 data:2byte thpCoverGroup = .bss:0x0000000C; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_E = .bss:0x0000000E; // type:object size:0x2 data:2byte thpGroup = .bss:0x0000000E; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x6 data:2byte staffLogoGroup = .bss:0x00000010; // type:object size:0x6 scope:local data:2byte
lbl_1_bss_16 = .bss:0x00000016; // type:object size:0x34 data:2byte imgGroup = .bss:0x00000016; // type:object size:0x34 scope:local data:2byte

View file

@ -11,7 +11,7 @@ lbl_1_data_0 = .data:0x00000000; // type:object size:0x8 scope:local data:string
lbl_1_data_8 = .data:0x00000008; // type:object size:0x8 scope:local data:string lbl_1_data_8 = .data:0x00000008; // type:object size:0x8 scope:local data:string
lbl_1_data_10 = .data:0x00000010; // type:object size:0x8 scope:local data:string lbl_1_data_10 = .data:0x00000010; // type:object size:0x8 scope:local data:string
lbl_1_data_18 = .data:0x00000018; // type:object size:0x8 scope:local data:string lbl_1_data_18 = .data:0x00000018; // type:object size:0x8 scope:local data:string
player_numstr = .data:0x00000020; // type:object size:0x10 scope:local playerNumTbl = .data:0x00000020; // type:object size:0x10 scope:local
lbl_1_data_30 = .data:0x00000030; // type:object size:0x6 scope:local data:string lbl_1_data_30 = .data:0x00000030; // type:object size:0x6 scope:local data:string
lbl_1_data_36 = .data:0x00000036; // type:object size:0x6 scope:local data:string lbl_1_data_36 = .data:0x00000036; // type:object size:0x6 scope:local data:string
lbl_1_data_3C = .data:0x0000003C; // type:object size:0x6 scope:local data:string lbl_1_data_3C = .data:0x0000003C; // type:object size:0x6 scope:local data:string
@ -20,7 +20,7 @@ lbl_1_data_48 = .data:0x00000048; // type:object size:0x6 scope:local data:strin
lbl_1_data_4E = .data:0x0000004E; // type:object size:0x7 scope:local data:string lbl_1_data_4E = .data:0x0000004E; // type:object size:0x7 scope:local data:string
lbl_1_data_55 = .data:0x00000055; // type:object size:0x6 scope:local data:string lbl_1_data_55 = .data:0x00000055; // type:object size:0x6 scope:local data:string
lbl_1_data_5B = .data:0x0000005B; // type:object size:0x9 scope:local lbl_1_data_5B = .data:0x0000005B; // type:object size:0x9 scope:local
character_str = .data:0x00000064; // type:object size:0x20 scope:local charNameTbl = .data:0x00000064; // type:object size:0x20 scope:local
lbl_1_data_84 = .data:0x00000084; // type:object size:0x1 scope:local lbl_1_data_84 = .data:0x00000084; // type:object size:0x1 scope:local
lbl_1_data_85 = .data:0x00000085; // type:object size:0x6 scope:local data:string lbl_1_data_85 = .data:0x00000085; // type:object size:0x6 scope:local data:string
lbl_1_data_8B = .data:0x0000008B; // type:object size:0x8 scope:local data:string lbl_1_data_8B = .data:0x0000008B; // type:object size:0x8 scope:local data:string
@ -28,6 +28,6 @@ lbl_1_data_93 = .data:0x00000093; // type:object size:0x7 scope:local data:strin
lbl_1_data_9A = .data:0x0000009A; // type:object size:0x7 scope:local data:string lbl_1_data_9A = .data:0x0000009A; // type:object size:0x7 scope:local data:string
lbl_1_data_A1 = .data:0x000000A1; // type:object size:0x6 scope:local data:string lbl_1_data_A1 = .data:0x000000A1; // type:object size:0x6 scope:local data:string
lbl_1_data_A7 = .data:0x000000A7; // type:object size:0x9 scope:local lbl_1_data_A7 = .data:0x000000A7; // type:object size:0x9 scope:local
ext_character_str = .data:0x000000B0; // type:object size:0x1C scope:local extCharNameTbl = .data:0x000000B0; // type:object size:0x1C scope:local
lbl_1_data_CC = .data:0x000000CC; // type:object size:0x15 scope:local data:string lbl_1_data_CC = .data:0x000000CC; // type:object size:0x15 scope:local data:string
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 scope:local data:byte dirPlayer = .bss:0x00000000; // type:object size:0x4 scope:local data:byte

View file

@ -789,6 +789,26 @@ config.libs = [
Object(Matching, "REL/subchrselDll/subchrselDll.c"), Object(Matching, "REL/subchrselDll/subchrselDll.c"),
], ],
}, },
{
"lib": "staffDll",
"mw_version": config.linker_version,
"cflags": cflags_rel,
"host": False,
"objects": [
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/staffDll/staffDll.c"),
],
},
{
"lib": "selmenuDll",
"mw_version": config.linker_version,
"cflags": cflags_rel,
"host": False,
"objects": [
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/selmenuDll/selmenuDll.c"),
],
},
{ {
"lib": "w10Dll", "lib": "w10Dll",
"mw_version": config.linker_version, "mw_version": config.linker_version,

View file

@ -8,16 +8,16 @@
static void SubchrMain(void); static void SubchrMain(void);
static u8 cur_direction[4]; static u8 dirPlayer[4];
static char *player_numstr[4] = { static char *playerNumTbl[4] = {
"PLAYER1", "PLAYER1",
"PLAYER2", "PLAYER2",
"PLAYER3", "PLAYER3",
"PLAYER4" "PLAYER4"
}; };
static char *character_str[8] = { static char *charNameTbl[8] = {
"MARIO", "MARIO",
"LUIGI", "LUIGI",
"PEACH", "PEACH",
@ -28,7 +28,7 @@ static char *character_str[8] = {
"WALUIGI" "WALUIGI"
}; };
static char *ext_character_str[7] = { static char *extCharNameTbl[7] = {
"", "",
"KOOPA", "KOOPA",
"KINOPIO", "KINOPIO",
@ -51,7 +51,7 @@ static u16 GetBtns(void)
u16 btns; u16 btns;
btns = HuPadBtnDown[0]; btns = HuPadBtnDown[0];
if (cur_direction[0] != HuPadDStk[0]) { if (dirPlayer[0] != HuPadDStk[0]) {
btns |= HuPadDStk[0]; btns |= HuPadDStk[0];
} }
return btns; return btns;
@ -65,7 +65,7 @@ static void SubchrMain()
for(i=0; i<4; i++) { for(i=0; i<4; i++) {
character[i] = GWPlayerCfg[i].character; character[i] = GWPlayerCfg[i].character;
ext_character[i] = 0; ext_character[i] = 0;
cur_direction[i] = 0; dirPlayer[i] = 0;
} }
cursor_pos = 0; cursor_pos = 0;
while(1) { while(1) {
@ -77,16 +77,16 @@ static void SubchrMain()
y = 120; y = 120;
for(i=0; i<4; i++, y += 16) { for(i=0; i<4; i++, y += 16) {
fontcolor = FONT_COLOR_GREEN; fontcolor = FONT_COLOR_GREEN;
print8(x, y, 2.0f, player_numstr[i]); print8(x, y, 2.0f, playerNumTbl[i]);
if(i == cursor_pos) { if(i == cursor_pos) {
fontcolor = FONT_COLOR_CYAN; fontcolor = FONT_COLOR_CYAN;
} else { } else {
fontcolor = FONT_COLOR_GREEN; fontcolor = FONT_COLOR_GREEN;
} }
if(ext_character[i] != 0) { if(ext_character[i] != 0) {
print8(x+200, y, 2.0f, ext_character_str[ext_character[i]]); print8(x+200, y, 2.0f, extCharNameTbl[ext_character[i]]);
} else { } else {
print8(x+200, y, 2.0f, character_str[character[i]]); print8(x+200, y, 2.0f, charNameTbl[character[i]]);
} }
} }
if(GetBtns() & PAD_BUTTON_START) { if(GetBtns() & PAD_BUTTON_START) {
@ -156,8 +156,8 @@ static void SubchrMain()
HuPrcVSleep(); HuPrcVSleep();
} while(1); } while(1);
} else { } else {
if(cur_direction[0] != HuPadDStk[0]) { if(dirPlayer[0] != HuPadDStk[0]) {
cur_direction[0] = HuPadDStk[0]; dirPlayer[0] = HuPadDStk[0];
} }
} }
} }