From b06e2a87b2d0f6de134fe55097ba4df4845afea7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 2 Feb 2020 19:22:36 +1000 Subject: [PATCH] Convert setup segment into game's .data segment --- Makefile | 14 +-- checksums.md5 | 2 +- ld/stage1.ld | 115 ++++++++++++++++-- src/boot/boot.c | 20 +-- src/game/cheats.c | 6 +- src/game/chr/chr.c | 6 +- src/game/chr/chrai.c | 8 +- src/game/chr/chraicommands.c | 6 +- src/{setup => game/data}/ailists.c | 2 +- src/{setup => game/data}/cheats.c | 2 +- .../data/data_000000.c} | 2 +- .../data/data_0160b0.c} | 8 +- .../data/data_01a3a0.c} | 6 +- .../data/data_020df0.c} | 4 +- src/{setup => game/data}/inventory.c | 2 +- src/game/game_000000.c | 6 +- src/game/game_000090.c | 2 +- src/game/game_000130.c | 6 +- src/game/game_000920.c | 6 +- src/game/game_005fd0.c | 6 +- src/game/game_00b190.c | 6 +- src/game/game_00b200.c | 6 +- src/game/game_00b820.c | 6 +- src/game/game_00c240.c | 6 +- src/game/game_00c490.c | 6 +- src/game/game_0109d0.c | 6 +- src/game/game_011110.c | 8 +- src/game/game_012450.c | 6 +- src/game/game_0125a0.c | 6 +- src/game/game_013260.c | 6 +- src/game/game_013540.c | 6 +- src/game/game_014f10.c | 6 +- src/game/game_015010.c | 6 +- src/game/game_0150a0.c | 6 +- src/game/game_015280.c | 6 +- src/game/game_015420.c | 6 +- src/game/game_015470.c | 6 +- src/game/game_01d860.c | 6 +- src/game/game_01d9f0.c | 6 +- src/game/game_0601b0.c | 6 +- src/game/game_066310.c | 6 +- src/game/game_096750.c | 6 +- src/game/game_097890.c | 6 +- src/game/game_097970.c | 6 +- src/game/game_097a50.c | 6 +- src/game/game_0abe70.c | 6 +- src/game/game_0b0420.c | 8 +- src/game/game_0b2150.c | 6 +- src/game/game_0b28d0.c | 6 +- src/game/game_0c3620.c | 6 +- src/game/game_0c37d0.c | 6 +- src/game/game_0c79f0.c | 6 +- src/game/game_0cf150.c | 6 +- src/game/game_0d1fe0.c | 6 +- src/game/game_0d4690.c | 6 +- src/game/game_0dcdb0.c | 6 +- src/game/game_0f09f0.c | 6 +- src/game/game_102240.c | 6 +- src/game/game_107fb0.c | 6 +- src/game/game_10ccd0.c | 6 +- src/game/game_111600.c | 6 +- src/game/game_113220.c | 6 +- src/game/game_114240.c | 6 +- src/game/game_1165d0.c | 6 +- src/game/game_11ecf0.c | 6 +- src/game/game_128f30.c | 6 +- src/game/game_129900.c | 6 +- src/game/game_150820.c | 6 +- src/game/game_152fa0.c | 6 +- src/game/game_157db0.c | 6 +- src/game/game_165670.c | 6 +- src/game/game_1668e0.c | 6 +- src/game/game_16cfa0.c | 6 +- src/game/game_16e810.c | 6 +- src/game/game_175f90.c | 6 +- src/game/game_176000.c | 6 +- src/game/game_176080.c | 6 +- src/game/game_176d70.c | 6 +- src/game/game_187770.c | 6 +- src/game/game_197600.c | 6 +- src/game/game_1999b0.c | 6 +- src/game/game_19c990.c | 6 +- src/game/game_1a3340.c | 6 +- src/game/pad.c | 6 +- src/game/pdoptions.c | 6 +- src/include/{setup => game/data}/ailists.h | 4 +- src/include/{setup => game/data}/cheats.h | 4 +- .../data/data_000000.h} | 4 +- .../data/data_0160b0.h} | 4 +- .../data/data_01a3a0.h} | 4 +- .../data/data_020df0.h} | 4 +- src/include/{setup => game/data}/inventory.h | 4 +- src/library/library_0d520.c | 2 +- src/library/library_12dc0.c | 2 +- src/library/library_16110.c | 4 +- tools/buildrom | 6 +- tools/extract | 24 ++-- tools/extract-segment | 4 +- 98 files changed, 391 insertions(+), 302 deletions(-) rename src/{setup => game/data}/ailists.c (99%) rename src/{setup => game/data}/cheats.c (99%) rename src/{setup/setup_000000.c => game/data/data_000000.c} (99%) rename src/{setup/setup_0160b0.c => game/data/data_0160b0.c} (99%) rename src/{setup/setup_01a3a0.c => game/data/data_01a3a0.c} (99%) rename src/{setup/setup_020df0.c => game/data/data_020df0.c} (99%) rename src/{setup => game/data}/inventory.c (99%) rename src/include/{setup => game/data}/ailists.h (53%) rename src/include/{setup => game/data}/cheats.h (78%) rename src/include/{setup/setup_000000.h => game/data/data_000000.h} (99%) rename src/include/{setup/setup_0160b0.h => game/data/data_0160b0.h} (99%) rename src/include/{setup/setup_01a3a0.h => game/data/data_01a3a0.h} (97%) rename src/include/{setup/setup_020df0.h => game/data/data_020df0.h} (99%) rename src/include/{setup => game/data}/inventory.h (71%) diff --git a/Makefile b/Makefile index e7ec8986b..128eb339e 100644 --- a/Makefile +++ b/Makefile @@ -95,10 +95,10 @@ UCODE_BIN_FILES := \ $(B_DIR)/ucode/boot.bin \ $(B_DIR)/ucode/filenames.bin \ $(B_DIR)/ucode/game.bin \ + $(B_DIR)/ucode/gamedata.bin \ $(B_DIR)/ucode/gvars.bin \ $(B_DIR)/ucode/library.bin \ - $(B_DIR)/ucode/inflate.bin \ - $(B_DIR)/ucode/setup.bin + $(B_DIR)/ucode/inflate.bin default: all @@ -229,13 +229,13 @@ $(B_DIR)/ucode/library.bin: $(B_DIR)/stage1.bin library: $(B_DIR)/ucode/library.bin ################################################################################ -# Game setup file +# Game data file -$(B_DIR)/ucode/setup.bin: $(B_DIR)/stage1.bin +$(B_DIR)/ucode/gamedata.bin: $(B_DIR)/stage1.bin mkdir -p $(B_DIR)/ucode - B_DIR=$(B_DIR) tools/extract-segment setup + B_DIR=$(B_DIR) tools/extract-segment gamedata -setup: $(B_DIR)/ucode/setup.bin +setup: $(B_DIR)/ucode/gamedata.bin ################################################################################ # Inflate @@ -320,4 +320,4 @@ clean: binclean: rm -f build/ntsc-final/ucode/*.bin - find src/{boot,game,gvars,library,inflate,setup} -name '*.o' -delete + find src/{boot,game,gamedata,gvars,library,inflate} -name '*.o' -delete diff --git a/checksums.md5 b/checksums.md5 index f3d30aec3..63eefdecc 100644 --- a/checksums.md5 +++ b/checksums.md5 @@ -2013,6 +2013,6 @@ ea5a2ff4e5e0a68822f62feff2c40af4 build/ntsc-final/files/bgdata/bg_wax_tilesZ d41d8cd98f00b204e9800998ecf8427e build/ntsc-final/files/ob/ob_mid.seg 2a1aa1eff3cdfe5dc3e91a2e773a55b9 build/ntsc-final/ucode/boot.bin ed0462324d1287de21611707172d316a build/ntsc-final/ucode/game.bin +11c9c4c2737f66e7312949909b894dcc build/ntsc-final/ucode/gamedata.bin 843285fdc0e80a77576eeb73940d2fd3 build/ntsc-final/ucode/inflate.bin 6a227624d708b43a10f220e005aef486 build/ntsc-final/ucode/library.bin -11c9c4c2737f66e7312949909b894dcc build/ntsc-final/ucode/setup.bin diff --git a/ld/stage1.ld b/ld/stage1.ld index 5828042d6..214f7acfa 100644 --- a/ld/stage1.ld +++ b/ld/stage1.ld @@ -12,10 +12,10 @@ OUTPUT_ARCH (mips) SECTIONS { - setupSegmentStart = 0x80059fe0; - setupSegmentRomStart = 0x39850; - inflateSegmentRomStart = 0x4e850; - ziplistSegmentRomStart = 0x4fc40; + _gamedataSegmentStart = 0x80059fe0; + _gamedataSegmentRomStart = 0x39850; + _inflateSegmentRomStart = 0x4e850; + _ziplistSegmentRomStart = 0x4fc40; _antipiracyUncloakWriteAddress = 0x7002a324; @@ -317,16 +317,105 @@ SECTIONS } __rompos += SIZEOF(.library); - .setup 0x80059fe0 : AT(__rompos) { - src/setup/setup_000000.o (.data); - src/setup/inventory.o (.data); - src/setup/setup_0160b0.o (.data); - src/setup/cheats.o (.data); - src/setup/setup_01a3a0.o (.data); - src/setup/ailists.o (.data); - src/setup/setup_020df0.o (.data); + .gamedata 0x80059fe0 : AT(__rompos) { + src/game/data/data_000000.o (.data); + src/game/data/inventory.o (.data); + src/game/data/data_0160b0.o (.data); + src/game/data/cheats.o (.data); + src/game/data/data_01a3a0.o (.data); + src/game/data/ailists.o (.data); + src/game/data/data_020df0.o (.data); + + src/game/game_000000.o (.data); + src/game/game_000090.o (.data); + src/game/game_000130.o (.data); + src/game/game_000850.o (.data); + src/game/game_000860.o (.data); + src/game/game_000870.o (.data); + src/game/game_000880.o (.data); + src/game/game_0008e0.o (.data); + src/game/game_0008f0.o (.data); + src/game/game_000900.o (.data); + src/game/game_000910.o (.data); + src/game/game_000920.o (.data); + src/game/game_005fd0.o (.data); + src/game/game_00b190.o (.data); + src/game/game_00b200.o (.data); + src/game/game_00b820.o (.data); + src/game/game_00c240.o (.data); + src/game/game_00c490.o (.data); + src/game/game_0109d0.o (.data); + src/game/game_011110.o (.data); + src/game/game_012450.o (.data); + src/game/game_0125a0.o (.data); + src/game/game_013260.o (.data); + src/game/game_013540.o (.data); + src/game/game_014f10.o (.data); + src/game/game_015010.o (.data); + src/game/game_0150a0.o (.data); + src/game/game_015260.o (.data); + src/game/game_015270.o (.data); + src/game/game_015280.o (.data); + src/game/game_015400.o (.data); + src/game/game_015410.o (.data); + src/game/game_015420.o (.data); + src/game/game_015470.o (.data); + src/game/game_01d860.o (.data); + src/game/game_01d9f0.o (.data); + src/game/chr/chr.o (.data); + src/game/chr/chrai.o (.data); + src/game/chr/chraicommands.o (.data); + src/game/game_0601b0.o (.data); + src/game/game_066310.o (.data); + src/game/game_096750.o (.data); + src/game/game_097890.o (.data); + src/game/game_097970.o (.data); + src/game/game_097a50.o (.data); + src/game/game_0abe70.o (.data); + src/game/game_0b0420.o (.data); + src/game/game_0b2150.o (.data); + src/game/game_0b28d0.o (.data); + src/game/game_0c3620.o (.data); + src/game/game_0c37d0.o (.data); + src/game/game_0c79f0.o (.data); + src/game/game_0cf150.o (.data); + src/game/game_0d1fe0.o (.data); + src/game/game_0d4690.o (.data); + src/game/game_0dcdb0.o (.data); + src/game/game_0f09f0.o (.data); + src/game/game_102240.o (.data); + src/game/cheats.o (.data); + src/game/game_107fb0.o (.data); + src/game/game_10ccd0.o (.data); + src/game/game_111600.o (.data); + src/game/game_113220.o (.data); + src/game/game_114240.o (.data); + src/game/pad.o (.data); + src/game/game_1165d0.o (.data); + src/game/game_11ecf0.o (.data); + src/game/game_128f30.o (.data); + src/game/game_129900.o (.data); + src/game/game_150820.o (.data); + src/game/pdoptions.o (.data); + src/game/game_152fa0.o (.data); + src/game/game_157db0.o (.data); + src/game/game_165670.o (.data); + src/game/game_1668e0.o (.data); + src/game/game_16cfa0.o (.data); + src/game/game_16e810.o (.data); + src/game/game_175f50.o (.data); + src/game/game_175f90.o (.data); + src/game/game_176000.o (.data); + src/game/game_176080.o (.data); + src/game/game_176d70.o (.data); + src/game/game_187770.o (.data); + src/game/game_197600.o (.data); + src/game/game_1999b0.o (.data); + src/game/game_19c990.o (.data); + src/game/game_1a3340.o (.data); + src/game/game_1a78b0.o (.data); } - __rompos += SIZEOF(.setup); + __rompos += SIZEOF(.gamedata); .gvars 0x8008ae20 : AT(__rompos) { src/gvars/gvars.o (.data); diff --git a/src/boot/boot.c b/src/boot/boot.c index ce2e366ff..2981212e1 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -1,5 +1,5 @@ #include -#include "setup/setup_000000.h" +#include "game/data/data_000000.h" #include "gvars/gvars.h" GLOBAL_ASM( @@ -463,41 +463,41 @@ glabel func00001634 /* 166c: 00000000 */ sll $zero,$zero,0x0 ); -extern void *setupSegmentStart; +extern void *_gamedataSegmentStart; // func00001670 void *getSetupRamAddr(void) { - return &setupSegmentStart; + return &_gamedataSegmentStart; } -extern void *setupSegmentRomStart; +extern void *_gamedataSegmentRomStart; // func0000167c void *getSetupRomAddr(void) { - return &setupSegmentRomStart; + return &_gamedataSegmentRomStart; } -extern void *inflateSegmentRomStart; +extern void *_inflateSegmentRomStart; // func0001688 void *getInflateRomAddr(void) { - return &inflateSegmentRomStart; + return &_inflateSegmentRomStart; } // func0001694 void *getInflateRomAddr2(void) { - return &inflateSegmentRomStart; + return &_inflateSegmentRomStart; } -extern void *ziplistSegmentRomStart; +extern void *_ziplistSegmentRomStart; void *getZiplistSegmentRomstart(void) { - return &ziplistSegmentRomStart; + return &_ziplistSegmentRomStart; } GLOBAL_ASM( diff --git a/src/game/cheats.c b/src/game/cheats.c index 0035d2d57..50e9e72d8 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -2,9 +2,9 @@ #include "boot/boot.h" #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/cheats.h" #include "game/game_10ccd0.h" diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index d0ae24678..0c05c04a0 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" diff --git a/src/game/chr/chrai.c b/src/game/chr/chrai.c index 1a6b8ac98..091ea853d 100644 --- a/src/game/chr/chrai.c +++ b/src/game/chr/chrai.c @@ -1,10 +1,10 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/ailists.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/ailists.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chrai.h" #include "library/library_12dc0.h" diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 657714882..618f9a8ac 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -8,9 +8,9 @@ #include "game/game_165670.h" #include "game/game_16cfa0.h" #include "game/game_19c990.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chraicommands.h" #include "library/library_0e9d0.h" diff --git a/src/setup/ailists.c b/src/game/data/ailists.c similarity index 99% rename from src/setup/ailists.c rename to src/game/data/ailists.c index ae8ca87ad..388ab1a12 100644 --- a/src/setup/ailists.c +++ b/src/game/data/ailists.c @@ -2,7 +2,7 @@ #include "game/chr/chraicommands.h" #include "game/game_000000.h" #include "game/game_0601b0.h" -#include "setup/ailists.h" +#include "game/data/ailists.h" #include "stagesetup.h" #include "types.h" diff --git a/src/setup/cheats.c b/src/game/data/cheats.c similarity index 99% rename from src/setup/cheats.c rename to src/game/data/cheats.c index 7391fbb55..808f86245 100644 --- a/src/setup/cheats.c +++ b/src/game/data/cheats.c @@ -8,7 +8,7 @@ #include "game/game_176d70.h" #include "game/game_1a3340.h" #include "gvars/gvars.h" -#include "setup/cheats.h" +#include "game/data/cheats.h" #include "stagesetup.h" #include "types.h" diff --git a/src/setup/setup_000000.c b/src/game/data/data_000000.c similarity index 99% rename from src/setup/setup_000000.c rename to src/game/data/data_000000.c index 66bf97654..686568bb3 100644 --- a/src/setup/setup_000000.c +++ b/src/game/data/data_000000.c @@ -4,7 +4,7 @@ #include "game/game_0601b0.h" #include "game/game_015470.h" #include "game/game_0dcdb0.h" -#include "setup/setup_000000.h" +#include "game/data/data_000000.h" #include "stagesetup.h" #include "types.h" diff --git a/src/setup/setup_0160b0.c b/src/game/data/data_0160b0.c similarity index 99% rename from src/setup/setup_0160b0.c rename to src/game/data/data_0160b0.c index 8b289f756..f4871e074 100644 --- a/src/setup/setup_0160b0.c +++ b/src/game/data/data_0160b0.c @@ -8,10 +8,10 @@ #include "game/game_176d70.h" #include "game/game_1a3340.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/cheats.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/cheats.h" +#include "game/data/data_020df0.h" #include "stagesetup.h" #include "types.h" diff --git a/src/setup/setup_01a3a0.c b/src/game/data/data_01a3a0.c similarity index 99% rename from src/setup/setup_01a3a0.c rename to src/game/data/data_01a3a0.c index 5b842626f..93c75d7d6 100644 --- a/src/setup/setup_01a3a0.c +++ b/src/game/data/data_01a3a0.c @@ -8,9 +8,9 @@ #include "game/game_176d70.h" #include "game/game_1a3340.h" #include "gvars/gvars.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "stagesetup.h" #include "types.h" diff --git a/src/setup/setup_020df0.c b/src/game/data/data_020df0.c similarity index 99% rename from src/setup/setup_020df0.c rename to src/game/data/data_020df0.c index affdb029d..ea45b786e 100644 --- a/src/setup/setup_020df0.c +++ b/src/game/data/data_020df0.c @@ -7,8 +7,8 @@ #include "game/game_10ccd0.h" #include "game/game_176d70.h" #include "game/game_1a3340.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "stagesetup.h" #include "types.h" diff --git a/src/setup/inventory.c b/src/game/data/inventory.c similarity index 99% rename from src/setup/inventory.c rename to src/game/data/inventory.c index f668db777..b77e5f015 100644 --- a/src/setup/inventory.c +++ b/src/game/data/inventory.c @@ -2,7 +2,7 @@ #include "game/chr/chraicommands.h" #include "game/game_000000.h" #include "game/game_0601b0.h" -#include "setup/inventory.h" +#include "game/data/inventory.h" #include "stagesetup.h" #include "types.h" diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 86382a24b..fe9509d09 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_000090.c b/src/game/game_000090.c index 57c518e80..e8b94c266 100644 --- a/src/game/game_000090.c +++ b/src/game/game_000090.c @@ -3,7 +3,7 @@ #include "game/chr/chr.h" #include "game/game_000130.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" +#include "game/data/data_000000.h" #include "types.h" void func0f000090(void) diff --git a/src/game/game_000130.c b/src/game/game_000130.c index cfd207b87..67a3aef22 100644 --- a/src/game/game_000130.c +++ b/src/game/game_000130.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000130.h" #include "game/game_097890.h" diff --git a/src/game/game_000920.c b/src/game/game_000920.c index 7bd9d8f18..1395ba52f 100644 --- a/src/game/game_000920.c +++ b/src/game/game_000920.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_066310.h" diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index bc3ef46d6..51b7af0be 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" diff --git a/src/game/game_00b190.c b/src/game/game_00b190.c index 0e75efa53..ca2ef50d7 100644 --- a/src/game/game_00b190.c +++ b/src/game/game_00b190.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_00b200.c b/src/game/game_00b200.c index 1d76d1ffd..7bc72c9b7 100644 --- a/src/game/game_00b200.c +++ b/src/game/game_00b200.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_00b200.h" #include "game/game_00b820.h" diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index d3acec29d..b2d73ece2 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_011110.h" #include "game/chr/chr.h" diff --git a/src/game/game_00c240.c b/src/game/game_00c240.c index 8ce09fc27..f0400eb4f 100644 --- a/src/game/game_00c240.c +++ b/src/game/game_00c240.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_00c240.h" diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 2706c0531..88bb89a87 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_00b200.h" #include "game/game_00b820.h" diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index 65e3ed3fb..a8562e568 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_097a50.h" #include "game/game_157db0.h" diff --git a/src/game/game_011110.c b/src/game/game_011110.c index 26f351915..4a396a39b 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -2,10 +2,10 @@ #include "constants.h" #include "gvars/gvars.h" #include "math.h" -#include "setup/inventory.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/inventory.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_011110.h" #include "game/chr/chr.h" diff --git a/src/game/game_012450.c b/src/game/game_012450.c index 9361b5ccd..ce89b1d59 100644 --- a/src/game/game_012450.c +++ b/src/game/game_012450.c @@ -5,9 +5,9 @@ #include "game/game_012450.h" #include "game/game_111600.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" void currentPlayerInitGunsHeld(void) diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index 7a5ab9eb1..536947e29 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0125a0.h" #include "game/game_013540.h" diff --git a/src/game/game_013260.c b/src/game/game_013260.c index 85af986d8..3d960b16d 100644 --- a/src/game/game_013260.c +++ b/src/game/game_013260.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_129900.h" diff --git a/src/game/game_013540.c b/src/game/game_013540.c index 796aea232..9acee328a 100644 --- a/src/game/game_013540.c +++ b/src/game/game_013540.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_013540.h" #include "game/chr/chr.h" diff --git a/src/game/game_014f10.c b/src/game/game_014f10.c index 53cb52613..92b783d81 100644 --- a/src/game/game_014f10.c +++ b/src/game/game_014f10.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chr.h" #include "game/game_0601b0.h" diff --git a/src/game/game_015010.c b/src/game/game_015010.c index 126b2767a..c5839a5dd 100644 --- a/src/game/game_015010.c +++ b/src/game/game_015010.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_066310.h" diff --git a/src/game/game_0150a0.c b/src/game/game_0150a0.c index 0f1368803..4443254b4 100644 --- a/src/game/game_0150a0.c +++ b/src/game/game_0150a0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_015280.c b/src/game/game_015280.c index f402c6e83..616581eb4 100644 --- a/src/game/game_015280.c +++ b/src/game/game_015280.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0601b0.h" diff --git a/src/game/game_015420.c b/src/game/game_015420.c index fc95efa7a..ede1b52d0 100644 --- a/src/game/game_015420.c +++ b/src/game/game_015420.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" /** diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 8b7b31f67..ee544dcb9 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/game_015470.h" diff --git a/src/game/game_01d860.c b/src/game/game_01d860.c index c921320d0..3f90cad3f 100644 --- a/src/game/game_01d860.c +++ b/src/game/game_01d860.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_1668e0.h" diff --git a/src/game/game_01d9f0.c b/src/game/game_01d9f0.c index a801df03f..7ec8ac662 100644 --- a/src/game/game_01d9f0.c +++ b/src/game/game_01d9f0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_01d9f0.h" #include "library/library_12dc0.h" diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index d5f616433..7a6a6067b 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/chr/chr.h" diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 0f304fd0b..dd128158b 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" diff --git a/src/game/game_096750.c b/src/game/game_096750.c index e68011ef2..ee985e1ba 100644 --- a/src/game/game_096750.c +++ b/src/game/game_096750.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_096750.h" diff --git a/src/game/game_097890.c b/src/game/game_097890.c index 6052ea8ce..859af1703 100644 --- a/src/game/game_097890.c +++ b/src/game/game_097890.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_097970.c b/src/game/game_097970.c index 184c3ad86..e4748440d 100644 --- a/src/game/game_097970.c +++ b/src/game/game_097970.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c index e5bac6448..0b35020d9 100644 --- a/src/game/game_097a50.c +++ b/src/game/game_097a50.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/chr/chr.h" diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 323f5ccbd..2b6487250 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_096750.h" #include "game/game_097a50.h" diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index 9be8cbc4b..2a8abd9b4 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -1,10 +1,10 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/inventory.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/inventory.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_097a50.h" #include "game/game_0b0420.h" diff --git a/src/game/game_0b2150.c b/src/game/game_0b2150.c index 388d68ebb..cccbfe4e4 100644 --- a/src/game/game_0b2150.c +++ b/src/game/game_0b2150.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0b2150.h" diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 60d5c112c..7f877a334 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/game_015470.h" diff --git a/src/game/game_0c3620.c b/src/game/game_0c3620.c index 56242ee8d..cede637ef 100644 --- a/src/game/game_0c3620.c +++ b/src/game/game_0c3620.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0c37d0.c b/src/game/game_0c37d0.c index 094b7989f..27d93e2a9 100644 --- a/src/game/game_0c37d0.c +++ b/src/game/game_0c37d0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/chr/chr.h" diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index 983687908..2e72ab1a3 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/chr/chr.h" diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c index 6839b9d74..1ae90b32f 100644 --- a/src/game/game_0cf150.c +++ b/src/game/game_0cf150.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chr.h" #include "game/game_0601b0.h" diff --git a/src/game/game_0d1fe0.c b/src/game/game_0d1fe0.c index b6c5e5fd8..1f3109618 100644 --- a/src/game/game_0d1fe0.c +++ b/src/game/game_0d1fe0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chr.h" #include "game/game_0601b0.h" diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 4e473d50b..7399365e4 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chr.h" #include "game/game_066310.h" diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 1249b93f4..342f1a436 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/game_066310.h" diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index aa79dd27a..645db206b 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/chr/chr.h" diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 3b14b7e5f..efef19d78 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -4,9 +4,9 @@ #include "library/library_09660.h" #include "library/library_0d520.h" #include "library/library_0e9d0.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_00c490.h" #include "game/game_015470.h" diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index c64c1a075..a447c12d5 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0b28d0.h" #include "game/game_0d4690.h" diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index a7b0d71f7..758571b47 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/game_015470.h" diff --git a/src/game/game_111600.c b/src/game/game_111600.c index fc5776fc3..ad0caad30 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_097a50.h" #include "game/game_0b0420.h" diff --git a/src/game/game_113220.c b/src/game/game_113220.c index 32782f891..88eae433f 100644 --- a/src/game/game_113220.c +++ b/src/game/game_113220.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_096750.h" #include "game/game_0c79f0.h" diff --git a/src/game/game_114240.c b/src/game/game_114240.c index a9f78948a..078f3bfca 100644 --- a/src/game/game_114240.c +++ b/src/game/game_114240.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0601b0.h" #include "game/game_114240.h" diff --git a/src/game/game_1165d0.c b/src/game/game_1165d0.c index 919a504c0..4f1546fc7 100644 --- a/src/game/game_1165d0.c +++ b/src/game/game_1165d0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0f09f0.h" #include "game/game_10ccd0.h" diff --git a/src/game/game_11ecf0.c b/src/game/game_11ecf0.c index 51c2c1919..4888efb9f 100644 --- a/src/game/game_11ecf0.c +++ b/src/game/game_11ecf0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_066310.h" #include "game/game_096750.h" diff --git a/src/game/game_128f30.c b/src/game/game_128f30.c index 9e391c2aa..4ea48c8bf 100644 --- a/src/game/game_128f30.c +++ b/src/game/game_128f30.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chr.h" #include "game/game_066310.h" diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 480e89209..fc0e62e0f 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" diff --git a/src/game/game_150820.c b/src/game/game_150820.c index ca4839f2e..b9570623c 100644 --- a/src/game/game_150820.c +++ b/src/game/game_150820.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_066310.h" diff --git a/src/game/game_152fa0.c b/src/game/game_152fa0.c index ed698999e..98717aba7 100644 --- a/src/game/game_152fa0.c +++ b/src/game/game_152fa0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_005fd0.h" #include "game/game_0d4690.h" diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index d93bc4e51..a9fba6c22 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_013540.h" diff --git a/src/game/game_165670.c b/src/game/game_165670.c index 31120b4b6..176fa0deb 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0b28d0.h" #include "game/game_157db0.h" diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 109413b08..be1bc3e9a 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 3a304a1fc..c28ba4ea4 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0b28d0.h" #include "game/game_0f09f0.h" diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index 251a5ec7b..4e8ff49db 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0b28d0.h" #include "game/game_0f09f0.h" diff --git a/src/game/game_175f90.c b/src/game/game_175f90.c index 55925dd66..d846795d8 100644 --- a/src/game/game_175f90.c +++ b/src/game/game_175f90.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_1668e0.h" #include "game/game_175f50.h" diff --git a/src/game/game_176000.c b/src/game/game_176000.c index 73faca5cf..0da7884b4 100644 --- a/src/game/game_176000.c +++ b/src/game/game_176000.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_1668e0.h" #include "game/game_175f50.h" diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 0ffcf59cc..3c685572f 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0b28d0.h" #include "game/pdoptions.h" diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index a03ae954f..11810ae79 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/game_005fd0.h" diff --git a/src/game/game_187770.c b/src/game/game_187770.c index df0779e75..d91758d43 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_015470.h" #include "game/chr/chr.h" diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 8bcff5e0a..a27f40107 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chr.h" #include "game/game_066310.h" diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 8a9899d6d..1de64d734 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chr.h" #include "game/game_0601b0.h" diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 3d7f8203f..b77361152 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_000920.h" #include "game/chr/chr.h" diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 5456b8bbb..c1f02bf81 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/chr/chr.h" #include "game/game_097970.h" diff --git a/src/game/pad.c b/src/game/pad.c index 830e7d428..ab7957d0b 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_0f09f0.h" #include "game/game_10ccd0.h" diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c index 3e9527983..6c3318599 100644 --- a/src/game/pdoptions.c +++ b/src/game/pdoptions.c @@ -1,9 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" +#include "game/data/data_000000.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" #include "types.h" #include "game/game_16cfa0.h" diff --git a/src/include/setup/ailists.h b/src/include/game/data/ailists.h similarity index 53% rename from src/include/setup/ailists.h rename to src/include/game/data/ailists.h index c28a652a1..816b95d4b 100644 --- a/src/include/setup/ailists.h +++ b/src/include/game/data/ailists.h @@ -1,5 +1,5 @@ -#ifndef IN_SETUP_AILISTS_H -#define IN_SETUP_AILISTS_H +#ifndef IN_GAME_DATA_AILISTS_H +#define IN_GAME_DATA_AILISTS_H #include extern struct ailist g_GlobalAilists[]; diff --git a/src/include/setup/cheats.h b/src/include/game/data/cheats.h similarity index 78% rename from src/include/setup/cheats.h rename to src/include/game/data/cheats.h index fad231481..083d3849a 100644 --- a/src/include/setup/cheats.h +++ b/src/include/game/data/cheats.h @@ -1,5 +1,5 @@ -#ifndef IN_SETUP_CHEATS_H -#define IN_SETUP_CHEATS_H +#ifndef IN_GAME_DATA_CHEATS_H +#define IN_GAME_DATA_CHEATS_H #include extern struct cheat g_Cheats[NUM_CHEATS]; diff --git a/src/include/setup/setup_000000.h b/src/include/game/data/data_000000.h similarity index 99% rename from src/include/setup/setup_000000.h rename to src/include/game/data/data_000000.h index 95cd2605e..b96974a24 100644 --- a/src/include/setup/setup_000000.h +++ b/src/include/game/data/data_000000.h @@ -1,5 +1,5 @@ -#ifndef IN_SETUP_000000_H -#define IN_SETUP_000000_H +#ifndef IN_GAME_DATA_000000_H +#define IN_GAME_DATA_000000_H #include #include "types.h" diff --git a/src/include/setup/setup_0160b0.h b/src/include/game/data/data_0160b0.h similarity index 99% rename from src/include/setup/setup_0160b0.h rename to src/include/game/data/data_0160b0.h index f6a679df1..ef44ae15f 100644 --- a/src/include/setup/setup_0160b0.h +++ b/src/include/game/data/data_0160b0.h @@ -1,5 +1,5 @@ -#ifndef IN_SETUP_0160B0_H -#define IN_SETUP_0160B0_H +#ifndef IN_GAME_DATA_0160B0_H +#define IN_GAME_DATA_0160B0_H #include extern struct menu_dialog menudialog_18d78; diff --git a/src/include/setup/setup_01a3a0.h b/src/include/game/data/data_01a3a0.h similarity index 97% rename from src/include/setup/setup_01a3a0.h rename to src/include/game/data/data_01a3a0.h index 33e99cf0c..13c14f0da 100644 --- a/src/include/setup/setup_01a3a0.h +++ b/src/include/game/data/data_01a3a0.h @@ -1,5 +1,5 @@ -#ifndef IN_SETUP_01A3A0_H -#define IN_SETUP_01A3A0_H +#ifndef IN_GAME_DATA_01A3A0_H +#define IN_GAME_DATA_01A3A0_H #include extern u16 iomessages[]; diff --git a/src/include/setup/setup_020df0.h b/src/include/game/data/data_020df0.h similarity index 99% rename from src/include/setup/setup_020df0.h rename to src/include/game/data/data_020df0.h index b416a6f31..8264cfdc1 100644 --- a/src/include/setup/setup_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -1,5 +1,5 @@ -#ifndef IN_SETUP_020DF0_H -#define IN_SETUP_020DF0_H +#ifndef IN_GAME_DATA_020DF0_H +#define IN_GAME_DATA_020DF0_H #include extern struct menu_dialog menudialog_2a800; diff --git a/src/include/setup/inventory.h b/src/include/game/data/inventory.h similarity index 71% rename from src/include/setup/inventory.h rename to src/include/game/data/inventory.h index 1f0b8d6e9..e163c838b 100644 --- a/src/include/setup/inventory.h +++ b/src/include/game/data/inventory.h @@ -1,5 +1,5 @@ -#ifndef IN_SETUP_INVENTORY_H -#define IN_SETUP_INVENTORY_H +#ifndef IN_GAME_DATA_INVENTORY_H +#define IN_GAME_DATA_INVENTORY_H #include extern struct inventory_menupos invmenupos_00010fd0; extern struct inventory_typee inve_000110c0; diff --git a/src/library/library_0d520.c b/src/library/library_0d520.c index df0c57832..b16cf5f2e 100644 --- a/src/library/library_0d520.c +++ b/src/library/library_0d520.c @@ -56,7 +56,7 @@ #include "library/library_48650.h" #include "library/library_48b20.h" #include "library/library_4b480.h" -#include "setup/setup_000000.h" +#include "game/data/data_000000.h" const char var70052ca0[] = "-ml0 -me0 -mgfx120 -mvtx98 -ma400"; const char var70052cc4[] = "-ml0 -me0 -mgfx110 -mgfxtra80 -mvtx100 -ma700"; diff --git a/src/library/library_12dc0.c b/src/library/library_12dc0.c index 9cf0dea0d..20534e2bf 100644 --- a/src/library/library_12dc0.c +++ b/src/library/library_12dc0.c @@ -5,7 +5,7 @@ #include "library/library_2fa00.h" #include "library/library_4a5e0.h" #include "library/library_4e530.h" -#include "setup/setup_000000.h" +#include "game/data/data_000000.h" const u32 var70053ff0[] = {0x00000000}; const char var70053ff4[] = "-d"; diff --git a/src/library/library_16110.c b/src/library/library_16110.c index 298305389..9280466bd 100644 --- a/src/library/library_16110.c +++ b/src/library/library_16110.c @@ -8,8 +8,8 @@ #include "library/library_16110.h" #include "library/library_4a360.h" #include "library/library_4f5e0.h" -#include "setup/ailists.h" -#include "setup/setup_000000.h" +#include "game/data/ailists.h" +#include "game/data/data_000000.h" const u32 var70054200[] = {0x42652ee0}; const u32 var70054204[] = {0x00000000}; diff --git a/tools/buildrom b/tools/buildrom index f6e0e0b1f..3922f36fb 100755 --- a/tools/buildrom +++ b/tools/buildrom @@ -20,7 +20,7 @@ def main(): write_binary(fd, 0x40, get_rspboot()) write_binary(fd, 0x1000, get_boot()) write_binary(fd, 0x3050, get_library()) - write_binary(fd, 0x39850, get_setup()) + write_binary(fd, 0x39850, get_gamedata()) write_binary(fd, 0x4e850, get_inflate()) write_binary(fd, 0x4fc40, get_gamezips()) write_binary(fd, 0x7f2388, get_fonts()) @@ -64,8 +64,8 @@ def get_boot(): def get_library(): return zip('build/ntsc-final/ucode/library.bin') -def get_setup(): - return zip('build/ntsc-final/ucode/setup.bin') +def get_gamedata(): + return zip('build/ntsc-final/ucode/gamedata.bin') def get_inflate(): return getfilecontents('build/ntsc-final/ucode/inflate.bin') diff --git a/tools/extract b/tools/extract index d9134d28d..1d99095c7 100755 --- a/tools/extract +++ b/tools/extract @@ -26,14 +26,14 @@ class Extractor: self.rom = fd.read() fd.close() - self.setup = self.decompress(self.rom[self.val('setup'):]) + self.gamedata = self.decompress(self.rom[self.val('gamedata'):]) self.extract_all() def extract_all(self): self.extract_audio() self.extract_files() self.extract_fonts() - self.extract_globals() + self.extract_gamedata() self.extract_textures() self.extract_ucodes() @@ -122,7 +122,7 @@ class Extractor: i = self.val('files') offsets = [] while True: - offset = int.from_bytes(self.setup[i:i+4], 'big') + offset = int.from_bytes(self.gamedata[i:i+4], 'big') if offset == 0 and len(offsets): return offsets offsets.append(offset) @@ -151,11 +151,11 @@ class Extractor: pass # - # Globals + # Game data # - def extract_globals(self): - self.write('ucode/setup.bin', self.setup) + def extract_gamedata(self): + self.write('ucode/gamedata.bin', self.gamedata) # # Textures @@ -227,37 +227,37 @@ class Extractor: 'ntsc-final': { 'game': 0x4fc40, 'files': 0x28080, - 'setup': 0x39850, + 'gamedata': 0x39850, 'sfxctl': 0x80a250, }, 'ntsc-1.0': { 'game': 0x4fc40, 'files': 0x28080, - 'setup': 0x39850, + 'gamedata': 0x39850, 'sfxctl': 0x80a250, }, 'ntsc-beta': { 'game': 0x43c40, 'files': 0x29160, - 'setup': 0x30850, + 'gamedata': 0x30850, 'sfxctl': 0x7be940, }, 'pal-final': { 'game': 0x4fc40, 'files': 0x28910, - 'setup': 0x39850, + 'gamedata': 0x39850, 'sfxctl': 0x7f87e0, }, 'pal-beta': { 'game': 0x4fc40, 'files': 0x29b90, - 'setup': 0x39850, + 'gamedata': 0x39850, 'sfxctl': 0x7f87e0, }, 'jap-final': { 'game': 0x4fc40, 'files': 0x28800, - 'setup': 0x39850, + 'gamedata': 0x39850, 'sfxctl': 0x7fc670, }, } diff --git a/tools/extract-segment b/tools/extract-segment index 85d84d1fc..a48a9b94f 100755 --- a/tools/extract-segment +++ b/tools/extract-segment @@ -4,8 +4,8 @@ segment=$1 -pos=$(grep "^\.$segment" $B_DIR/stage1.map | awk '{print $6}') -len=$(grep "^\.$segment" $B_DIR/stage1.map | awk '{print $3}') +pos=$(grep "^\.$segment " $B_DIR/stage1.map | awk '{print $6}') +len=$(grep "^\.$segment " $B_DIR/stage1.map | awk '{print $3}') dd if=$B_DIR/stage1.bin of=$B_DIR/ucode/$segment.bin skip=$(($pos)) iflag=skip_bytes bs=$(($len)) count=1