kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #39 from gamemasterplc/main

Browse source 
Split Board Code More
This commit is contained in:
gamemasterplc 2023-12-05 11:26:45 -06:00 • committed by GitHub
commit 3efe0904c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
config/GMPE01_00/splits.txt
View file

@ -348,6 +348,44 @@ game/board/window.c:
.sbss start:0x801D3F68 end:0x801D3F98
.sdata2 start:0x801D5318 end:0x801D5328
game/board/com.c:
.text start:0x800714F8 end:0x800729A4
.data start:0x80139B00 end:0x80139BC8
.sdata start:0x801D36F0 end:0x801D36F8
.sdata2 start:0x801D5328 end:0x801D5350
game/board/overhead.c:
.text start:0x800729A4 end:0x80073FF4
.rodata start:0x8011DED0 end:0x8011DEF0
.data start:0x80139BC8 end:0x80139CC8
.bss start:0x8019D9F8 end:0x8019DA10
.sdata start:0x801D36F8 end:0x801D3700
.sbss start:0x801D3F98 end:0x801D3FB0
.sdata2 start:0x801D5350 end:0x801D53C0
game/board/space.c:
.text start:0x80073FF4 end:0x80077AAC
.data start:0x80139CC8 end:0x80139D08
.bss start:0x8019DA10 end:0x801A4A10
.sdata start:0x801D3700 end:0x801D3708
.sbss start:0x801D3FB0 end:0x801D3FE8
.sdata2 start:0x801D53C0 end:0x801D5440
game/board/shop.c:
.text start:0x80077AAC end:0x8007A83C
.data start:0x80139D08 end:0x80139E88
.sdata start:0x801D3708 end:0x801D3728
.sbss start:0x801D3FE8 end:0x801D4008
.sdata2 start:0x801D5440 end:0x801D5510
game/board/lottery.c:
.text start:0x8007A83C end:0x8007FB50
.rodata start:0x8011DEF0 end:0x8011E020
.data start:0x80139E88 end:0x8013A1F0
.sdata start:0x801D3728 end:0x801D3748
.sbss start:0x801D4008 end:0x801D4028
.sdata2 start:0x801D5510 end:0x801D56A0
dolphin/PPCArch.c:
.text start:0x800B42F4 end:0x800B439C

22
config/GMPE01_00/symbols.txt
View file

@ -1294,13 +1294,13 @@ fn_8006FDA0 = .text:0x8006FDA0; // type:function size:0x34
fn_8006FDD4 = .text:0x8006FDD4; // type:function size:0x24
fn_8006FDF8 = .text:0x8006FDF8; // type:function size:0x6C
fn_8006FE64 = .text:0x8006FE64; // type:function size:0x514
BoardMessChoiceGet = .text:0x80070378; // type:function size:0xC
BoardWinChoiceGet = .text:0x80070378; // type:function size:0xC
fn_80070384 = .text:0x80070384; // type:function size:0xC
fn_80070390 = .text:0x80070390; // type:function size:0x1A0
BoardMessCreate = .text:0x80070530; // type:function size:0x1A0
BoardWinCreate = .text:0x80070530; // type:function size:0x1A0
fn_800706D0 = .text:0x800706D0; // type:function size:0x18
BoardMessWait = .text:0x800706E8; // type:function size:0x50
BoardMessKill = .text:0x80070738; // type:function size:0x38
BoardWinWait = .text:0x800706E8; // type:function size:0x50
BoardWinKill = .text:0x80070738; // type:function size:0x38
fn_80070770 = .text:0x80070770; // type:function size:0x48
fn_800707B8 = .text:0x800707B8; // type:function size:0x48
fn_80070800 = .text:0x80070800; // type:function size:0x1C
@ -1338,7 +1338,7 @@ fn_800713E8 = .text:0x800713E8; // type:function size:0x28
fn_80071410 = .text:0x80071410; // type:function size:0xE8
fn_800714F8 = .text:0x800714F8; // type:function size:0x100
fn_800715F8 = .text:0x800715F8; // type:function size:0x120
CpuDecideItemPurchaseInner = .text:0x80071718; // type:function size:0x74
BoardCOMGetItemWeight = .text:0x80071718; // type:function size:0x74
fn_8007178C = .text:0x8007178C; // type:function size:0xD0
fn_8007185C = .text:0x8007185C; // type:function size:0x6C
fn_800718C8 = .text:0x800718C8; // type:function size:0x68
@ -1375,7 +1375,7 @@ fn_80073FC4 = .text:0x80073FC4; // type:function size:0x30
fn_80073FF4 = .text:0x80073FF4; // type:function size:0x8
fn_80073FFC = .text:0x80073FFC; // type:function size:0x8
fn_80074004 = .text:0x80074004; // type:function size:0x8
RunEvent = .text:0x8007400C; // type:function size:0x48
BoardSpaceExecPassEvent = .text:0x8007400C; // type:function size:0x48
fn_80074054 = .text:0x80074054; // type:function size:0x60
fn_800740B4 = .text:0x800740B4; // type:function size:0x10
fn_800740C4 = .text:0x800740C4; // type:function size:0x44
@ -1437,7 +1437,7 @@ fn_80079864 = .text:0x80079864; // type:function size:0xA0
fn_80079904 = .text:0x80079904; // type:function size:0x14C
fn_80079A50 = .text:0x80079A50; // type:function size:0x1C8
fn_80079C18 = .text:0x80079C18; // type:function size:0x60
CpuDecideItemPurchase = .text:0x80079C78; // type:function size:0x158
COMGetShopItemSelect = .text:0x80079C78; // type:function size:0x158 scope:local
fn_80079DD0 = .text:0x80079DD0; // type:function size:0x30
fn_80079E00 = .text:0x80079E00; // type:function size:0x188
fn_80079F88 = .text:0x80079F88; // type:function size:0xC
@ -5161,8 +5161,8 @@ lbl_80139A70 = .data:0x80139A70; // type:object size:0x30
lbl_80139AA0 = .data:0x80139AA0; // type:object size:0x24
lbl_80139AC4 = .data:0x80139AC4; // type:object size:0x24
lbl_80139AE8 = .data:0x80139AE8; // type:object size:0x18
CharacterItemPreferences = .data:0x80139B00; // type:object size:0x60
CPUItemUsageTimingFunctions = .data:0x80139B60; // type:object size:0x38
COMItemWeightTbl = .data:0x80139B00; // type:object size:0x60 scope:local
COMItemUseCheckFuncTbl = .data:0x80139B60; // type:object size:0x38 scope:local
lbl_80139B98 = .data:0x80139B98; // type:object size:0x30
lbl_80139BC8 = .data:0x80139BC8; // type:object size:0xB8
lbl_80139C80 = .data:0x80139C80; // type:object size:0x24
@ -5171,7 +5171,7 @@ lbl_80139CC8 = .data:0x80139CC8; // type:object size:0xC
lbl_80139CD4 = .data:0x80139CD4; // type:object size:0xC
jumptable_80139CE0 = .data:0x80139CE0; // type:object size:0x28 scope:local
lbl_80139D08 = .data:0x80139D08; // type:object size:0x24
ItemPrices = .data:0x80139D2C; // type:object size:0x10
ItemPriceTbl = .data:0x80139D2C; // type:object size:0x10 scope:local
lbl_80139D3C = .data:0x80139D3C; // type:object size:0x6C
lbl_80139DA8 = .data:0x80139DA8; // type:object size:0xB0
lbl_80139E58 = .data:0x80139E58; // type:object size:0x30 data:float
@ -5501,7 +5501,7 @@ lbl_8019D998 = .bss:0x8019D998; // type:object size:0x20
lbl_8019D9B8 = .bss:0x8019D9B8; // type:object size:0x40
lbl_8019D9F8 = .bss:0x8019D9F8; // type:object size:0xC data:float
lbl_8019DA04 = .bss:0x8019DA04; // type:object size:0xC data:4byte
SpaceData = .bss:0x8019DA10; // type:object size:0x7000 data:float
SpaceData = .bss:0x8019DA10; // type:object size:0x7000 scope:local data:float
lbl_801A4A10 = .bss:0x801A4A10; // type:object size:0x50
lbl_801A4A60 = .bss:0x801A4A60; // type:object size:0x14 data:4byte
lbl_801A4A74 = .bss:0x801A4A74; // type:object size:0x1C

5
configure.py
View file

@ -284,6 +284,11 @@ config.libs = [
Object(NonMatching, "game/board/board.c"),
Object(NonMatching, "game/board/model.c"),
Object(NonMatching, "game/board/window.c"),
Object(NonMatching, "game/board/com.c"),
Object(NonMatching, "game/board/overhead.c"),
Object(NonMatching, "game/board/space.c"),
Object(NonMatching, "game/board/shop.c"),
Object(NonMatching, "game/board/lottery.c"),
],
},
DolphinLib(

6
include/functions.h
View file

@ -53,9 +53,9 @@ void fn_8004D6F4(s16 arg);
s32 _CheckFlag(u32 flag);
void BoardMessCreate(s16, s32, s32);
void BoardMessKill(void);
void BoardMessWait(void);
void BoardWinCreate(s16, s32, s32);
void BoardWinKill(void);
void BoardWinWait(void);
s32 HuTHPFrameGet(void);

6
src/REL/w10Dll/w10Dll2.c
View file

@ -31,9 +31,9 @@ void fn_1_BA0(s32 arg0) {
var_r31 = 6;
break;
}
BoardMessCreate(var_r31, arg0, -1);
BoardMessWait();
BoardMessKill();
BoardWinCreate(var_r31, arg0, -1);
BoardWinWait();
BoardWinKill();
}
void fn_1_C10(s16 arg0) {