Convert setup segment into game's .data segment

This commit is contained in:
Ryan Dwyer
2020-02-02 19:22:36 +10:00
parent 669add3455
commit b06e2a87b2
98 changed files with 391 additions and 302 deletions
+7 -7
View File
@@ -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
+1 -1
View File
@@ -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
+102 -13
View File
@@ -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);
+10 -10
View File
@@ -1,5 +1,5 @@
#include <ultra64.h>
#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(
+3 -3
View File
@@ -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"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_005fd0.h"
+4 -4
View File
@@ -1,10 +1,10 @@
#include <ultra64.h>
#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"
+3 -3
View File
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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"
GLOBAL_ASM(
+1 -1
View File
@@ -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)
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000130.h"
#include "game/game_097890.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_066310.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_005fd0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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"
GLOBAL_ASM(
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_00b200.h"
#include "game/game_00b820.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_011110.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_00c240.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_00b200.h"
#include "game/game_00b820.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_097a50.h"
#include "game/game_157db0.h"
+4 -4
View File
@@ -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"
+3 -3
View File
@@ -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)
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0125a0.h"
#include "game/game_013540.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_129900.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_013540.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/chr/chr.h"
#include "game/game_0601b0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_066310.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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"
GLOBAL_ASM(
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0601b0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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"
/**
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/game_015470.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_1668e0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_01d9f0.h"
#include "library/library_12dc0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_005fd0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_096750.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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"
GLOBAL_ASM(
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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"
GLOBAL_ASM(
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_096750.h"
#include "game/game_097a50.h"
+4 -4
View File
@@ -1,10 +1,10 @@
#include <ultra64.h>
#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"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0b2150.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/game_015470.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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"
GLOBAL_ASM(
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/chr/chr.h"
#include "game/game_0601b0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/chr/chr.h"
#include "game/game_0601b0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/chr/chr.h"
#include "game/game_066310.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/game_066310.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -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"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0b28d0.h"
#include "game/game_0d4690.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/game_015470.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_097a50.h"
#include "game/game_0b0420.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_096750.h"
#include "game/game_0c79f0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0601b0.h"
#include "game/game_114240.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0f09f0.h"
#include "game/game_10ccd0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_066310.h"
#include "game/game_096750.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/chr/chr.h"
#include "game/game_066310.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_005fd0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_066310.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_005fd0.h"
#include "game/game_0d4690.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_013540.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0b28d0.h"
#include "game/game_157db0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_005fd0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0b28d0.h"
#include "game/game_0f09f0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0b28d0.h"
#include "game/game_0f09f0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_1668e0.h"
#include "game/game_175f50.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_1668e0.h"
#include "game/game_175f50.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0b28d0.h"
#include "game/pdoptions.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/game_005fd0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_015470.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/chr/chr.h"
#include "game/game_066310.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/chr/chr.h"
#include "game/game_0601b0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_000920.h"
#include "game/chr/chr.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/chr/chr.h"
#include "game/game_097970.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_0f09f0.h"
#include "game/game_10ccd0.h"
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.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/game_16cfa0.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 <ultra64.h>
extern struct ailist g_GlobalAilists[];
@@ -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 <ultra64.h>
extern struct cheat g_Cheats[NUM_CHEATS];
@@ -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 <ultra64.h>
#include "types.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 <ultra64.h>
extern struct menu_dialog menudialog_18d78;
@@ -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 <ultra64.h>
extern u16 iomessages[];
@@ -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 <ultra64.h>
extern struct menu_dialog menudialog_2a800;
@@ -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 <ultra64.h>
extern struct inventory_menupos invmenupos_00010fd0;
extern struct inventory_typee inve_000110c0;
+1 -1
View File
@@ -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";
+1 -1
View File
@@ -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";
+2 -2
View File
@@ -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};
+3 -3
View File
@@ -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')
+12 -12
View File
@@ -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,
},
}
+2 -2
View File
@@ -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