Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions conker.us.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
sha1: 4cbadd3c4e0729dec46af64ad018050eada4f47a

options:
platform: n64
basename: conker
target_path: baserom.us.z64
base_path: .
compiler: IDO
extensions_path: tools/splat_ext
sha1: 4cbadd3c4e0729dec46af64ad018050eada4f47a

create_undefined_funcs_auto: no
create_undefined_syms_auto: no

segments:
- name: header.us
type: bin
Expand Down Expand Up @@ -41,15 +47,15 @@ segments:
- [0x0003c124, bin] # ucode .data section
- name: game.us.rzip
type: bin
start: 0x00042450
start: 0x42450
- name: debugger.us
type: bin
start: 0x0019EA88
start: 0x19EA88
###
- [0x001A37E0, bin, compressed] # 7760 files
- [0x00AB1941, bin, compressed_padding] # 15 bytes 0x0 padding
- [0x1A37E0, bin, compressed] # 7760 files
- [0xAB1941, bin, compressed_padding] # 15 bytes 0x0 padding
###
- [0x00AB1950, bin, assets_offsets_table] # TODO: use to generate this next section
- [0xAB1950, bin, assets_offsets_table] # TODO: use to generate this next section
- name: assets00
type: rzip
start: 0x00AB1A40
Expand Down
4 changes: 2 additions & 2 deletions conker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ endif

ASM_DIRS = asm \
asm/libultra asm/libultra/audio asm/libultra/gu asm/libultra/io asm/libultra/libc asm/libultra/os \
asm/data asm/data/init asm/data/game asm/data/libultra
asm/data asm/data/init asm/data/init/data asm/data/game asm/data/libultra

BIN_DIRS = assets

Expand Down Expand Up @@ -201,7 +201,7 @@ $(GLOBAL_ASM_O_FILES): $(BUILD_DIR)/%.c.o: %.c include/variables.h include/struc
$(PYTHON) $(ASM_PROCESSOR_DIR)/asm_processor.py $(OPT_FLAGS) $< > $(BUILD_DIR)/$<
$(CC) -c -32 $(CFLAGS) $(OPT_FLAGS) $(LOOP_UNROLL) $(MIPSBIT) -o $@ $(BUILD_DIR)/$<
$(PYTHON) $(ASM_PROCESSOR_DIR)/asm_processor.py $(OPT_FLAGS) $< --post-process $@ \
--assembler "$(AS) $(ASFLAGS)" --asm-prelude $(ASM_PROCESSOR_DIR)/prelude.s
--assembler "$(AS) $(ASFLAGS)" --asm-prelude $(ASM_PROCESSOR_DIR)/prelude.inc
endif

$(BUILD_DIR)/%.c.o: %.c
Expand Down
Loading