pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup and one match

Browse Source
This commit is contained in:
Ethan Roseman 2020-06-25 12:03:00 -04:00
parent 70a62efd3e
commit 41259d5417
10 changed files with 1152 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,7 +3,6 @@ n64split
*.bin
*.FS
*.bgm
papermario/PAPERMARIO.s
papermario/Map_Assets.FS
papermario/bgm
papermario/bin
@ -13,3 +12,4 @@ papermario/yay0
.idea/
.DS_Store
venv/
__pycache__/

2
PAPER_MARIO.u.yaml
View File

@ -6,7 +6,7 @@ name: "Paper Mario (U) [!]"
checksum1: 0x3ae5ee65
checksum2: 0x3c737ded
# base filename used for outputs - (please, no spaces)
basename: "PAPERMARIO"
basename: "papermario"
ranges:
# start, end, type, label
- [0x000000, 0x000040, "header", "header"]

14
papermario/Makefile
View File

@ -36,13 +36,6 @@ O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \
TOOLS_DIR = tools
MIO0TOOL = $(TOOLS_DIR)/mio0
N64CKSUM = $(TOOLS_DIR)/n64crc
N64GRAPHICS = $(TOOLS_DIR)/n64graphics
EMULATOR = mupen64plus
EMU_FLAGS = --noosd
LOADER = loader64
LOADER_FLAGS = -vwf
FixPath = $(subst /,\,$1)
##################### Compiler Options #######################
CROSS = mips-linux-gnu-
@ -64,9 +57,8 @@ $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(DATA_DIRS) $(COMPRESSED_DIRS) $(MAP_DIRS
default: all
# file dependencies generated by splitter
MAKEFILE_SPLIT = Makefile.split
include $(MAKEFILE_SPLIT)
TARGET = papermario
LD_SCRIPT = $(TARGET).ld
all: fix_asm $(BUILD_DIR) $(TARGET).z64 verify
@ -85,7 +77,7 @@ $(BUILD_DIR)/%.o: %.s
$(AS) $(ASFLAGS) -o $@ $<
$(BUILD_DIR)/%.o: %.c
$(CC) $(CFLAGS) -o - $< | $(OLD_AS) - -o $@
cpp $< | $(CC) $(CFLAGS) -o - | $(OLD_AS) - -o $@
$(BUILD_DIR)/%.o: %.bin
$(LD) -r -b binary -o $@ $<

2
papermario/Makefile.split
View File

@ -1,2 +0,0 @@
TARGET = PAPERMARIO
LD_SCRIPT = $(TARGET).ld

23
papermario/asm/code_3b750_len_20.s
View File

@ -1,23 +0,0 @@
# %s disassembly and split file
# generated by n64split v%s - N64 ROM splitter
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.include "globals.inc"
.section .text80060350, "ax"
nuGfxSwapCfb:
/* 03B750 80060350 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 03B754 80060354 AFBF0010 */ sw $ra, 0x10($sp)
/* 03B758 80060358 0C019C08 */ jal osViSwapBuffer
/* 03B75C 8006035C 8C84000C */ lw $a0, 0xc($a0)
/* 03B760 80060360 8FBF0010 */ lw $ra, 0x10($sp)
/* 03B764 80060364 03E00008 */ jr $ra
/* 03B768 80060368 27BD0018 */ addiu $sp, $sp, 0x18
/* 03B76C 8006036C 00000000 */ nop

2
papermario/checksum.sha1
View File

@ -1 +1 @@
3837f44cda784b466c9a2d99df70d77c322b97a0 PAPERMARIO.z64
3837f44cda784b466c9a2d99df70d77c322b97a0 papermario.z64

1130
papermario/diff.py Executable file
View File

File diff suppressed because it is too large Load Diff

7
papermario/diff_settings.py Normal file
View File

@ -0,0 +1,7 @@
#!/usr/bin/env python3
def apply(config, args):
config['baseimg'] = '../baserom.z64'
config['myimg'] = 'papermario.z64'
config['mapfile'] = 'build/papermario.map'
config['source_directories'] = ['.']

2
papermario/PAPERMARIO.ld → papermario/papermario.ld
View File

@ -264,7 +264,7 @@ SECTIONS
/* 0x80060350 03B750-03B770 [20] */
.text80060350 0x80060350 : AT(0x03B750) {
build/asm/code_3b750_len_20.o(.text80060350);
build/src/code_3b750_len_20.o(.text);
}
/* 0x80060370 03B770-03B7F0 [80] */

8
papermario/src/code_3b750_len_20.c Normal file
View File

@ -0,0 +1,8 @@
typedef struct {
char unk_0[0xC];
int unk_C;
} NUScTask;
void nuGfxSwapCfb(NUScTask* task) {
osViSwapBuffer(task->unk_C);
}