diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 25979f04..60b719ff 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -4133,7 +4133,7 @@ VolumeTable = .data:0x801311E8; // type:object size:0x100 scope:local lbl_801312E8 = .data:0x801312E8; // type:object size:0x4D lbl_80131335 = .data:0x80131335; // type:object size:0x1B mgInfoTbl = .data:0x80131350; // type:object size:0xE00 data:2byte -commentTbl = .data:0x80132150; // type:object size:0x40 scope:local +commentTbl = .data:0x80132150; // type:object size:0x40 scope:local data:string lbl_80132190 = .data:0x80132190; // type:object size:0xC data:string lbl_8013219C = .data:0x8013219C; // type:object size:0xC data:string lbl_801321A8 = .data:0x801321A8; // type:object size:0xC data:string @@ -4622,7 +4622,7 @@ wipeData = .bss:0x80192360; // type:object size:0x4C data:4byte winData = .bss:0x801923C0; // type:object size:0x3000 align:32 data:byte winKey = .bss:0x801953C0; // type:object size:0x10 winComKeyBuf = .bss:0x801953D0; // type:object size:0x1400 -ARInfo = .bss:0x801967E0; // type:object size:0x400 data:byte +ARInfo = .bss:0x801967E0; // type:object size:0x400 scope:local data:byte arqReq = .bss:0x80196BE0; // type:object size:0x20 scope:local ARQueBuf = .bss:0x80196C00; // type:object size:0x280 scope:local preLoadBuf = .bss:0x80196E80; // type:object size:0x40 scope:local align:32 diff --git a/config/GMPJ01_00/splits.txt b/config/GMPJ01_00/splits.txt index feb125b5..f9827915 100644 --- a/config/GMPJ01_00/splits.txt +++ b/config/GMPJ01_00/splits.txt @@ -237,7 +237,7 @@ game/wipe.c: game/window.c: .text start:0x80041E54 end:0x80047E88 .data start:0x8012FD20 end:0x80130268 - .bss start:0x80192060 end:0x80196470 + .bss start:0x80192060 end:0x80196480 .sdata start:0x801D3280 end:0x801D3288 .sbss start:0x801D3A70 end:0x801D3AB8 .sdata2 start:0x801D4BC0 end:0x801D4C58 @@ -249,3 +249,61 @@ game/card.c: .text start:0x80047F70 end:0x80048574 .data start:0x80130268 end:0x801302B8 .sbss start:0x801D3AB8 end:0x801D3AC0 + +game/armem.c: + .text start:0x80048574 end:0x800493E0 + .data start:0x801302B8 end:0x801303A8 + .bss start:0x80196480 end:0x80196B60 + .sbss start:0x801D3AC0 end:0x801D3AD0 + +game/chrman.c: + .text start:0x800493E0 end:0x8005074C + .data start:0x801303A8 end:0x80130DC8 + .bss start:0x80196B60 end:0x801972F0 + .sdata start:0x801D3288 end:0x801D32D0 + .sbss start:0x801D3AD0 end:0x801D3AD8 + .sdata2 start:0x801D4C58 end:0x801D4D90 + +game/mapspace.c: + .text start:0x8005074C end:0x800544F0 + .bss start:0x801972F0 end:0x80197760 + .sbss start:0x801D3AD8 end:0x801D3AF8 + .sdata2 start:0x801D4D90 end:0x801D4DC0 + +game/THPSimple.c: + .text start:0x800544F0 end:0x800565F4 + .data start:0x80130DC8 end:0x80130EC8 + .bss start:0x80197760 end:0x80197E40 + .sdata start:0x801D32D0 end:0x801D32D8 + .sbss start:0x801D3AF8 end:0x801D3B18 + .sdata2 start:0x801D4DC0 end:0x801D4DC8 + +game/THPDraw.c: + .text start:0x800565F4 end:0x80056F4C + .sdata2 start:0x801D4DC8 end:0x801D4DE0 + +game/thpmain.c: + .text start:0x80056F4C end:0x80057914 + .rodata start:0x8011D930 end:0x8011D940 + .data start:0x80130EC8 end:0x80130F30 + .bss start:0x80197E40 end:0x80197E80 + .sbss start:0x801D3B18 end:0x801D3B40 + .sdata2 start:0x801D4DE0 end:0x801D4DF8 + +game/objsub.c: + .text start:0x80057914 end:0x80057B00 + .data start:0x80130F30 end:0x80131D30 + .bss start:0x80197E80 end:0x801980B0 + .sbss start:0x801D3B40 end:0x801D3B68 + +game/flag.c: + .text start:0x80057B00 end:0x80057D18 + .bss start:0x801980B0 end:0x801980C0 + +game/saveload.c: + .text start:0x80057D18 end:0x8005A324 + .data start:0x80131D30 end:0x80131DE8 + .bss start:0x801980C0 end:0x8019C0E0 + .sdata start:0x801D32D8 end:0x801D32F0 + .sbss start:0x801D3B68 end:0x801D3B78 + .sdata2 start:0x801D4DF8 end:0x801D4E08 diff --git a/config/GMPJ01_00/symbols.txt b/config/GMPJ01_00/symbols.txt index 8bc3e8c0..2c706c69 100644 --- a/config/GMPJ01_00/symbols.txt +++ b/config/GMPJ01_00/symbols.txt @@ -4051,68 +4051,77 @@ winVoiceTbl = .data:0x8013019C; // type:object size:0x54 scope:local winPortraitTbl = .data:0x8013021C; // type:object size:0x4C scope:local lbl_80130268 = .data:0x80130268; // type:object size:0x26 scope:local data:string lbl_8013028E = .data:0x8013028E; // type:object size:0x2A scope:local -lbl_801302B8 = .data:0x801302B8; // type:object size:0x19 data:string -lbl_801302D1 = .data:0x801302D1; // type:object size:0x14 data:string -lbl_801302E5 = .data:0x801302E5; // type:object size:0x93 -lbl_80130378 = .data:0x80130378; // type:object size:0x30 -lbl_801303A8 = .data:0x801303A8; // type:object size:0x60 -lbl_80130408 = .data:0x80130408; // type:object size:0x60 -lbl_80130468 = .data:0x80130468; // type:object size:0x168 +lbl_801302B8 = .data:0x801302B8; // type:object size:0x19 scope:local data:string +lbl_801302D1 = .data:0x801302D1; // type:object size:0x14 scope:local data:string +lbl_801302E5 = .data:0x801302E5; // type:object size:0x93 scope:local +lbl_80130378 = .data:0x80130378; // type:object size:0x30 scope:local +effectDataTbl = .data:0x801303A8; // type:object size:0x60 scope:local +charDirTbl = .data:0x80130408; // type:object size:0x60 scope:local +effectDustParam = .data:0x80130468; // type:object size:0x38 scope:local +effectDotParam = .data:0x801304A0; // type:object size:0x38 scope:local +effectStarParam = .data:0x801304D8; // type:object size:0x38 scope:local +effectWarnParam = .data:0x80130510; // type:object size:0x38 scope:local +effectSmokeParam = .data:0x80130548; // type:object size:0x38 scope:local +lbl_801309A0 = .data:0x80130580; // type:object size:0x20 scope:local +lbl_801309C0 = .data:0x801305A0; // type:object size:0x20 scope:local +lbl_801309E0 = .data:0x801305C0; // type:object size:0x10 scope:local jumptable_801305D0 = .data:0x801305D0; // type:object size:0x1E8 scope:local -lbl_801307B8 = .data:0x801307B8; // type:object size:0x40 -lbl_801307F8 = .data:0x801307F8; // type:object size:0xE data:string -lbl_80130806 = .data:0x80130806; // type:object size:0xE data:string -lbl_80130814 = .data:0x80130814; // type:object size:0xE data:string -lbl_80130822 = .data:0x80130822; // type:object size:0xD data:string -lbl_8013082F = .data:0x8013082F; // type:object size:0xD data:string -lbl_8013083C = .data:0x8013083C; // type:object size:0xB data:string -lbl_80130847 = .data:0x80130847; // type:object size:0xF data:string -lbl_80130856 = .data:0x80130856; // type:object size:0xF data:string -lbl_80130865 = .data:0x80130865; // type:object size:0xF data:string -lbl_80130874 = .data:0x80130874; // type:object size:0xF data:string -lbl_80130883 = .data:0x80130883; // type:object size:0xF data:string -lbl_80130892 = .data:0x80130892; // type:object size:0xF data:string -lbl_801308A1 = .data:0x801308A1; // type:object size:0x9 data:string -lbl_801308AA = .data:0x801308AA; // type:object size:0xD data:string -lbl_801308B7 = .data:0x801308B7; // type:object size:0x17 data:string -lbl_801308CE = .data:0x801308CE; // type:object size:0x17 data:string -lbl_801308E5 = .data:0x801308E5; // type:object size:0xE data:string -lbl_801308F3 = .data:0x801308F3; // type:object size:0xE data:string -lbl_80130901 = .data:0x80130901; // type:object size:0xD data:string -lbl_8013090E = .data:0x8013090E; // type:object size:0xE data:string -lbl_8013091C = .data:0x8013091C; // type:object size:0xE data:string -lbl_8013092A = .data:0x8013092A; // type:object size:0xF data:string -lbl_80130939 = .data:0x80130939; // type:object size:0xF data:string -lbl_80130948 = .data:0x80130948; // type:object size:0x18 data:string -lbl_80130960 = .data:0x80130960; // type:object size:0x18 data:string -lbl_80130978 = .data:0x80130978; // type:object size:0xE data:string -lbl_80130986 = .data:0x80130986; // type:object size:0x18 data:string -lbl_8013099E = .data:0x8013099E; // type:object size:0x1A -lbl_801309B8 = .data:0x801309B8; // type:object size:0x100 -lbl_80130AB8 = .data:0x80130AB8; // type:object size:0xD data:string -lbl_80130AC5 = .data:0x80130AC5; // type:object size:0xD data:string -lbl_80130AD2 = .data:0x80130AD2; // type:object size:0xE data:string -lbl_80130AE0 = .data:0x80130AE0; // type:object size:0xE data:string -lbl_80130AEE = .data:0x80130AEE; // type:object size:0x12 -lbl_80130B00 = .data:0x80130B00; // type:object size:0xA0 -lbl_80130BA0 = .data:0x80130BA0; // type:object size:0x38 -lbl_80130BD8 = .data:0x80130BD8; // type:object size:0x38 -lbl_80130C10 = .data:0x80130C10; // type:object size:0x38 -lbl_80130C48 = .data:0x80130C48; // type:object size:0x38 -lbl_80130C80 = .data:0x80130C80; // type:object size:0x1C -lbl_80130C9C = .data:0x80130C9C; // type:object size:0x38 -lbl_80130CD4 = .data:0x80130CD4; // type:object size:0x38 -lbl_80130D0C = .data:0x80130D0C; // type:object size:0xBC -lbl_80130DC8 = .data:0x80130DC8; // type:object size:0x100 -lbl_80130EC8 = .data:0x80130EC8; // type:object size:0x4D -lbl_80130F15 = .data:0x80130F15; // type:object size:0x1B +voiceParam = .data:0x801307B8; // type:object size:0x40 scope:local +lbl_801307F8 = .data:0x801307F8; // type:object size:0xE scope:local data:string +lbl_80130806 = .data:0x80130806; // type:object size:0xE scope:local data:string +lbl_80130814 = .data:0x80130814; // type:object size:0xE scope:local data:string +lbl_80130822 = .data:0x80130822; // type:object size:0xD scope:local data:string +lbl_8013082F = .data:0x8013082F; // type:object size:0xD scope:local data:string +lbl_8013083C = .data:0x8013083C; // type:object size:0xB scope:local data:string +lbl_80130847 = .data:0x80130847; // type:object size:0xF scope:local data:string +lbl_80130856 = .data:0x80130856; // type:object size:0xF scope:local data:string +lbl_80130865 = .data:0x80130865; // type:object size:0xF scope:local data:string +lbl_80130874 = .data:0x80130874; // type:object size:0xF scope:local data:string +lbl_80130883 = .data:0x80130883; // type:object size:0xF scope:local data:string +lbl_80130892 = .data:0x80130892; // type:object size:0xF scope:local data:string +lbl_801308A1 = .data:0x801308A1; // type:object size:0x9 scope:local data:string +lbl_801308AA = .data:0x801308AA; // type:object size:0xD scope:local data:string +lbl_801308B7 = .data:0x801308B7; // type:object size:0x17 scope:local data:string +lbl_801308CE = .data:0x801308CE; // type:object size:0x17 scope:local data:string +lbl_801308E5 = .data:0x801308E5; // type:object size:0xE scope:local data:string +lbl_801308F3 = .data:0x801308F3; // type:object size:0xE scope:local data:string +lbl_80130901 = .data:0x80130901; // type:object size:0xD scope:local data:string +lbl_8013090E = .data:0x8013090E; // type:object size:0xE scope:local data:string +lbl_8013091C = .data:0x8013091C; // type:object size:0xE scope:local data:string +lbl_8013092A = .data:0x8013092A; // type:object size:0xF scope:local data:string +lbl_80130939 = .data:0x80130939; // type:object size:0xF scope:local data:string +lbl_80130948 = .data:0x80130948; // type:object size:0x18 scope:local data:string +lbl_80130960 = .data:0x80130960; // type:object size:0x18 scope:local data:string +lbl_80130978 = .data:0x80130978; // type:object size:0xE scope:local data:string +lbl_80130986 = .data:0x80130986; // type:object size:0x18 scope:local data:string +lbl_8013099E = .data:0x8013099E; // type:object size:0x1A scope:local +charTexNameTbl = .data:0x801309B8; // type:object size:0x100 +lbl_80130AB8 = .data:0x80130AB8; // type:object size:0xD scope:local data:string +lbl_80130AC5 = .data:0x80130AC5; // type:object size:0xD scope:local data:string +lbl_80130AD2 = .data:0x80130AD2; // type:object size:0xE scope:local data:string +lbl_80130AE0 = .data:0x80130AE0; // type:object size:0xE scope:local data:string +lbl_80130AEE = .data:0x80130AEE; // type:object size:0x10 scope:local data:string +hookNameTbl = .data:0x80130B00; // type:object size:0xA0 scope:local +modelParticleParam = .data:0x80130BA0; // type:object size:0x38 scope:local +coinParticleParam = .data:0x80130BD8; // type:object size:0x38 scope:local +lbl_80131030 = .data:0x80130C10; // type:object size:0x38 scope:local +lbl_80131068 = .data:0x80130C48; // type:object size:0x38 scope:local +@1294 = .data:0x80130C80; // type:object size:0x19 scope:local data:string +lbl_801310BC = .data:0x80130C9C; // type:object size:0x38 scope:local +lbl_801310F4 = .data:0x80130CD4; // type:object size:0x38 scope:local +@1315 = .data:0x80130D0C; // type:object size:0x1A scope:local data:string +lbl_80130D26 = .data:0x80130D26; // type:object size:0x12 scope:local data:string +lbl_80130D38 = .data:0x80130D38; // type:object size:0x12 scope:local data:string +VolumeTable = .data:0x80130DC8; // type:object size:0x100 scope:local +lbl_80130EC8 = .data:0x80130EC8; // type:object size:0x4D scope:local +lbl_80130F15 = .data:0x80130F15; // type:object size:0x1B scope:local mgInfoTbl = .data:0x80130F30; // type:object size:0xE00 data:2byte -lbl_80131D30 = .data:0x80131D30; // type:object size:0x40 -lbl_80131D70 = .data:0x80131D70; // type:object size:0x14 -lbl_80131D84 = .data:0x80131D84; // type:object size:0xC data:string -lbl_80131D90 = .data:0x80131D90; // type:object size:0xC data:string -lbl_80131D9C = .data:0x80131D9C; // type:object size:0xC data:string -lbl_80131DA8 = .data:0x80131DA8; // type:object size:0xC +commentTbl = .data:0x80131D30; // type:object size:0x40 scope:local data:byte +lbl_80131D70 = .data:0x80131D70; // type:object size:0x14 scope:local data:byte +lbl_80131D84 = .data:0x80131D84; // type:object size:0xC scope:local data:string +lbl_80131D90 = .data:0x80131D90; // type:object size:0xC scope:local data:string +lbl_80131D9C = .data:0x80131D9C; // type:object size:0xC scope:local data:string +SaveFileNameTbl = .data:0x80131DA8; // type:object size:0xC jumptable_80131DB4 = .data:0x80131DB4; // type:object size:0x34 scope:local lbl_80131E00 = .data:0x80131E00; // type:object size:0x20 lbl_80131E20 = .data:0x80131E20; // type:object size:0x13A0 @@ -4437,32 +4446,36 @@ wipeData = .bss:0x80192000; // type:object size:0x4C data:4byte winData = .bss:0x80192060; // type:object size:0x3000 data:byte winKey = .bss:0x80195060; // type:object size:0x10 winComKeyBuf = .bss:0x80195070; // type:object size:0x1400 -lbl_80196480 = .bss:0x80196480; // type:object size:0x400 data:byte -lbl_80196880 = .bss:0x80196880; // type:object size:0x20 -lbl_801968A0 = .bss:0x801968A0; // type:object size:0x2C0 -lbl_80196B60 = .bss:0x80196B60; // type:object size:0x640 -lbl_801971A0 = .bss:0x801971A0; // type:object size:0x10 data:2byte -lbl_801971B0 = .bss:0x801971B0; // type:object size:0x20 -lbl_801971D0 = .bss:0x801971D0; // type:object size:0x80 -lbl_80197250 = .bss:0x80197250; // type:object size:0xA0 -lbl_801972F0 = .bss:0x801972F0; // type:object size:0x40 -lbl_80197330 = .bss:0x80197330; // type:object size:0x60 -lbl_80197390 = .bss:0x80197390; // type:object size:0xC data:float -lbl_8019739C = .bss:0x8019739C; // type:object size:0xC data:float -lbl_801973A8 = .bss:0x801973A8; // type:object size:0x78 -lbl_80197420 = .bss:0x80197420; // type:object size:0x18C -lbl_801975AC = .bss:0x801975AC; // type:object size:0x180 -lbl_8019772C = .bss:0x8019772C; // type:object size:0x34 -lbl_80197760 = .bss:0x80197760; // type:object size:0x1A0 -lbl_80197900 = .bss:0x80197900; // type:object size:0x500 -lbl_80197E00 = .bss:0x80197E00; // type:object size:0x40 -lbl_80197E40 = .bss:0x80197E40; // type:object size:0x40 -lbl_80197E80 = .bss:0x80197E80; // type:object size:0x118 -lbl_80197F98 = .bss:0x80197F98; // type:object size:0x100 -lbl_80198098 = .bss:0x80198098; // type:object size:0x18 -lbl_801980B0 = .bss:0x801980B0; // type:object size:0x10 -lbl_801980C0 = .bss:0x801980C0; // type:object size:0x20 -lbl_801980E0 = .bss:0x801980E0; // type:object size:0x4000 +ARInfo = .bss:0x80196480; // type:object size:0x400 scope:local data:byte +arqReq = .bss:0x80196880; // type:object size:0x20 scope:local +ARQueBuf = .bss:0x801968A0; // type:object size:0x280 scope:local +preLoadBuf = .bss:0x80196B20; // type:object size:0x40 scope:local align:32 +charInstance = .bss:0x80196B60; // type:object size:0x640 scope:local +effectMdl = .bss:0x801971A0; // type:object size:0x10 scope:local data:2byte +particleData = .bss:0x801971B0; // type:object size:0x20 scope:local +itemHookProcess = .bss:0x801971D0; // type:object size:0x80 scope:local +lbl_801975B0 = .bss:0x80197250; // type:object size:0x10 scope:local +lbl_801975C0 = .bss:0x80197260; // type:object size:0x90 scope:local +MapObject = .bss:0x801972F0; // type:object size:0x40 +MapMT = .bss:0x80197330; // type:object size:0x30 +MapMTR = .bss:0x80197360; // type:object size:0x30 +MTRAdd = .bss:0x80197390; // type:object size:0xC scope:local data:float +FieldVec = .bss:0x8019739C; // type:object size:0xC scope:local data:float +ColisionIdx = .bss:0x801973A8; // type:object size:0x78 +HitFaceVec = .bss:0x80197420; // type:object size:0x180 +OldXYZ = .bss:0x801975A0; // type:object size:0xC scope:local +HitFace = .bss:0x801975AC; // type:object size:0x180 +CharObject = .bss:0x8019772C; // type:object size:0x30 +SimpleControl = .bss:0x80197760; // type:object size:0x1A0 +SoundBuffer = .bss:0x80197900; // type:object size:0x500 scope:local +WorkBuffer = .bss:0x80197E00; // type:object size:0x40 scope:local +THPFileName = .bss:0x80197E40; // type:object size:0x40 scope:local +mgGameStatBackup = .bss:0x80197E80; // type:object size:0x118 +mgIndexList = .bss:0x80197F98; // type:object size:0x100 +mgTicTacToeGrid = .bss:0x80198098; // type:object size:0x12 +_Sys_Flag = .bss:0x801980B0; // type:object size:0x10 scope:local +curFileInfo = .bss:0x801980C0; // type:object size:0x14 +saveBuf = .bss:0x801980E0; // type:object size:0x4000 lbl_8019C0E0 = .bss:0x8019C0E0; // type:object size:0x13A0 lbl_8019D480 = .bss:0x8019D480; // type:object size:0xC4 data:byte lbl_8019D544 = .bss:0x8019D544; // type:object size:0xC4 @@ -4703,22 +4716,22 @@ lbl_801D35D8 = .sdata:0x801D3270; // type:object size:0x8 colorN$226 = .sdata:0x801D3278; // type:object size:0x4 scope:local data:byte colorN$271 = .sdata:0x801D327C; // type:object size:0x4 scope:local data:byte winPrio = .sdata:0x801D3280; // type:object size:0x2 scope:local data:2byte -lbl_801D3288 = .sdata:0x801D3288; // type:object size:0x8 -lbl_801D3290 = .sdata:0x801D3290; // type:object size:0x8 -lbl_801D3298 = .sdata:0x801D3298; // type:object size:0x8 -lbl_801D32A0 = .sdata:0x801D32A0; // type:object size:0x8 -lbl_801D32A8 = .sdata:0x801D32A8; // type:object size:0x8 -lbl_801D32B0 = .sdata:0x801D32B0; // type:object size:0x1 -lbl_801D32B1 = .sdata:0x801D32B1; // type:object size:0x5 data:string -lbl_801D32B6 = .sdata:0x801D32B6; // type:object size:0x5 data:string -lbl_801D32BB = .sdata:0x801D32BB; // type:object size:0x8 data:string -lbl_801D32C3 = .sdata:0x801D32C3; // type:object size:0x6 data:string -lbl_801D32C9 = .sdata:0x801D32C9; // type:object size:0x7 -lbl_801D32D0 = .sdata:0x801D32D0; // type:object size:0x8 -lbl_801D32D8 = .sdata:0x801D32D8; // type:object size:0x4 data:4byte -lbl_801D32DC = .sdata:0x801D32DC; // type:object size:0x2 data:string -lbl_801D32DE = .sdata:0x801D32DE; // type:object size:0x2 data:string -lbl_801D32E0 = .sdata:0x801D32E0; // type:object size:0x8 +lbl_801D3288 = .sdata:0x801D3288; // type:object size:0x8 scope:local +lbl_801D3290 = .sdata:0x801D3290; // type:object size:0x8 scope:local +lbl_801D3298 = .sdata:0x801D3298; // type:object size:0x8 scope:local +lbl_801D32A0 = .sdata:0x801D32A0; // type:object size:0x8 scope:local +lbl_801D32A8 = .sdata:0x801D32A8; // type:object size:0x8 scope:local +lbl_801D32B0 = .sdata:0x801D32B0; // type:object size:0x1 scope:local +lbl_801D32B1 = .sdata:0x801D32B1; // type:object size:0x5 scope:local data:string +lbl_801D32B6 = .sdata:0x801D32B6; // type:object size:0x5 scope:local data:string +lbl_801D32BB = .sdata:0x801D32BB; // type:object size:0x8 scope:local data:string +lbl_801D32C3 = .sdata:0x801D32C3; // type:object size:0x6 scope:local data:string +lbl_801D32C9 = .sdata:0x801D32C9; // type:object size:0x7 scope:local +lbl_801D32D0 = .sdata:0x801D32D0; // type:object size:0x8 scope:local +saveEnableF = .sdata:0x801D32D8; // type:object size:0x4 data:4byte +@228 = .sdata:0x801D32DC; // type:object size:0x2 scope:local data:string +@229 = .sdata:0x801D32DE; // type:object size:0x2 scope:local data:string +SlotNameTbl = .sdata:0x801D32E0; // type:object size:0x8 scope:local lbl_801D32E8 = .sdata:0x801D32E8; // type:object size:0x3 lbl_801D32EB = .sdata:0x801D32EB; // type:object size:0x5 lbl_801D32F0 = .sdata:0x801D32F0; // type:object size:0x8 @@ -5157,48 +5170,48 @@ cursorAnim = .sbss:0x801D3AAC; // type:object size:0x4 scope:local data:4byte iconAnim = .sbss:0x801D3AB0; // type:object size:0x4 scope:local data:4byte UnMountCnt = .sbss:0x801D3AB8; // type:object size:0x1 data:byte cardWork = .sbss:0x801D3ABC; // type:object size:0x4 scope:local data:4byte -lbl_801D3AC0 = .sbss:0x801D3AC0; // type:object size:0x2 data:2byte -lbl_801D3AC4 = .sbss:0x801D3AC4; // type:object size:0x4 data:4byte -lbl_801D3AC8 = .sbss:0x801D3AC8; // type:object size:0x8 data:4byte -lbl_801D3AD0 = .sbss:0x801D3AD0; // type:object size:0x4 data:4byte -lbl_801D3AD4 = .sbss:0x801D3AD4; // type:object size:0x4 data:4byte -lbl_801D3AD8 = .sbss:0x801D3AD8; // type:object size:0x4 data:4byte -lbl_801D3ADC = .sbss:0x801D3ADC; // type:object size:0x4 data:4byte -lbl_801D3AE0 = .sbss:0x801D3AE0; // type:object size:0x4 data:4byte -lbl_801D3AE4 = .sbss:0x801D3AE4; // type:object size:0x4 data:4byte -lbl_801D3AE8 = .sbss:0x801D3AE8; // type:object size:0x4 -lbl_801D3AEC = .sbss:0x801D3AEC; // type:object size:0x4 data:4byte -lbl_801D3AF0 = .sbss:0x801D3AF0; // type:object size:0x4 data:float -lbl_801D3AF4 = .sbss:0x801D3AF4; // type:object size:0x4 data:float -lbl_801D3AF8 = .sbss:0x801D3AF8; // type:object size:0x4 data:4byte -lbl_801D3AFC = .sbss:0x801D3AFC; // type:object size:0x4 data:4byte -lbl_801D3B00 = .sbss:0x801D3B00; // type:object size:0x4 data:4byte -lbl_801D3B04 = .sbss:0x801D3B04; // type:object size:0x4 data:4byte -lbl_801D3B08 = .sbss:0x801D3B08; // type:object size:0x4 data:4byte -lbl_801D3B0C = .sbss:0x801D3B0C; // type:object size:0x4 data:4byte -lbl_801D3B10 = .sbss:0x801D3B10; // type:object size:0x8 data:4byte -lbl_801D3B18 = .sbss:0x801D3B18; // type:object size:0x4 data:4byte -lbl_801D3B1C = .sbss:0x801D3B1C; // type:object size:0x2 data:2byte -lbl_801D3B20 = .sbss:0x801D3B20; // type:object size:0x4 data:4byte -lbl_801D3B24 = .sbss:0x801D3B24; // type:object size:0x2 data:2byte -lbl_801D3B26 = .sbss:0x801D3B26; // type:object size:0x2 data:2byte -lbl_801D3B28 = .sbss:0x801D3B28; // type:object size:0x4 data:4byte -lbl_801D3B2C = .sbss:0x801D3B2C; // type:object size:0x4 data:4byte -lbl_801D3B30 = .sbss:0x801D3B30; // type:object size:0x4 data:4byte -lbl_801D3B34 = .sbss:0x801D3B34; // type:object size:0xC data:4byte -lbl_801D3B40 = .sbss:0x801D3B40; // type:object size:0x4 -lbl_801D3B44 = .sbss:0x801D3B44; // type:object size:0x4 +arqIdx = .sbss:0x801D3AC0; // type:object size:0x2 scope:local data:2byte +arqCnt = .sbss:0x801D3AC4; // type:object size:0x4 scope:local data:4byte +ARBase = .sbss:0x801D3AC8; // type:object size:0x4 scope:local data:4byte +effectAMemP = .sbss:0x801D3AD0; // type:object size:0x4 scope:local data:4byte +skipAnimUpdate = .sbss:0x801D3AD4; // type:object size:0x4 scope:local data:4byte +ColisionCount = .sbss:0x801D3AD8; // type:object size:0x4 data:4byte +topvtx = .sbss:0x801D3ADC; // type:object size:0x4 scope:local data:4byte +AttrHsf = .sbss:0x801D3AE0; // type:object size:0x4 scope:local data:4byte +HitFaceCount = .sbss:0x801D3AE4; // type:object size:0x4 data:4byte +nChar = .sbss:0x801D3AE8; // type:object size:0x4 +nMap = .sbss:0x801D3AEC; // type:object size:0x4 data:4byte +AddZ = .sbss:0x801D3AF0; // type:object size:0x4 data:float +AddX = .sbss:0x801D3AF4; // type:object size:0x4 data:float +Initialized = .sbss:0x801D3AF8; // type:object size:0x4 scope:local data:4byte +OldAIDCallback = .sbss:0x801D3AFC; // type:object size:0x4 scope:local data:4byte +AudioSystem = .sbss:0x801D3B00; // type:object size:0x4 scope:local data:4byte +bufIdx = .sbss:0x801D3B04; // type:object size:0x4 scope:local data:4byte +CurAudioBuffer = .sbss:0x801D3B08; // type:object size:0x4 scope:local data:4byte +LastAudioBuffer = .sbss:0x801D3B0C; // type:object size:0x4 scope:local data:4byte +SoundBufferIndex = .sbss:0x801D3B10; // type:object size:0x4 scope:local data:4byte +THPProc = .sbss:0x801D3B18; // type:object size:0x4 data:4byte +THPStart = .sbss:0x801D3B1C; // type:object size:0x2 scope:local data:2byte +THPFrame = .sbss:0x801D3B20; // type:object size:0x4 scope:local data:4byte +THPStat = .sbss:0x801D3B24; // type:object size:0x2 scope:local data:2byte +THPLoopF = .sbss:0x801D3B26; // type:object size:0x2 scope:local data:2byte +decodeThread = .sbss:0x801D3B28; // type:object size:0x4 scope:local data:4byte +decodeStackP = .sbss:0x801D3B2C; // type:object size:0x4 scope:local data:4byte +decodeRate = .sbss:0x801D3B30; // type:object size:0x4 scope:local data:4byte +audioTrack = .sbss:0x801D3B34; // type:object size:0x8 scope:local data:4byte +mgBoardHostEnableF = .sbss:0x801D3B40; // type:object size:0x1 +mgInstExitEnableF = .sbss:0x801D3B44; // type:object size:0x4 mgPracticeEnableF = .sbss:0x801D3B48; // type:object size:0x4 data:4byte mgQuitExtraF = .sbss:0x801D3B4C; // type:object size:0x4 data:4byte -lbl_801D3B50 = .sbss:0x801D3B50; // type:object size:0x4 -lbl_801D3B54 = .sbss:0x801D3B54; // type:object size:0x2 -lbl_801D3B56 = .sbss:0x801D3B56; // type:object size:0x2 -lbl_801D3B58 = .sbss:0x801D3B58; // type:object size:0x8 -lbl_801D3B60 = .sbss:0x801D3B60; // type:object size:0x8 -lbl_801D3B68 = .sbss:0x801D3B68; // type:object size:0x2 data:2byte -lbl_801D3B6A = .sbss:0x801D3B6A; // type:object size:0x1 data:byte -lbl_801D3B6C = .sbss:0x801D3B6C; // type:object size:0x4 -lbl_801D3B70 = .sbss:0x801D3B70; // type:object size:0x4 data:4byte +mgRecordExtra = .sbss:0x801D3B50; // type:object size:0x4 +lbl_801D3E94 = .sbss:0x801D3B54; // type:object size:0x1 +mgBattleStarMax = .sbss:0x801D3B56; // type:object size:0x2 +mgBattleStar = .sbss:0x801D3B58; // type:object size:0x8 +mgTypeCurr = .sbss:0x801D3B60; // type:object size:0x2 +curSlotNo = .sbss:0x801D3B68; // type:object size:0x2 data:2byte +curBoxNo = .sbss:0x801D3B6A; // type:object size:0x1 data:byte +saveExecF = .sbss:0x801D3B6C; // type:object size:0x4 +SLSerialNo = .sbss:0x801D3B70; // type:object size:0x4 data:4byte lbl_801D3B74 = .sbss:0x801D3B74; // type:object size:0x4 data:4byte lbl_801D3B78 = .sbss:0x801D3B78; // type:object size:0x4 data:4byte lbl_801D3B7C = .sbss:0x801D3B7C; // type:object size:0x4 data:4byte @@ -6100,117 +6113,117 @@ lbl_801D4C38 = .sdata2:0x801D4C38; // type:object size:0x8 scope:local data:doub lbl_801D4C40 = .sdata2:0x801D4C40; // type:object size:0x8 scope:local data:double lbl_801D4C48 = .sdata2:0x801D4C48; // type:object size:0x4 scope:local data:float lbl_801D4C50 = .sdata2:0x801D4C50; // type:object size:0x8 scope:local data:double -lbl_801D4C58 = .sdata2:0x801D4C58; // type:object size:0x8 data:double -lbl_801D4C60 = .sdata2:0x801D4C60; // type:object size:0x8 data:double -lbl_801D4C68 = .sdata2:0x801D4C68; // type:object size:0x8 data:double -lbl_801D4C70 = .sdata2:0x801D4C70; // type:object size:0x8 data:double -lbl_801D4C78 = .sdata2:0x801D4C78; // type:object size:0x8 data:double -lbl_801D4C80 = .sdata2:0x801D4C80; // type:object size:0x8 data:double -lbl_801D4C88 = .sdata2:0x801D4C88; // type:object size:0x8 data:double -lbl_801D4C90 = .sdata2:0x801D4C90; // type:object size:0x8 data:double -lbl_801D4C98 = .sdata2:0x801D4C98; // type:object size:0x4 data:float -lbl_801D4C9C = .sdata2:0x801D4C9C; // type:object size:0x4 data:float -lbl_801D4CA0 = .sdata2:0x801D4CA0; // type:object size:0x4 data:float -lbl_801D4CA4 = .sdata2:0x801D4CA4; // type:object size:0x4 data:float -lbl_801D4CA8 = .sdata2:0x801D4CA8; // type:object size:0x8 data:double -lbl_801D4CB0 = .sdata2:0x801D4CB0; // type:object size:0x4 data:float -lbl_801D4CB8 = .sdata2:0x801D4CB8; // type:object size:0x8 data:double -lbl_801D4CC0 = .sdata2:0x801D4CC0; // type:object size:0x8 data:double -lbl_801D4CC8 = .sdata2:0x801D4CC8; // type:object size:0x4 data:float -lbl_801D4CCC = .sdata2:0x801D4CCC; // type:object size:0x4 data:float -lbl_801D4CD0 = .sdata2:0x801D4CD0; // type:object size:0x8 data:double -lbl_801D4CD8 = .sdata2:0x801D4CD8; // type:object size:0x4 data:float -lbl_801D4CDC = .sdata2:0x801D4CDC; // type:object size:0x4 data:float -lbl_801D4CE0 = .sdata2:0x801D4CE0; // type:object size:0x4 data:float -lbl_801D4CE4 = .sdata2:0x801D4CE4; // type:object size:0x4 data:float -lbl_801D4CE8 = .sdata2:0x801D4CE8; // type:object size:0x4 data:float -lbl_801D4CEC = .sdata2:0x801D4CEC; // type:object size:0x4 data:float -lbl_801D4CF0 = .sdata2:0x801D4CF0; // type:object size:0x8 data:double -lbl_801D4CF8 = .sdata2:0x801D4CF8; // type:object size:0x4 data:float -lbl_801D4D00 = .sdata2:0x801D4D00; // type:object size:0x8 data:double -lbl_801D4D08 = .sdata2:0x801D4D08; // type:object size:0x8 data:double -lbl_801D4D10 = .sdata2:0x801D4D10; // type:object size:0x4 data:float -lbl_801D4D18 = .sdata2:0x801D4D18; // type:object size:0x8 data:double -lbl_801D4D20 = .sdata2:0x801D4D20; // type:object size:0x4 data:float -lbl_801D4D24 = .sdata2:0x801D4D24; // type:object size:0x4 data:float -lbl_801D4D28 = .sdata2:0x801D4D28; // type:object size:0x8 data:double -lbl_801D4D30 = .sdata2:0x801D4D30; // type:object size:0x8 data:double -lbl_801D4D38 = .sdata2:0x801D4D38; // type:object size:0x4 data:float -lbl_801D4D3C = .sdata2:0x801D4D3C; // type:object size:0x4 data:float -lbl_801D4D40 = .sdata2:0x801D4D40; // type:object size:0x4 data:float -lbl_801D4D48 = .sdata2:0x801D4D48; // type:object size:0x8 data:double -lbl_801D4D50 = .sdata2:0x801D4D50; // type:object size:0x4 data:float -lbl_801D4D54 = .sdata2:0x801D4D54; // type:object size:0x4 data:float -lbl_801D4D58 = .sdata2:0x801D4D58; // type:object size:0x4 data:float -lbl_801D4D5C = .sdata2:0x801D4D5C; // type:object size:0x4 data:float -lbl_801D4D60 = .sdata2:0x801D4D60; // type:object size:0x8 data:double -lbl_801D4D68 = .sdata2:0x801D4D68; // type:object size:0x4 data:float -lbl_801D4D70 = .sdata2:0x801D4D70; // type:object size:0x8 data:double -lbl_801D4D78 = .sdata2:0x801D4D78; // type:object size:0x4 data:float -lbl_801D4D80 = .sdata2:0x801D4D80; // type:object size:0x8 data:double -lbl_801D4D88 = .sdata2:0x801D4D88; // type:object size:0x8 data:float -lbl_801D4D90 = .sdata2:0x801D4D90; // type:object size:0x4 data:float -lbl_801D4D94 = .sdata2:0x801D4D94; // type:object size:0x4 data:float -lbl_801D4D98 = .sdata2:0x801D4D98; // type:object size:0x4 data:float -lbl_801D4D9C = .sdata2:0x801D4D9C; // type:object size:0x4 data:float -lbl_801D4DA0 = .sdata2:0x801D4DA0; // type:object size:0x8 data:double -lbl_801D4DA8 = .sdata2:0x801D4DA8; // type:object size:0x8 data:double -lbl_801D4DB0 = .sdata2:0x801D4DB0; // type:object size:0x8 data:double -lbl_801D4DB8 = .sdata2:0x801D4DB8; // type:object size:0x4 data:float -lbl_801D4DC0 = .sdata2:0x801D4DC0; // type:object size:0x8 data:double -lbl_801D4DC8 = .sdata2:0x801D4DC8; // type:object size:0x2 data:2byte -lbl_801D4DCA = .sdata2:0x801D4DCA; // type:object size:0x2 data:2byte -lbl_801D4DCC = .sdata2:0x801D4DCC; // type:object size:0x2 data:2byte -lbl_801D4DCE = .sdata2:0x801D4DCE; // type:object size:0x2 data:2byte -lbl_801D4DD0 = .sdata2:0x801D4DD0; // type:object size:0x1 data:byte -lbl_801D4DD1 = .sdata2:0x801D4DD1; // type:object size:0x1 data:byte -lbl_801D4DD2 = .sdata2:0x801D4DD2; // type:object size:0x1 data:byte -lbl_801D4DD3 = .sdata2:0x801D4DD3; // type:object size:0x1 data:byte -lbl_801D4DD4 = .sdata2:0x801D4DD4; // type:object size:0x1 data:byte -lbl_801D4DD5 = .sdata2:0x801D4DD5; // type:object size:0x1 data:byte -lbl_801D4DD6 = .sdata2:0x801D4DD6; // type:object size:0x1 data:byte -lbl_801D4DD7 = .sdata2:0x801D4DD7; // type:object size:0x1 data:byte -lbl_801D4DD8 = .sdata2:0x801D4DD8; // type:object size:0x1 data:byte -lbl_801D4DD9 = .sdata2:0x801D4DD9; // type:object size:0x1 data:byte -lbl_801D4DDA = .sdata2:0x801D4DDA; // type:object size:0x1 data:byte -lbl_801D4DDB = .sdata2:0x801D4DDB; // type:object size:0x1 data:byte -lbl_801D4DDC = .sdata2:0x801D4DDC; // type:object size:0x4 data:float -lbl_801D4DE0 = .sdata2:0x801D4DE0; // type:object size:0x4 data:float -lbl_801D4DE4 = .sdata2:0x801D4DE4; // type:object size:0x1 data:byte -lbl_801D4DE5 = .sdata2:0x801D4DE5; // type:object size:0x1 data:byte -lbl_801D4DE6 = .sdata2:0x801D4DE6; // type:object size:0x1 data:byte -lbl_801D4DE7 = .sdata2:0x801D4DE7; // type:object size:0x1 data:byte -lbl_801D4DE8 = .sdata2:0x801D4DE8; // type:object size:0x4 data:float -lbl_801D4DEC = .sdata2:0x801D4DEC; // type:object size:0x4 data:float -lbl_801D4DF0 = .sdata2:0x801D4DF0; // type:object size:0x8 data:float -lbl_801D4DF8 = .sdata2:0x801D4DF8; // type:object size:0x4 data:float -lbl_801D4DFC = .sdata2:0x801D4DFC; // type:object size:0x4 data:float -lbl_801D4E00 = .sdata2:0x801D4E00; // type:object size:0x8 data:float -lbl_801D4E08 = .sdata2:0x801D4E08; // type:object size:0x4 data:float -lbl_801D4E0C = .sdata2:0x801D4E0C; // type:object size:0x4 data:float -lbl_801D4E10 = .sdata2:0x801D4E10; // type:object size:0x4 data:float -lbl_801D4E14 = .sdata2:0x801D4E14; // type:object size:0x4 data:float -lbl_801D4E18 = .sdata2:0x801D4E18; // type:object size:0x4 data:float -lbl_801D4E1C = .sdata2:0x801D4E1C; // type:object size:0x4 data:float -lbl_801D4E20 = .sdata2:0x801D4E20; // type:object size:0x8 data:double -lbl_801D4E28 = .sdata2:0x801D4E28; // type:object size:0x8 data:double -lbl_801D4E30 = .sdata2:0x801D4E30; // type:object size:0x4 data:float -lbl_801D4E34 = .sdata2:0x801D4E34; // type:object size:0x4 data:float -lbl_801D4E38 = .sdata2:0x801D4E38; // type:object size:0x8 data:double -lbl_801D4E40 = .sdata2:0x801D4E40; // type:object size:0x8 data:double -lbl_801D4E48 = .sdata2:0x801D4E48; // type:object size:0x4 data:float -lbl_801D4E4C = .sdata2:0x801D4E4C; // type:object size:0x4 data:float -lbl_801D4E50 = .sdata2:0x801D4E50; // type:object size:0x4 data:float -lbl_801D4E54 = .sdata2:0x801D4E54; // type:object size:0x4 data:float -lbl_801D4E58 = .sdata2:0x801D4E58; // type:object size:0x4 data:float -lbl_801D4E5C = .sdata2:0x801D4E5C; // type:object size:0x4 data:float -lbl_801D4E60 = .sdata2:0x801D4E60; // type:object size:0x8 data:double -lbl_801D4E68 = .sdata2:0x801D4E68; // type:object size:0x4 data:float -lbl_801D4E6C = .sdata2:0x801D4E6C; // type:object size:0x4 data:float -lbl_801D4E70 = .sdata2:0x801D4E70; // type:object size:0x8 data:double -lbl_801D4E78 = .sdata2:0x801D4E78; // type:object size:0x4 data:float -lbl_801D4E7C = .sdata2:0x801D4E7C; // type:object size:0x4 data:float -lbl_801D4E80 = .sdata2:0x801D4E80; // type:object size:0x4 data:float +lbl_801D4C58 = .sdata2:0x801D4C58; // type:object size:0x8 scope:local data:double +lbl_801D4C60 = .sdata2:0x801D4C60; // type:object size:0x8 scope:local data:double +lbl_801D4C68 = .sdata2:0x801D4C68; // type:object size:0x8 scope:local data:double +lbl_801D4C70 = .sdata2:0x801D4C70; // type:object size:0x8 scope:local data:double +lbl_801D4C78 = .sdata2:0x801D4C78; // type:object size:0x8 scope:local data:double +lbl_801D4C80 = .sdata2:0x801D4C80; // type:object size:0x8 scope:local data:double +lbl_801D4C88 = .sdata2:0x801D4C88; // type:object size:0x8 scope:local data:double +lbl_801D4C90 = .sdata2:0x801D4C90; // type:object size:0x8 scope:local data:double +lbl_801D4C98 = .sdata2:0x801D4C98; // type:object size:0x4 scope:local data:float +lbl_801D4C9C = .sdata2:0x801D4C9C; // type:object size:0x4 scope:local data:float +lbl_801D4CA0 = .sdata2:0x801D4CA0; // type:object size:0x4 scope:local data:float +lbl_801D4CA4 = .sdata2:0x801D4CA4; // type:object size:0x4 scope:local data:float +lbl_801D4CA8 = .sdata2:0x801D4CA8; // type:object size:0x8 scope:local data:double +lbl_801D4CB0 = .sdata2:0x801D4CB0; // type:object size:0x4 scope:local data:float +lbl_801D4CB8 = .sdata2:0x801D4CB8; // type:object size:0x8 scope:local data:double +lbl_801D4CC0 = .sdata2:0x801D4CC0; // type:object size:0x8 scope:local data:double +lbl_801D4CC8 = .sdata2:0x801D4CC8; // type:object size:0x4 scope:local data:float +lbl_801D4CCC = .sdata2:0x801D4CCC; // type:object size:0x4 scope:local data:float +lbl_801D4CD0 = .sdata2:0x801D4CD0; // type:object size:0x8 scope:local data:double +lbl_801D4CD8 = .sdata2:0x801D4CD8; // type:object size:0x4 scope:local data:float +lbl_801D4CDC = .sdata2:0x801D4CDC; // type:object size:0x4 scope:local data:float +lbl_801D4CE0 = .sdata2:0x801D4CE0; // type:object size:0x4 scope:local data:float +lbl_801D4CE4 = .sdata2:0x801D4CE4; // type:object size:0x4 scope:local data:float +lbl_801D4CE8 = .sdata2:0x801D4CE8; // type:object size:0x4 scope:local data:float +lbl_801D4CEC = .sdata2:0x801D4CEC; // type:object size:0x4 scope:local data:float +lbl_801D4CF0 = .sdata2:0x801D4CF0; // type:object size:0x8 scope:local data:double +lbl_801D4CF8 = .sdata2:0x801D4CF8; // type:object size:0x4 scope:local data:float +lbl_801D4D00 = .sdata2:0x801D4D00; // type:object size:0x8 scope:local data:double +lbl_801D4D08 = .sdata2:0x801D4D08; // type:object size:0x8 scope:local data:double +lbl_801D4D10 = .sdata2:0x801D4D10; // type:object size:0x4 scope:local data:float +lbl_801D4D18 = .sdata2:0x801D4D18; // type:object size:0x8 scope:local data:double +lbl_801D4D20 = .sdata2:0x801D4D20; // type:object size:0x4 scope:local data:float +lbl_801D4D24 = .sdata2:0x801D4D24; // type:object size:0x4 scope:local data:float +lbl_801D4D28 = .sdata2:0x801D4D28; // type:object size:0x8 scope:local data:double +lbl_801D4D30 = .sdata2:0x801D4D30; // type:object size:0x8 scope:local data:double +lbl_801D4D38 = .sdata2:0x801D4D38; // type:object size:0x4 scope:local data:float +lbl_801D4D3C = .sdata2:0x801D4D3C; // type:object size:0x4 scope:local data:float +lbl_801D4D40 = .sdata2:0x801D4D40; // type:object size:0x4 scope:local data:float +lbl_801D4D48 = .sdata2:0x801D4D48; // type:object size:0x8 scope:local data:double +lbl_801D4D50 = .sdata2:0x801D4D50; // type:object size:0x4 scope:local data:float +lbl_801D4D54 = .sdata2:0x801D4D54; // type:object size:0x4 scope:local data:float +lbl_801D4D58 = .sdata2:0x801D4D58; // type:object size:0x4 scope:local data:float +lbl_801D4D5C = .sdata2:0x801D4D5C; // type:object size:0x4 scope:local data:float +lbl_801D4D60 = .sdata2:0x801D4D60; // type:object size:0x8 scope:local data:double +lbl_801D4D68 = .sdata2:0x801D4D68; // type:object size:0x4 scope:local data:float +lbl_801D4D70 = .sdata2:0x801D4D70; // type:object size:0x8 scope:local data:double +lbl_801D4D78 = .sdata2:0x801D4D78; // type:object size:0x4 scope:local data:float +lbl_801D4D80 = .sdata2:0x801D4D80; // type:object size:0x8 scope:local data:double +lbl_801D4D88 = .sdata2:0x801D4D88; // type:object size:0x8 scope:local data:float +lbl_801D4D90 = .sdata2:0x801D4D90; // type:object size:0x4 scope:local data:float +lbl_801D4D94 = .sdata2:0x801D4D94; // type:object size:0x4 scope:local data:float +lbl_801D4D98 = .sdata2:0x801D4D98; // type:object size:0x4 scope:local data:float +lbl_801D4D9C = .sdata2:0x801D4D9C; // type:object size:0x4 scope:local data:float +lbl_801D4DA0 = .sdata2:0x801D4DA0; // type:object size:0x8 scope:local data:double +lbl_801D4DA8 = .sdata2:0x801D4DA8; // type:object size:0x8 scope:local data:double +lbl_801D4DB0 = .sdata2:0x801D4DB0; // type:object size:0x8 scope:local data:double +lbl_801D4DB8 = .sdata2:0x801D4DB8; // type:object size:0x4 scope:local data:float +lbl_801D4DC0 = .sdata2:0x801D4DC0; // type:object size:0x8 scope:local data:double +lbl_801D4DC8 = .sdata2:0x801D4DC8; // type:object size:0x2 scope:local data:2byte +lbl_801D4DCA = .sdata2:0x801D4DCA; // type:object size:0x2 scope:local data:2byte +lbl_801D4DCC = .sdata2:0x801D4DCC; // type:object size:0x2 scope:local data:2byte +lbl_801D4DCE = .sdata2:0x801D4DCE; // type:object size:0x2 scope:local data:2byte +lbl_801D4DD0 = .sdata2:0x801D4DD0; // type:object size:0x1 scope:local data:byte +lbl_801D4DD1 = .sdata2:0x801D4DD1; // type:object size:0x1 scope:local data:byte +lbl_801D4DD2 = .sdata2:0x801D4DD2; // type:object size:0x1 scope:local data:byte +lbl_801D4DD3 = .sdata2:0x801D4DD3; // type:object size:0x1 scope:local data:byte +lbl_801D4DD4 = .sdata2:0x801D4DD4; // type:object size:0x1 scope:local data:byte +lbl_801D4DD5 = .sdata2:0x801D4DD5; // type:object size:0x1 scope:local data:byte +lbl_801D4DD6 = .sdata2:0x801D4DD6; // type:object size:0x1 scope:local data:byte +lbl_801D4DD7 = .sdata2:0x801D4DD7; // type:object size:0x1 scope:local data:byte +lbl_801D4DD8 = .sdata2:0x801D4DD8; // type:object size:0x1 scope:local data:byte +lbl_801D4DD9 = .sdata2:0x801D4DD9; // type:object size:0x1 scope:local data:byte +lbl_801D4DDA = .sdata2:0x801D4DDA; // type:object size:0x1 scope:local data:byte +lbl_801D4DDB = .sdata2:0x801D4DDB; // type:object size:0x1 scope:local data:byte +lbl_801D4DDC = .sdata2:0x801D4DDC; // type:object size:0x4 scope:local data:float +lbl_801D4DE0 = .sdata2:0x801D4DE0; // type:object size:0x4 scope:local data:float +lbl_801D4DE4 = .sdata2:0x801D4DE4; // type:object size:0x1 scope:local data:byte +lbl_801D4DE5 = .sdata2:0x801D4DE5; // type:object size:0x1 scope:local data:byte +lbl_801D4DE6 = .sdata2:0x801D4DE6; // type:object size:0x1 scope:local data:byte +lbl_801D4DE7 = .sdata2:0x801D4DE7; // type:object size:0x1 scope:local data:byte +lbl_801D4DE8 = .sdata2:0x801D4DE8; // type:object size:0x4 scope:local data:float +lbl_801D4DEC = .sdata2:0x801D4DEC; // type:object size:0x4 scope:local data:float +lbl_801D4DF0 = .sdata2:0x801D4DF0; // type:object size:0x8 scope:local data:float +lbl_801D4DF8 = .sdata2:0x801D4DF8; // type:object size:0x4 scope:local data:float +lbl_801D4DFC = .sdata2:0x801D4DFC; // type:object size:0x4 scope:local data:float +lbl_801D4E00 = .sdata2:0x801D4E00; // type:object size:0x8 scope:local data:float +lbl_801D4E08 = .sdata2:0x801D4E08; // type:object size:0x4 scope:local data:float +lbl_801D4E0C = .sdata2:0x801D4E0C; // type:object size:0x4 scope:local data:float +lbl_801D4E10 = .sdata2:0x801D4E10; // type:object size:0x4 scope:local data:float +lbl_801D4E14 = .sdata2:0x801D4E14; // type:object size:0x4 scope:local data:float +lbl_801D4E18 = .sdata2:0x801D4E18; // type:object size:0x4 scope:local data:float +lbl_801D4E1C = .sdata2:0x801D4E1C; // type:object size:0x4 scope:local data:float +lbl_801D4E20 = .sdata2:0x801D4E20; // type:object size:0x8 scope:local data:double +lbl_801D4E28 = .sdata2:0x801D4E28; // type:object size:0x8 scope:local data:double +lbl_801D4E30 = .sdata2:0x801D4E30; // type:object size:0x4 scope:local data:float +lbl_801D4E34 = .sdata2:0x801D4E34; // type:object size:0x4 scope:local data:float +lbl_801D4E38 = .sdata2:0x801D4E38; // type:object size:0x8 scope:local data:double +lbl_801D4E40 = .sdata2:0x801D4E40; // type:object size:0x8 scope:local data:double +lbl_801D4E48 = .sdata2:0x801D4E48; // type:object size:0x4 scope:local data:float +lbl_801D4E4C = .sdata2:0x801D4E4C; // type:object size:0x4 scope:local data:float +lbl_801D4E50 = .sdata2:0x801D4E50; // type:object size:0x4 scope:local data:float +lbl_801D4E54 = .sdata2:0x801D4E54; // type:object size:0x4 scope:local data:float +lbl_801D4E58 = .sdata2:0x801D4E58; // type:object size:0x4 scope:local data:float +lbl_801D4E5C = .sdata2:0x801D4E5C; // type:object size:0x4 scope:local data:float +lbl_801D4E60 = .sdata2:0x801D4E60; // type:object size:0x8 scope:local data:double +lbl_801D4E68 = .sdata2:0x801D4E68; // type:object size:0x4 scope:local data:float +lbl_801D4E6C = .sdata2:0x801D4E6C; // type:object size:0x4 scope:local data:float +lbl_801D4E70 = .sdata2:0x801D4E70; // type:object size:0x8 scope:local data:double +lbl_801D4E78 = .sdata2:0x801D4E78; // type:object size:0x4 scope:local data:float +lbl_801D4E7C = .sdata2:0x801D4E7C; // type:object size:0x4 scope:local data:float +lbl_801D4E80 = .sdata2:0x801D4E80; // type:object size:0x4 scope:local data:float lbl_801D4E84 = .sdata2:0x801D4E84; // type:object size:0x4 data:float lbl_801D4E88 = .sdata2:0x801D4E88; // type:object size:0x4 data:float lbl_801D4E8C = .sdata2:0x801D4E8C; // type:object size:0x4 data:float diff --git a/configure.py b/configure.py index 14f66e9a..eff08432 100644 --- a/configure.py +++ b/configure.py @@ -413,14 +413,14 @@ config.libs = [ Object(Matching, "game/window.c"), Object(Matching, "game/messdata.c"), Object(Matching, "game/card.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/armem.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/chrman.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/mapspace.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/THPSimple.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/THPDraw.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/thpmain.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/objsub.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/flag.c"), + Object(Matching, "game/armem.c"), + Object(Matching, "game/chrman.c"), + Object(Matching, "game/mapspace.c"), + Object(Matching, "game/THPSimple.c"), + Object(Matching, "game/THPDraw.c"), + Object(Matching, "game/thpmain.c"), + Object(Matching, "game/objsub.c"), + Object(Matching, "game/flag.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/saveload.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/sreset.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "game/board/main.c"), diff --git a/src/game/saveload.c b/src/game/saveload.c index 0c5d627e..a00db99a 100644 --- a/src/game/saveload.c +++ b/src/game/saveload.c @@ -1,15 +1,15 @@ #include "game/saveload.h" -#include "game/data.h" -#include "game/pad.h" -#include "game/window.h" -#include "game/flag.h" -#include "game/card.h" -#include "game/sprite.h" -#include "game/gamework_data.h" #include "data_num/win.h" +#include "game/card.h" +#include "game/data.h" +#include "game/flag.h" +#include "game/gamework_data.h" +#include "game/pad.h" +#include "game/sprite.h" +#include "game/window.h" -#include "string.h" #include "stddef.h" +#include "string.h" #if VERSION_ENG #define SAVE_WRITE_BEGIN _SetFlag(FLAG_ID_MAKE(3, 0)); @@ -19,13 +19,12 @@ #define SAVE_WRITE_END #endif -#define SAVE_GET_PLAYER(player_idx) &saveBuf.buf[((player_idx)*sizeof(PlayerState))+offsetof(SaveBufData, player)] -#define SAVE_GET_PLAYER_STORY(player_idx) &saveBuf.buf[((player_idx)*sizeof(PlayerState))+offsetof(SaveBufData, playerStory)] +#define SAVE_GET_PLAYER(player_idx) &saveBuf.buf[((player_idx) * sizeof(PlayerState)) + offsetof(SaveBufData, player)] +#define SAVE_GET_PLAYER_STORY(player_idx) &saveBuf.buf[((player_idx) * sizeof(PlayerState)) + offsetof(SaveBufData, playerStory)] static s16 SLCreateSaveWin(void); static void SLKillSaveWin(void); - extern u8 UnMountCnt; CARDFileInfo curFileInfo; @@ -36,27 +35,23 @@ s32 saveExecF; u8 curBoxNo; s16 curSlotNo; -static u8 commentTbl[2][32] = { - "Mario Party 4", - "File 0 00/00/0000" -}; +#if VERSION_JAP +static u8 commentTbl[2][32] = { "マリオパーティ４", "？？月？？日　データ？です。" }; +static char *lbl_80131D70 = { "０１２３４５６７８９" }; +#else +static u8 commentTbl[2][32] = { "Mario Party 4", "File 0 00/00/0000" }; +#endif -char *SaveFileNameTbl[] = { - "MARIPA4BOX0", - "MARIPA4BOX1", - "MARIPA4BOX2" -}; +char *SaveFileNameTbl[] = { "MARIPA4BOX0", "MARIPA4BOX1", "MARIPA4BOX2" }; s32 SaveEnableF = 1; -static char *SlotNameTbl[] = { - "A", - "B" -}; +static char *SlotNameTbl[] = { "A", "B" }; static s32 saveMessWin = -1; -s32 SLFileOpen(char *fileName) { +s32 SLFileOpen(char *fileName) +{ s32 result; if (SaveEnableF == 0) { @@ -64,7 +59,7 @@ s32 SLFileOpen(char *fileName) { } while (1) { result = SLCardMount(curSlotNo); - if(result < 0) { + if (result < 0) { return result; } result = HuCardOpen(curSlotNo, fileName, &curFileInfo); @@ -96,16 +91,19 @@ s32 SLFileOpen(char *fileName) { if (result != 0) { return result; } - } else { + } + else { return CARD_RESULT_NOFILE; } - } else { + } + else { return CARD_RESULT_READY; } } } -s32 SLFileCreate(char *fileName, u32 size, void *addr) { +s32 SLFileCreate(char *fileName, u32 size, void *addr) +{ float winSize[2]; u32 byteNotUsed; u32 filesNotUsed; @@ -184,7 +182,8 @@ s32 SLFileCreate(char *fileName, u32 size, void *addr) { return 0; } -s32 SLFileWrite(s32 length, void *addr) { +s32 SLFileWrite(s32 length, void *addr) +{ float winSize[2]; s32 window; s32 result; @@ -210,7 +209,8 @@ s32 SLFileWrite(s32 length, void *addr) { return result; } -s32 SLFileRead(s32 length, void *addr) { +s32 SLFileRead(s32 length, void *addr) +{ s32 result; if (SaveEnableF == 0) { @@ -219,13 +219,15 @@ s32 SLFileRead(s32 length, void *addr) { result = HuCardRead(&curFileInfo, addr, length, 0); if (result == CARD_RESULT_NOCARD) { SLMessOut(0); - } else if (result < 0) { + } + else if (result < 0) { SLMessOut(1); } return result; } -s32 SLFileClose(void) { +s32 SLFileClose(void) +{ s32 result; if (SaveEnableF == 0) { @@ -235,15 +237,18 @@ s32 SLFileClose(void) { return result; } -void SLCurSlotNoSet(s16 slotno) { +void SLCurSlotNoSet(s16 slotno) +{ curSlotNo = slotno; } -void SLCurBoxNoSet(s16 boxno) { +void SLCurBoxNoSet(s16 boxno) +{ curBoxNo = boxno; } -void SLSaveFlagSet(s32 flag) { +void SLSaveFlagSet(s32 flag) +{ if (flag == 0) { GWGameStat.party_continue = 0; GWGameStat.story_continue = 0; @@ -251,11 +256,13 @@ void SLSaveFlagSet(s32 flag) { SaveEnableF = flag; } -s32 SLSaveFlagGet(void) { +s32 SLSaveFlagGet(void) +{ return SaveEnableF; } -void SLSaveDataMake(s32 erase, OSTime *time) { +void SLSaveDataMake(s32 erase, OSTime *time) +{ AnimData *anim_data; u8 *buf; s32 i; @@ -270,24 +277,25 @@ void SLSaveDataMake(s32 erase, OSTime *time) { buf[i] = (&commentTbl[0][0])[i]; } for (i = 0; i < 0x20; i++) { - (&buf[0x20])[i] = (&commentTbl[0][0])[i+32]; + (&buf[0x20])[i] = (&commentTbl[0][0])[i + 32]; } anim_data = HuSprAnimReadFile(WIN_CARD_BANNER_ANM); - memcpy(buf + offsetof(SaveBufData, banner), anim_data->bmp->data, CARD_BANNER_WIDTH*CARD_BANNER_HEIGHT); + memcpy(buf + offsetof(SaveBufData, banner), anim_data->bmp->data, CARD_BANNER_WIDTH * CARD_BANNER_HEIGHT); memcpy(buf + offsetof(SaveBufData, bannerTlut), anim_data->bmp->palData, 512); anim_data = HuSprAnimReadFile(curBoxNo + WIN_CARD_BOX1_ICON_ANM); - memcpy(buf + offsetof(SaveBufData, icon), anim_data->bmp->data, CARD_ICON_WIDTH*CARD_ICON_HEIGHT*4); + memcpy(buf + offsetof(SaveBufData, icon), anim_data->bmp->data, CARD_ICON_WIDTH * CARD_ICON_HEIGHT * 4); memcpy(buf + offsetof(SaveBufData, iconTlut), anim_data->bmp->palData, 512); SLSaveDataInfoSet(time); } -void SLSaveDataInfoSet(OSTime *time) { +void SLSaveDataInfoSet(OSTime *time) +{ s16 year; s16 digit; OSCalendarTime sp8; - - #if VERSION_ENG + OSTicksToCalendarTime(*time, &sp8); +#if VERSION_ENG saveBuf.data.comment[37] = curBoxNo + '1'; digit = (sp8.mon + 1) / 10; saveBuf.data.comment[40] = digit + '0'; @@ -308,8 +316,7 @@ void SLSaveDataInfoSet(OSTime *time) { saveBuf.data.comment[48] = digit + '0'; year -= digit * 10; saveBuf.data.comment[49] = year + '0'; - #elif VERSION_PAL - OSTicksToCalendarTime(*time, &sp8); +#elif VERSION_PAL saveBuf.data.comment[37] = curBoxNo + '1'; digit = sp8.mday / 10; saveBuf.data.comment[40] = digit + '0'; @@ -330,17 +337,15 @@ void SLSaveDataInfoSet(OSTime *time) { saveBuf.data.comment[48] = digit + '0'; year -= digit * 10; saveBuf.data.comment[49] = year + '0'; - #else - //TODO: Japanese Version - OSTicksToCalendarTime(*time, &sp8); +#else saveBuf.data.comment[37] = curBoxNo + '1'; - digit = sp8.mday / 10; - saveBuf.data.comment[40] = digit + '0'; - digit = sp8.mday % 10; - saveBuf.data.comment[41] = digit + '0'; digit = (sp8.mon + 1) / 10; - saveBuf.data.comment[43] = digit + '0'; + saveBuf.data.comment[40] = digit + '0'; digit = (sp8.mon + 1) % 10; + saveBuf.data.comment[41] = digit + '0'; + digit = sp8.mday / 10; + saveBuf.data.comment[43] = digit + '0'; + digit = sp8.mday % 10; saveBuf.data.comment[44] = digit + '0'; year = sp8.year; digit = year / 1000; @@ -353,10 +358,36 @@ void SLSaveDataInfoSet(OSTime *time) { saveBuf.data.comment[48] = digit + '0'; year -= digit * 10; saveBuf.data.comment[49] = year + '0'; - #endif + + saveBuf.data.comment[52] = lbl_80131D70[curBoxNo + 1]; + saveBuf.data.comment[53] = lbl_80131D70[curBoxNo + 1]; + digit = (sp8.mon + 1) / 10; + // if (digit == 0) { + // saveBuf.data.comment[32] = lbl_801D32F8.unk_00; + // saveBuf.data.comment[33] = lbl_801D32F8.unk_01; + // } else { + // saveBuf.data.comment[32] = *(&@lbl_80131D70 + (var_r31 * 2)); + // saveBuf.data.comment[33] = ((var_r31 * 2) + &@lbl_80131D70)->unk_01; + // } + digit = (sp8.mon + 1) % 10; + // saveBuf.data.comment[34] = *(&@lbl_80131D70 + (var_r31 * 2)); + // saveBuf.data.comment[35] = ((var_r31 * 2) + &@lbl_80131D70)->unk_01; + digit = sp8.mday / 10; + // if (digit == 0) { + // saveBuf.data.comment[38] = lbl_801D32F8.unk_00; + // saveBuf.data.comment[39] = lbl_801D32F8.unk_01; + // } else { + // saveBuf.data.comment[38] = *(&@lbl_80131D70 + (var_r31 * 2)); + // saveBuf.data.comment[39] = ((var_r31 * 2) + &@lbl_80131D70)->unk_01; + // } + digit = sp8.mday % 10; + // saveBuf.data.comment[40] = *(&@lbl_80131D70 + (var_r31 * 2)); + // saveBuf.data.comment[41] = ((var_r31 * 2) + &@lbl_80131D70)->unk_01; +#endif } -void SLCommonSet(void) { +void SLCommonSet(void) +{ OSTime create_time; create_time = OSGetTime(); @@ -365,7 +396,8 @@ void SLCommonSet(void) { SLSaveDataInfoSet(&create_time); } -void SLSaveBoard(void) { +void SLSaveBoard(void) +{ s16 i; memcpy(&saveBuf.data.system, &GWSystem, sizeof(SystemState)); @@ -374,7 +406,8 @@ void SLSaveBoard(void) { } } -void SLSaveBoardStory(void) { +void SLSaveBoardStory(void) +{ s16 i; memcpy(&saveBuf.data.systemStory, &GWSystem, sizeof(SystemState)); @@ -383,7 +416,8 @@ void SLSaveBoardStory(void) { } } -s32 SLSave(void) { +s32 SLSave(void) +{ s32 result; while (1) { @@ -392,7 +426,8 @@ s32 SLSave(void) { if (result == CARD_RESULT_NOFILE) { if (!SLSerialNoCheck()) { SLMessOut(9); - } else { + } + else { SLCreateSaveWin(); result = SLFileCreate(SaveFileNameTbl[curBoxNo], 16384, &saveBuf); SLKillSaveWin(); @@ -401,7 +436,8 @@ s32 SLSave(void) { goto block_32; } } - } else { + } + else { if (result == CARD_RESULT_NOCARD) { result = SLMessOut(10); if (result != 0) { @@ -414,15 +450,18 @@ s32 SLSave(void) { if (result >= 0) { if (!SLSerialNoCheck()) { SLMessOut(9); - } else { + } + else { SLCreateSaveWin(); result = SLFileWrite(16384, &saveBuf); SLKillSaveWin(); if (result == CARD_RESULT_NOCARD) { SLMessOut(0); - } else if (result == CARD_RESULT_WRONGDEVICE) { + } + else if (result == CARD_RESULT_WRONGDEVICE) { SLMessOut(7); - } else if (result == CARD_RESULT_BROKEN) { + } + else if (result == CARD_RESULT_BROKEN) { result = HuCardSectorSizeGet(curSlotNo); if (result > 0 && result != 8192) { SLMessOut(8); @@ -436,13 +475,15 @@ s32 SLSave(void) { return result; } continue; - } else { + } + else { result = CARD_RESULT_BROKEN; } - } else if (result < 0) { + } + else if (result < 0) { SLMessOut(1); } -block_32: + block_32: SLFileClose(); if (result >= 0) { HuCardUnMount(curSlotNo); @@ -451,11 +492,12 @@ block_32: } } } -block_36: + block_36: result = SLMessOut(10); if (result != 0) { SLMessOut(11); - } else { + } + else { SLSaveFlagSet(0); break; } @@ -470,7 +512,8 @@ block_36: #define SAVEWIN_POS 120 #endif -static s16 SLCreateSaveWin(void) { +static s16 SLCreateSaveWin(void) +{ float size[2]; s16 window; @@ -486,7 +529,8 @@ static s16 SLCreateSaveWin(void) { return window; } -static void SLKillSaveWin(void) { +static void SLKillSaveWin(void) +{ if (saveMessWin != -1) { HuWinExAnimOut(saveMessWin); HuWinExCleanup(saveMessWin); @@ -494,7 +538,8 @@ static void SLKillSaveWin(void) { } } -s32 SLLoad(void) { +s32 SLLoad(void) +{ s32 result; u16 *save_checksum; u16 checksum; @@ -513,11 +558,13 @@ s32 SLLoad(void) { return 0; } -void SLLoadGameStat(void) { +void SLLoadGameStat(void) +{ memcpy(&GWGameStat, &saveBuf.data.stat, sizeof(GameStat)); } -void SLLoadBoard(void) { +void SLLoadBoard(void) +{ s16 i; memcpy(&GWSystem, &saveBuf.data.system, sizeof(SystemState)); @@ -531,7 +578,8 @@ void SLLoadBoard(void) { } } -void SLLoadBoardStory(void) { +void SLLoadBoardStory(void) +{ s16 i; memcpy(&GWSystem, &saveBuf.data.systemStory, 0xDC); @@ -545,11 +593,13 @@ void SLLoadBoardStory(void) { } } -s32 SLSerialNoGet(void) { +s32 SLSerialNoGet(void) +{ return CARDGetSerialNo(curSlotNo, &SLSerialNo); } -BOOL SLSerialNoCheck(void) { +BOOL SLSerialNoCheck(void) +{ s32 result; u64 serialNo; @@ -566,7 +616,8 @@ BOOL SLSerialNoCheck(void) { return TRUE; } -BOOL SLCheckSumCheck(void) { +BOOL SLCheckSumCheck(void) +{ u16 *save_checksum = (u16 *)&saveBuf.buf[sizeof(SaveBufData)]; u16 checksum = SLCheckSumGet(); @@ -576,7 +627,8 @@ BOOL SLCheckSumCheck(void) { return FALSE; } -u16 SLCheckSumGet(void) { +u16 SLCheckSumGet(void) +{ u32 i; u32 checksum; @@ -584,17 +636,19 @@ u16 SLCheckSumGet(void) { checksum += saveBuf.buf[i]; } checksum = ~checksum; - return (u16) checksum & 0xFFFF; + return (u16)checksum & 0xFFFF; } -void SLCheckSumSet(void) { +void SLCheckSumSet(void) +{ u16 checksum = SLCheckSumGet(); saveBuf.buf[sizeof(SaveBufData)] = (checksum >> 8) & 0xFF; - saveBuf.buf[sizeof(SaveBufData)+1] = checksum; + saveBuf.buf[sizeof(SaveBufData) + 1] = checksum; } -s32 SLStatSet(s32 reportF) { +s32 SLStatSet(s32 reportF) +{ CARDStat stat; s32 fileNo; s32 result; @@ -643,7 +697,8 @@ s32 SLStatSet(s32 reportF) { return result; } -s32 SLCardMount(s16 slotNo) { +s32 SLCardMount(s16 slotNo) +{ s32 result; while (1) { @@ -673,10 +728,12 @@ s32 SLCardMount(s16 slotNo) { if (result != 0) { return result; } - } else { + } + else { return CARD_RESULT_FATAL_ERROR; } - } else { + } + else { break; } } @@ -692,7 +749,8 @@ s32 SLCardMount(s16 slotNo) { return 0; } -s32 SLFormat(s16 slotNo) { +s32 SLFormat(s16 slotNo) +{ float winSize[2]; s16 result; s16 window1; @@ -754,7 +812,8 @@ s32 SLFormat(s16 slotNo) { return result; } -s16 SLMessOut(s16 mess) { +s16 SLMessOut(s16 mess) +{ WindowData *var_r26; float size[2]; u32 slot_mess; @@ -782,19 +841,23 @@ s16 SLMessOut(s16 mess) { case 2: HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0); slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]); - #if VERSION_NTSC +#if VERSION_ENG save_mess = MAKE_MESSID(16, 74); - #else +#elif VERSION_PAL save_mess = MAKE_MESSID(16, 72); - #endif +#else + save_mess = MAKE_MESSID(16, 5); +#endif break; case 3: - #if VERSION_NTSC +#if VERSION_ENG save_mess = MAKE_MESSID(16, 74); - #else +#elif VERSION_PAL save_mess = MAKE_MESSID(16, 72); - #endif +#else + save_mess = MAKE_MESSID(16, 6); +#endif HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0); slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]); break; @@ -841,11 +904,11 @@ s16 SLMessOut(s16 mess) { case 11: HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0); slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]); - #if VERSION_NTSC +#if VERSION_ENG save_mess = MAKE_MESSID(16, 72); - #else +#else save_mess = MAKE_MESSID(16, 76); - #endif +#endif break; case 12: @@ -854,7 +917,8 @@ s16 SLMessOut(s16 mess) { } if (save_mess == MAKE_MESSID(16, 4)) { HuWinMesMaxSizeGet(1, size, MAKE_MESSID(16, 78)); - } else { + } + else { HuWinMesMaxSizeGet(1, size, save_mess); } window = HuWinExCreateStyled(-10000.0f, 200.0f, size[0], size[1], -1, 2);