From 20ed8d70768a0e574744e7d1c8746ed9a8bcc2a9 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Tue, 5 Dec 2023 18:37:40 -0600 Subject: [PATCH] Split until items --- config/GMPE01_00/splits.txt | 76 +++++++++++++++++++++++++++++++++++- config/GMPE01_00/symbols.txt | 2 +- configure.py | 9 +++++ 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/config/GMPE01_00/splits.txt b/config/GMPE01_00/splits.txt index 49a3522f..e1122005 100644 --- a/config/GMPE01_00/splits.txt +++ b/config/GMPE01_00/splits.txt @@ -366,7 +366,7 @@ game/board/overhead.c: game/board/space.c: .text start:0x80073FF4 end:0x80077AAC .data start:0x80139CC8 end:0x80139D08 - .bss start:0x8019DA10 end:0x801A4A10 + .bss start:0x8019DA10 end:0x801A4A60 .sdata start:0x801D3700 end:0x801D3708 .sbss start:0x801D3FB0 end:0x801D3FE8 .sdata2 start:0x801D53C0 end:0x801D5440 @@ -374,6 +374,7 @@ game/board/space.c: game/board/shop.c: .text start:0x80077AAC end:0x8007A83C .data start:0x80139D08 end:0x80139E88 + .bss start:0x801A4A60 end:0x801A4A90 .sdata start:0x801D3708 end:0x801D3728 .sbss start:0x801D3FE8 end:0x801D4008 .sdata2 start:0x801D5440 end:0x801D5510 @@ -382,10 +383,83 @@ game/board/lottery.c: .text start:0x8007A83C end:0x8007FB50 .rodata start:0x8011DEF0 end:0x8011E020 .data start:0x80139E88 end:0x8013A1F0 + .bss start:0x801A4A90 end:0x801A4AC0 .sdata start:0x801D3728 end:0x801D3748 .sbss start:0x801D4008 end:0x801D4028 .sdata2 start:0x801D5510 end:0x801D56A0 +game/board/basic_space.c: + .text start:0x8007FB50 end:0x80080D54 + .data start:0x8013A1F0 end:0x8013A228 + .sdata2 start:0x801D56A0 end:0x801D5730 + +game/board/warp.c: + .text start:0x80080D54 end:0x800816CC + .rodata start:0x8011E020 end:0x8011E040 + .data start:0x8013A228 end:0x8013A248 + .bss start:0x801A4AC0 end:0x801A4AD0 + .sdata start:0x801D3748 end:0x801D3758 + .sbss start:0x801D4028 end:0x801D4040 + .sdata2 start:0x801D5730 end:0x801D5780 + +game/board/char_roulette.c: + .text start:0x800816CC end:0x80082C90 + .data start:0x8013A248 end:0x8013A2B0 + .sdata start:0x801D3758 end:0x801D3760 + .sbss start:0x801D4040 end:0x801D4060 + .sdata2 start:0x801D5780 end:0x801D5810 + +game/board/mushroom_space.c: + .text start:0x80082C90 end:0x80083EDC + .sdata start:0x801D3760 end:0x801D3770 + .sbss start:0x801D4060 end:0x801D4070 + .sdata2 start:0x801D5810 end:0x801D5898 + +game/board/star.c: + .text start:0x80083EDC end:0x80085CC8 + .rodata start:0x8011E040 end:0x8011E0B0 + .data start:0x8013A2B0 end:0x8013A368 + .bss start:0x801A4AD0 end:0x801A4AE0 + .sdata start:0x801D3770 end:0x801D3778 + .sbss start:0x801D4070 end:0x801D4088 + .sdata2 start:0x801D5898 end:0x801D5938 + +game/board/dice_roll.c: + .text start:0x80085CC8 end:0x8008831C + .rodata start:0x8011E0B0 end:0x8011E118 + .data start:0x8013A368 end:0x8013A408 + .bss start:0x801A4AE0 end:0x801A4AF0 + .sdata start:0x801D3778 end:0x801D3790 + .sbss start:0x801D4088 end:0x801D40A8 + .sdata2 start:0x801D5938 end:0x801D59E0 + +game/board/ui.c: + .text start:0x8008831C end:0x8008DF68 + .rodata start:0x8011E118 end:0x8011E200 + .data start:0x8013A408 end:0x8013A608 + .bss start:0x801A4AF0 end:0x801A4B80 + .sdata start:0x801D3790 end:0x801D3798 + .sbss start:0x801D40A8 end:0x801D40E0 + .sdata2 start:0x801D59E0 end:0x801D5AA0 + +game/board/hidden_block.c: + .text start:0x8008DF68 end:0x8008EE28 + .rodata start:0x8011E200 end:0x8011E220 + .data start:0x8013A608 end:0x8013A620 + .bss start:0x801A4B80 end:0x801A4BA8 + .sdata start:0x801D3798 end:0x801D37A0 + .sbss start:0x801D40E0 end:0x801D40F8 + .sdata2 start:0x801D5AA0 end:0x801D5AF8 + +game/board/item.c: + .text start:0x8008EE28 end:0x800975AC + .rodata start:0x8011E220 end:0x8011E238 + .data start:0x8013A620 end:0x8013AA10 + .bss start:0x801A4BA8 end:0x801A4BE8 + .sdata start:0x801D37A0 end:0x801D37B0 + .sbss start:0x801D40F8 end:0x801D4138 + .sdata2 start:0x801D5AF8 end:0x801D5D30 + dolphin/PPCArch.c: .text start:0x800B42F4 end:0x800B439C diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index e1048fb0..de746dd1 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -5192,7 +5192,7 @@ lbl_8013A248 = .data:0x8013A248; // type:object size:0x58 lbl_8013A2A0 = .data:0x8013A2A0; // type:object size:0x10 lbl_8013A2B0 = .data:0x8013A2B0; // type:object size:0x20 lbl_8013A2D0 = .data:0x8013A2D0; // type:object size:0x48 -lbl_8013A318 = .data:0x8013A318; // type:object size:0x50 +lbl_8013A318 = .data:0x8013A318; // type:object size:0x50 noreloc lbl_8013A368 = .data:0x8013A368; // type:object size:0xC data:4byte lbl_8013A374 = .data:0x8013A374; // type:object size:0xC data:4byte lbl_8013A380 = .data:0x8013A380; // type:object size:0xC diff --git a/configure.py b/configure.py index 89c56295..210cdc43 100755 --- a/configure.py +++ b/configure.py @@ -289,6 +289,15 @@ config.libs = [ Object(NonMatching, "game/board/space.c"), Object(NonMatching, "game/board/shop.c"), Object(NonMatching, "game/board/lottery.c"), + Object(NonMatching, "game/board/basic_space.c"), + Object(NonMatching, "game/board/warp.c"), + Object(NonMatching, "game/board/char_roulette.c"), + Object(NonMatching, "game/board/mushroom_space.c"), + Object(NonMatching, "game/board/star.c"), + Object(NonMatching, "game/board/dice_roll.c"), + Object(NonMatching, "game/board/ui.c"), + Object(NonMatching, "game/board/hidden_block.c"), + Object(NonMatching, "game/board/item.c"), ], }, DolphinLib(