diff --git a/.clang-tidy b/.clang-tidy index bbfbd5c7db..5bea913a68 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,2 +1,20 @@ -Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter' -HeaderFilterRegex: '(src|include)\/.*\.h' +Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter,readability-identifier-naming' +CheckOptions: + - key: readability-identifier-naming.LocalVariableCase + value: camelBack + - key: readability-identifier-naming.ParameterCase + value: camelBack + + - key: readability-identifier-naming.TypedefCase + value: CamelCase + + # TODO: rename all unk_XXX members + #- key: readability-identifier-naming.MemberCase + # value: camelBack + + # TODO: rename all D_XXXXXXXX symbols + #- key: readability-identifier-naming.GlobalVariableCase + # value: CamelCase + #- key: readability-identifier-naming.GlobalVariablePrefix + # value: g +HeaderFilterRegex: '(src|include)\/[^P].*\.h' # ignore inclue/PR/ diff --git a/.editorconfig b/.editorconfig index 537ddfac48..df5214ff8c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,5 +9,5 @@ insert_final_newline = true [*.yaml] indent_size = 2 -[Makefile] -indent_type = tab +[{Makefile,*.mk}] +indent_style = tab diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index bf368fcfc9..4ad1bf0a99 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -4,7 +4,8 @@ { "name": "papermario", "includePath": [ - "${workspaceFolder}/include" + "${workspaceFolder}/include", + "${workspaceFolder}/src" ], "defines": [ "F3DEX_GBI_2", diff --git a/.vscode/settings.json b/.vscode/settings.json index 4b950fa383..2ee09d6a34 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,4 +11,5 @@ "-DSCRIPT(...)={}", ], "python.pythonPath": "/usr/bin/python3", + "git.ignoreLimitWarning": true, } diff --git a/Makefile b/Makefile index d0e7343ee3..6f57e35d7b 100644 --- a/Makefile +++ b/Makefile @@ -1,130 +1,172 @@ -SHELL=/bin/bash -o pipefail +### Build Options ### -MAKEFLAGS += --no-builtin-rules -MAKEFLAGS += --no-builtin-variables +# Override these options in settings.mk or with `make SETTING=value'. -################ Target Executable and Sources ############### +BASEROM = baserom.z64 +TARGET = papermario +COMPARE = 1 +NON_MATCHING = 0 -# BUILD_DIR is location where all build artifacts are placed -BUILD_DIR = build +-include settings.mk -WORLD_AREAS := area_dgb area_arn area_dro area_end area_flo area_gv area_hos area_isk area_iwa area_jan area_kgr area_kkj area_kmr area_kpa area_kzn area_mac area_mgm area_mim area_nok area_obk area_omo area_osr area_pra area_sam area_sbk area_tik area_trd area_tst - -SRC_DIRS := $(shell find src -type d) -ASM_DIRS := asm asm/os -INCLUDE_DIRS := include include/PR src -DATA_DIRS := $(shell mkdir -p bin && find bin -type d -not -name Yay0) -YAY0_DIRS := bin/Yay0 -ASSETS_FS_DIRS := assets/fs - -# Source code files -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) -ifdef PM_HEADER_REBUILD - H_FILES := $(foreach dir,$(INCLUDE_DIRS),$(wildcard $(dir)/*.h)) +# Fail early if baserom does not exist +ifeq ($(wildcard $(BASEROM)),) +$(error Baserom `$(BASEROM)' not found.) endif -DATA_FILES := $(foreach dir,$(DATA_DIRS),$(wildcard $(dir)/*.bin)) -YAY0_FILES := $(foreach dir,$(YAY0_DIRS),$(wildcard $(dir)/*.bin)) -ASSETS_FS_FILES := $(foreach dir,$(ASSETS_FS_DIRS),$(wildcard $(dir)/*.*)) -# Object files -O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.c.o)) \ - $(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.s.o)) \ - $(foreach file,$(DATA_FILES),$(BUILD_DIR)/$(file:.bin=.bin.o)) \ - $(foreach dir,$(ASSETS_FS_DIRS),$(BUILD_DIR)/$(dir).o) \ -YAY0_FILES := $(foreach file,$(YAY0_FILES),$(BUILD_DIR)/$(file:.bin=.Yay0.o)) +### Sources ### -####################### Other Tools ######################### +include sources.mk -# N64 tools -TOOLS_DIR = tools -N64CKSUM = $(TOOLS_DIR)/n64crc -##################### Compiler Options ####################### +### Output ### + +BUILD_DIR = build +ROM = $(TARGET).z64 +ELF = $(BUILD_DIR)/$(TARGET).elf +LD_SCRIPT = $(TARGET).ld +LD_MAP = $(BUILD_DIR)/$(TARGET).map + +ifdef ASSETS_FS +ASSETS_FS_OBJ = $(BUILD_DIR)/$(ASSETS_FS).o +endif + + +### Tools ### + +PYTHON = python3 +N64CKSUM = tools/n64crc +SPLAT_YAML = tools/splat.yaml +SPLAT = $(PYTHON) tools/n64splat/split.py $(BASEROM) $(SPLAT_YAML) . +YAY0COMPRESS = tools/Yay0compress +BUILD_ASSETS_FS := $(PYTHON) tools/build_assets_fs.py $(ASSETS_FS) $(BUILD_DIR)/$(ASSETS_FS) + +ifndef EMULATOR +ifneq ($(shell command -v mupen64plus-gui),) +EMULATOR = mupen64plus-gui +else +EMULATOR = mupen64plus +endif +endif + + +### Compiler Options ### + CROSS = mips-linux-gnu- AS = $(CROSS)as -OLD_AS = $(TOOLS_DIR)/mips-nintendo-nu64-as -CC = $(TOOLS_DIR)/cc1 +OLD_AS = tools/mips-nintendo-nu64-as +CC = tools/cc1 +CPP = cpp LD = $(CROSS)ld -OBJDUMP = $(CROSS)objdump OBJCOPY = $(CROSS)objcopy -TARGET = papermario - -CPPFLAGS = -Iinclude -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 +CPPFLAGS = -Iinclude -Isrc -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 ASFLAGS = -EB -Iinclude -march=vr4300 -mtune=vr4300 OLDASFLAGS = -EB -Iinclude -G 0 -CFLAGS = -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -LDFLAGS = -T undefined_syms.txt -T undefined_funcs.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/papermario.map --no-check-sections +CFLAGS = -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wimplicit -Wuninitialized -Wshadow +LDFLAGS = -T undefined_syms.txt -T undefined_funcs.txt -T $(LD_SCRIPT) -Map $(LD_MAP) --no-check-sections -######################## Targets ############################# -default: all - -LD_SCRIPT = $(TARGET).ld - -all: $(TARGET).ld $(BUILD_DIR) $(TARGET).z64 verify +### Targets ### clean: - rm -rf $(BUILD_DIR) $(TARGET).z64 - mkdir -p $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(DATA_DIRS) $(ASSETS_FS_DIRS),build/$(dir)) + rm -rf $(BUILD_DIR) + +setup: clean submodules split submodules: git submodule update --init --recursive split: - rm -rf $(DATA_DIRS) && ./tools/n64splat/split.py baserom.z64 tools/splat.yaml . --modes ld bin Yay0 PaperMarioMapFS + rm -rf bin assets + $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS split-all: - rm -rf $(DATA_DIRS) && ./tools/n64splat/split.py baserom.z64 tools/splat.yaml . --modes all + rm -rf bin assets + $(SPLAT) --modes all -$(TARGET).ld: tools/splat.yaml - ./tools/n64splat/split.py baserom.z64 tools/splat.yaml . --modes ld +test: $(ROM) +ifdef EMULATOR + $(EMULATOR) $< +else + @echo "N64 emulator not detected." && false +endif -setup: clean submodules split - make -C tools +$(LD_SCRIPT): $(SPLAT_YAML) + $(SPLAT) --modes ld -print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true - -$(BUILD_DIR): - mkdir -p $(BUILD_DIR) - -$(BUILD_DIR)/$(TARGET).elf: $(O_FILES) $(YAY0_FILES) $(LD_SCRIPT) - @$(LD) $(LDFLAGS) -o $@ - -$(BUILD_DIR)/%.s.o: %.s - $(AS) $(ASFLAGS) -o $@ $< - -$(BUILD_DIR)/%.c.o: %.c $(H_FILES) - cpp $(CPPFLAGS) $< | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) - -o $@ - -$(BUILD_DIR)/%.bin.o: %.bin - $(LD) -r -b binary -o $@ $< - -$(BUILD_DIR)/%.Yay0.o: %.bin - mkdir -p build/bin/Yay0 - tools/Yay0compress $< $<.Yay0 - $(LD) -r -b binary -o $@ $<.Yay0 - -$(BUILD_DIR)/assets/fs/%: $(ASSETS_FS_FILES) - tools/build_assets_fs.py $* - -$(BUILD_DIR)/assets/fs.bin: assets/fs.json tools/build_assets_fs.py $(foreach file,$(ASSETS_FS_FILES),build/$(file)) - tools/build_assets_fs.py - -$(BUILD_DIR)/assets/fs.o: $(BUILD_DIR)/assets/fs.bin - $(LD) -r -b binary -o $@ $< +$(ROM): $(BUILD_DIR)/$(TARGET).bin + @cp $< $@ +ifeq ($(COMPARE),1) + @sha1sum -c checksum.sha1 || (echo 'The build succeeded, but did not match the base ROM. This is expected if you are making changes to the game. To skip this check, use "make COMPARE=0".' && false) +endif $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf $(OBJCOPY) $< $@ -O binary -# final z64 updates checksum -$(TARGET).z64: $(BUILD_DIR)/$(TARGET).bin - @cp $< $@ - $(N64CKSUM) $@ +$(BUILD_DIR)/$(TARGET).elf: $(LD_SCRIPT) $(OBJECTS) $(ASSETS_FS_OBJ) + $(LD) $(LDFLAGS) -o $@ -verify: $(TARGET).z64 - sha1sum -c checksum.sha1 +# `make print-VARNAME' to print the value of $(VARNAME) +print-%: ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true -.PHONY: all clean default + +### Object Targets (see sources.mk) ### + +ifndef OBJECTS +$(warning OBJECTS is not defined by `sources.mk'.) +else + +# C +$(filter %.c.o,$(OBJECTS)): $(BUILD_DIR)/%.c.o: %.c + @mkdir -p $(shell dirname $@) + cpp $(CPPFLAGS) $< | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) - -o $@ + +# Assembly +$(filter %.s.o,$(OBJECTS)): $(BUILD_DIR)/%.s.o: %.s + @mkdir -p $(shell dirname $@) + $(AS) $(ASFLAGS) -o $@ $< + +# Uncompressed data +$(filter %.bin.o,$(OBJECTS)): $(BUILD_DIR)/%.bin.o: %.bin + @mkdir -p $(shell dirname $@) + $(LD) -r -b binary -o $@ $< + +# Compressed data +$(filter %.Yay0.o,$(OBJECTS)): $(BUILD_DIR)/%.Yay0.o: %.bin + @mkdir -p $(shell dirname $@) + $(YAY0COMPRESS) $< $(BUILD_DIR)/$*.Yay0 + $(LD) -r -b binary -o $@ $(BUILD_DIR)/$*.Yay0 + +endif + + +### Asset Filesystem (see sources.mk) ### + +# Complain if ASSETS_FS_SOURCES is undefined but ASSETS_FS is. +ifndef ASSETS_FS_SOURCES +ifdef ASSETS_FS +$(warning ASSETS_FS_SOURCES is not defined by `sources.mk' but ASSETS_FS is.) +endif +else + +$(BUILD_DIR)/$(ASSETS_FS)/%: $(ASSETS_FS)/% + @mkdir -p $(shell dirname $@) + @rm -f $@ + $(BUILD_ASSETS_FS) $* + +$(ASSETS_FS_OBJ): $(ASSETS_FS).json $(foreach file,$(ASSETS_FS_SOURCES),$(BUILD_DIR)/$(file)) + $(BUILD_ASSETS_FS) + $(LD) -r -b binary -o $@ $(BUILD_DIR)/$(ASSETS_FS).bin + +endif + + +### Make Settings ### + +.PHONY: clean test setup submodules split $(ROM) +.DEFAULT_GOAL := $(ROM) + +# Remove built-in implicit rules to improve performance +MAKEFLAGS += --no-builtin-rules diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index b0a0413e29..f5a0cf0961 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -167,7 +167,7 @@ glabel func_80240B94_BDF924 /* BDFB94 80240E04 00000000 */ nop /* BDFB98 80240E08 0280202D */ daddu $a0, $s4, $zero /* BDFB9C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* BDFBA0 80240E10 0C090207 */ jal func_8024081C +/* BDFBA0 80240E10 0C090207 */ jal func_8024081C_BDF5AC /* BDFBA4 80240E14 02A0302D */ daddu $a2, $s5, $zero /* BDFBA8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BDFBAC 80240E1C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 2b985e7f92..045ae649e6 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -167,7 +167,7 @@ glabel func_80240B94_BE4344 /* BE45B4 80240E04 00000000 */ nop /* BE45B8 80240E08 0280202D */ daddu $a0, $s4, $zero /* BE45BC 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* BE45C0 80240E10 0C090207 */ jal func_8024081C +/* BE45C0 80240E10 0C090207 */ jal func_8024081C_BE3FCC /* BE45C4 80240E14 02A0302D */ daddu $a2, $s5, $zero /* BE45C8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BE45CC 80240E1C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 14eb558996..3188997a1f 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -167,7 +167,7 @@ glabel func_80240B94_BE8774 /* BE89E4 80240E04 00000000 */ nop /* BE89E8 80240E08 0280202D */ daddu $a0, $s4, $zero /* BE89EC 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* BE89F0 80240E10 0C090207 */ jal func_8024081C +/* BE89F0 80240E10 0C090207 */ jal func_8024081C_BE83FC /* BE89F4 80240E14 02A0302D */ daddu $a2, $s5, $zero /* BE89F8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BE89FC 80240E1C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index 58dc824ff1..c72f1a5a44 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -167,7 +167,7 @@ glabel func_80240B94_C40944 /* C40BB4 80240E04 00000000 */ nop /* C40BB8 80240E08 0280202D */ daddu $a0, $s4, $zero /* C40BBC 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* C40BC0 80240E10 0C090207 */ jal func_8024081C +/* C40BC0 80240E10 0C090207 */ jal func_8024081C_C405CC /* C40BC4 80240E14 02A0302D */ daddu $a2, $s5, $zero /* C40BC8 80240E18 0280202D */ daddu $a0, $s4, $zero /* C40BCC 80240E1C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index a9965d9d70..000f1d14f5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -167,7 +167,7 @@ glabel func_80240B94_C56AD4 /* C56D44 80240E04 00000000 */ nop /* C56D48 80240E08 0280202D */ daddu $a0, $s4, $zero /* C56D4C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* C56D50 80240E10 0C090207 */ jal func_8024081C +/* C56D50 80240E10 0C090207 */ jal func_8024081C_C5675C /* C56D54 80240E14 02A0302D */ daddu $a2, $s5, $zero /* C56D58 80240E18 0280202D */ daddu $a0, $s4, $zero /* C56D5C 80240E1C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34.s index d848124240..998341325e 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34.s @@ -264,7 +264,7 @@ glabel func_80241B34 /* DF88F8 80241EF8 0809080C */ j .L80242030 /* DF88FC 80241EFC 26F70001 */ addiu $s7, $s7, 1 /* DF8900 80241F00 0260202D */ daddu $a0, $s3, $zero -/* DF8904 80241F04 0C090207 */ jal func_8024081C +/* DF8904 80241F04 0C090207 */ jal func_8024081C_DF721C /* DF8908 80241F08 0200282D */ daddu $a1, $s0, $zero /* DF890C 80241F0C 0809080C */ j .L80242030 /* DF8910 80241F10 26F70001 */ addiu $s7, $s7, 1 diff --git a/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_8024030C_CAC4FC.s b/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_8024030C_CAC4FC.s deleted file mode 100644 index c3dfd29b09..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_8024030C_CAC4FC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_CAC4FC -/* CAC4FC 8024030C 44800000 */ mtc1 $zero, $f0 -/* CAC500 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAC504 80240314 44050000 */ mfc1 $a1, $f0 -/* CAC508 80240318 0000202D */ daddu $a0, $zero, $zero -/* CAC50C 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* CAC510 80240320 AFA00014 */ sw $zero, 0x14($sp) -/* CAC514 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAC518 80240328 00A0302D */ daddu $a2, $a1, $zero -/* CAC51C 8024032C 0C01CA54 */ jal func_80072950 -/* CAC520 80240330 00A0382D */ daddu $a3, $a1, $zero -/* CAC524 80240334 8FBF0018 */ lw $ra, 0x18($sp) -/* CAC528 80240338 24020002 */ addiu $v0, $zero, 2 -/* CAC52C 8024033C 03E00008 */ jr $ra -/* CAC530 80240340 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_8024085C_97BE8C.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_8024085C_97BE8C.s deleted file mode 100644 index a789806b0c..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_8024085C_97BE8C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024085C_97BE8C -/* 97BE8C 8024085C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97BE90 80240860 AFBF0010 */ sw $ra, 0x10($sp) -/* 97BE94 80240864 0C00EAD2 */ jal get_npc_safe -/* 97BE98 80240868 8C84014C */ lw $a0, 0x14c($a0) -/* 97BE9C 8024086C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 97BEA0 80240870 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 97BEA4 80240874 C44C0038 */ lwc1 $f12, 0x38($v0) -/* 97BEA8 80240878 C44E0040 */ lwc1 $f14, 0x40($v0) -/* 97BEAC 8024087C 8C660028 */ lw $a2, 0x28($v1) -/* 97BEB0 80240880 0C00A7B5 */ jal dist2D -/* 97BEB4 80240884 8C670030 */ lw $a3, 0x30($v1) -/* 97BEB8 80240888 3C014248 */ lui $at, 0x4248 -/* 97BEBC 8024088C 44811000 */ mtc1 $at, $f2 -/* 97BEC0 80240890 00000000 */ nop -/* 97BEC4 80240894 4602003C */ c.lt.s $f0, $f2 -/* 97BEC8 80240898 00000000 */ nop -/* 97BECC 8024089C 45010002 */ bc1t .L802408A8 -/* 97BED0 802408A0 24020002 */ addiu $v0, $zero, 2 -/* 97BED4 802408A4 0000102D */ daddu $v0, $zero, $zero -.L802408A8: -/* 97BED8 802408A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 97BEDC 802408AC 03E00008 */ jr $ra -/* 97BEE0 802408B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024081C.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024081C.s deleted file mode 100644 index bc5ffa3fdb..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024081C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C -/* 98564C 8024081C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 985650 80240820 AFBF0010 */ sw $ra, 0x10($sp) -/* 985654 80240824 0C00EAD2 */ jal get_npc_safe -/* 985658 80240828 8C84014C */ lw $a0, 0x14c($a0) -/* 98565C 8024082C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 985660 80240830 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 985664 80240834 C44C0038 */ lwc1 $f12, 0x38($v0) -/* 985668 80240838 C44E0040 */ lwc1 $f14, 0x40($v0) -/* 98566C 8024083C 8C660028 */ lw $a2, 0x28($v1) -/* 985670 80240840 0C00A7B5 */ jal dist2D -/* 985674 80240844 8C670030 */ lw $a3, 0x30($v1) -/* 985678 80240848 3C014248 */ lui $at, 0x4248 -/* 98567C 8024084C 44811000 */ mtc1 $at, $f2 -/* 985680 80240850 00000000 */ nop -/* 985684 80240854 4602003C */ c.lt.s $f0, $f2 -/* 985688 80240858 00000000 */ nop -/* 98568C 8024085C 45010002 */ bc1t .L80240868 -/* 985690 80240860 24020002 */ addiu $v0, $zero, 2 -/* 985694 80240864 0000102D */ daddu $v0, $zero, $zero -.L80240868: -/* 985698 80240868 8FBF0010 */ lw $ra, 0x10($sp) -/* 98569C 8024086C 03E00008 */ jr $ra -/* 9856A0 80240870 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024081C_99878C.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024081C_99878C.s deleted file mode 100644 index 817390b51a..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024081C_99878C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_99878C -/* 99878C 8024081C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 998790 80240820 AFBF0010 */ sw $ra, 0x10($sp) -/* 998794 80240824 0C00EAD2 */ jal get_npc_safe -/* 998798 80240828 8C84014C */ lw $a0, 0x14c($a0) -/* 99879C 8024082C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 9987A0 80240830 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 9987A4 80240834 C44C0038 */ lwc1 $f12, 0x38($v0) -/* 9987A8 80240838 C44E0040 */ lwc1 $f14, 0x40($v0) -/* 9987AC 8024083C 8C660028 */ lw $a2, 0x28($v1) -/* 9987B0 80240840 0C00A7B5 */ jal dist2D -/* 9987B4 80240844 8C670030 */ lw $a3, 0x30($v1) -/* 9987B8 80240848 3C014248 */ lui $at, 0x4248 -/* 9987BC 8024084C 44811000 */ mtc1 $at, $f2 -/* 9987C0 80240850 00000000 */ nop -/* 9987C4 80240854 4602003C */ c.lt.s $f0, $f2 -/* 9987C8 80240858 00000000 */ nop -/* 9987CC 8024085C 45010002 */ bc1t .L80240868 -/* 9987D0 80240860 24020002 */ addiu $v0, $zero, 2 -/* 9987D4 80240864 0000102D */ daddu $v0, $zero, $zero -.L80240868: -/* 9987D8 80240868 8FBF0010 */ lw $ra, 0x10($sp) -/* 9987DC 8024086C 03E00008 */ jr $ra -/* 9987E0 80240870 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index f3cbeada1b..e98f289cf4 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -167,7 +167,7 @@ glabel func_80240B94_B84D14 /* B84F84 80240E04 00000000 */ nop /* B84F88 80240E08 0280202D */ daddu $a0, $s4, $zero /* B84F8C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* B84F90 80240E10 0C090207 */ jal func_8024081C +/* B84F90 80240E10 0C090207 */ jal func_8024081C_B8499C /* B84F94 80240E14 02A0302D */ daddu $a2, $s5, $zero /* B84F98 80240E18 0280202D */ daddu $a0, $s4, $zero /* B84F9C 80240E1C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index 6af2c285b2..4f63deef62 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -167,7 +167,7 @@ glabel func_80240B94_AC5D04 /* AC5F74 80240E04 00000000 */ nop /* AC5F78 80240E08 0280202D */ daddu $a0, $s4, $zero /* AC5F7C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* AC5F80 80240E10 0C090207 */ jal func_8024081C +/* AC5F80 80240E10 0C090207 */ jal func_8024081C_AC598C /* AC5F84 80240E14 02A0302D */ daddu $a2, $s5, $zero /* AC5F88 80240E18 0280202D */ daddu $a0, $s4, $zero /* AC5F8C 80240E1C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_8024097C.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_8024097C.s deleted file mode 100644 index c430607903..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_8024097C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024097C -/* A478DC 8024097C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A478E0 80240980 AFBF0010 */ sw $ra, 0x10($sp) -/* A478E4 80240984 0C00EAD2 */ jal get_npc_safe -/* A478E8 80240988 8C84014C */ lw $a0, 0x14c($a0) -/* A478EC 8024098C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* A478F0 80240990 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* A478F4 80240994 C44C0038 */ lwc1 $f12, 0x38($v0) -/* A478F8 80240998 C44E0040 */ lwc1 $f14, 0x40($v0) -/* A478FC 8024099C 8C660028 */ lw $a2, 0x28($v1) -/* A47900 802409A0 0C00A7B5 */ jal dist2D -/* A47904 802409A4 8C670030 */ lw $a3, 0x30($v1) -/* A47908 802409A8 3C014248 */ lui $at, 0x4248 -/* A4790C 802409AC 44811000 */ mtc1 $at, $f2 -/* A47910 802409B0 00000000 */ nop -/* A47914 802409B4 4602003C */ c.lt.s $f0, $f2 -/* A47918 802409B8 00000000 */ nop -/* A4791C 802409BC 45010002 */ bc1t .L802409C8 -/* A47920 802409C0 24020002 */ addiu $v0, $zero, 2 -/* A47924 802409C4 0000102D */ daddu $v0, $zero, $zero -.L802409C8: -/* A47928 802409C8 8FBF0010 */ lw $ra, 0x10($sp) -/* A4792C 802409CC 03E00008 */ jr $ra -/* A47930 802409D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024097C_A48F3C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024097C_A48F3C.s deleted file mode 100644 index 6cda5ce74f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024097C_A48F3C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024097C_A48F3C -/* A48F3C 8024097C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A48F40 80240980 AFBF0010 */ sw $ra, 0x10($sp) -/* A48F44 80240984 0C00EAD2 */ jal get_npc_safe -/* A48F48 80240988 8C84014C */ lw $a0, 0x14c($a0) -/* A48F4C 8024098C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* A48F50 80240990 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* A48F54 80240994 C44C0038 */ lwc1 $f12, 0x38($v0) -/* A48F58 80240998 C44E0040 */ lwc1 $f14, 0x40($v0) -/* A48F5C 8024099C 8C660028 */ lw $a2, 0x28($v1) -/* A48F60 802409A0 0C00A7B5 */ jal dist2D -/* A48F64 802409A4 8C670030 */ lw $a3, 0x30($v1) -/* A48F68 802409A8 3C014248 */ lui $at, 0x4248 -/* A48F6C 802409AC 44811000 */ mtc1 $at, $f2 -/* A48F70 802409B0 00000000 */ nop -/* A48F74 802409B4 4602003C */ c.lt.s $f0, $f2 -/* A48F78 802409B8 00000000 */ nop -/* A48F7C 802409BC 45010002 */ bc1t .L802409C8 -/* A48F80 802409C0 24020002 */ addiu $v0, $zero, 2 -/* A48F84 802409C4 0000102D */ daddu $v0, $zero, $zero -.L802409C8: -/* A48F88 802409C8 8FBF0010 */ lw $ra, 0x10($sp) -/* A48F8C 802409CC 03E00008 */ jr $ra -/* A48F90 802409D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802409CC.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802409CC.s deleted file mode 100644 index 850ba7b900..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802409CC.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409CC -/* A9D5FC 802409CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9D600 802409D0 AFBF0010 */ sw $ra, 0x10($sp) -/* A9D604 802409D4 0C00EAD2 */ jal get_npc_safe -/* A9D608 802409D8 8C84014C */ lw $a0, 0x14c($a0) -/* A9D60C 802409DC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* A9D610 802409E0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* A9D614 802409E4 C44C0038 */ lwc1 $f12, 0x38($v0) -/* A9D618 802409E8 C44E0040 */ lwc1 $f14, 0x40($v0) -/* A9D61C 802409EC 8C660028 */ lw $a2, 0x28($v1) -/* A9D620 802409F0 0C00A7B5 */ jal dist2D -/* A9D624 802409F4 8C670030 */ lw $a3, 0x30($v1) -/* A9D628 802409F8 3C014248 */ lui $at, 0x4248 -/* A9D62C 802409FC 44811000 */ mtc1 $at, $f2 -/* A9D630 80240A00 00000000 */ nop -/* A9D634 80240A04 4602003C */ c.lt.s $f0, $f2 -/* A9D638 80240A08 00000000 */ nop -/* A9D63C 80240A0C 45010002 */ bc1t .L80240A18 -/* A9D640 80240A10 24020002 */ addiu $v0, $zero, 2 -/* A9D644 80240A14 0000102D */ daddu $v0, $zero, $zero -.L80240A18: -/* A9D648 80240A18 8FBF0010 */ lw $ra, 0x10($sp) -/* A9D64C 80240A1C 03E00008 */ jr $ra -/* A9D650 80240A20 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s index 5dc45eda25..c96f64bf9c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s @@ -167,7 +167,7 @@ glabel func_80240B94 /* A87854 80240E04 00000000 */ nop /* A87858 80240E08 0280202D */ daddu $a0, $s4, $zero /* A8785C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* A87860 80240E10 0C090207 */ jal func_8024081C +/* A87860 80240E10 0C090207 */ jal func_8024081C_A8726C /* A87864 80240E14 02A0302D */ daddu $a2, $s5, $zero /* A87868 80240E18 0280202D */ daddu $a0, $s4, $zero /* A8786C 80240E1C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240B2C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240B2C.s deleted file mode 100644 index e6ee4ec871..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240B2C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B2C -/* C6183C 80240B2C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C61840 80240B30 AFBF0010 */ sw $ra, 0x10($sp) -/* C61844 80240B34 0C00EAD2 */ jal get_npc_safe -/* C61848 80240B38 8C84014C */ lw $a0, 0x14c($a0) -/* C6184C 80240B3C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* C61850 80240B40 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* C61854 80240B44 C44C0038 */ lwc1 $f12, 0x38($v0) -/* C61858 80240B48 C44E0040 */ lwc1 $f14, 0x40($v0) -/* C6185C 80240B4C 8C660028 */ lw $a2, 0x28($v1) -/* C61860 80240B50 0C00A7B5 */ jal dist2D -/* C61864 80240B54 8C670030 */ lw $a3, 0x30($v1) -/* C61868 80240B58 3C014248 */ lui $at, 0x4248 -/* C6186C 80240B5C 44811000 */ mtc1 $at, $f2 -/* C61870 80240B60 00000000 */ nop -/* C61874 80240B64 4602003C */ c.lt.s $f0, $f2 -/* C61878 80240B68 00000000 */ nop -/* C6187C 80240B6C 45010002 */ bc1t .L80240B78 -/* C61880 80240B70 24020002 */ addiu $v0, $zero, 2 -/* C61884 80240B74 0000102D */ daddu $v0, $zero, $zero -.L80240B78: -/* C61888 80240B78 8FBF0010 */ lw $ra, 0x10($sp) -/* C6188C 80240B7C 03E00008 */ jr $ra -/* C61890 80240B80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802431E0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802431E0.s deleted file mode 100644 index 15595f32d8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802431E0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431E0 -/* C79EC0 802431E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C79EC4 802431E4 AFBF0010 */ sw $ra, 0x10($sp) -/* C79EC8 802431E8 0C00EAD2 */ jal get_npc_safe -/* C79ECC 802431EC 8C84014C */ lw $a0, 0x14c($a0) -/* C79ED0 802431F0 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* C79ED4 802431F4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* C79ED8 802431F8 C44C0038 */ lwc1 $f12, 0x38($v0) -/* C79EDC 802431FC C44E0040 */ lwc1 $f14, 0x40($v0) -/* C79EE0 80243200 8C660028 */ lw $a2, 0x28($v1) -/* C79EE4 80243204 0C00A7B5 */ jal dist2D -/* C79EE8 80243208 8C670030 */ lw $a3, 0x30($v1) -/* C79EEC 8024320C 3C014248 */ lui $at, 0x4248 -/* C79EF0 80243210 44811000 */ mtc1 $at, $f2 -/* C79EF4 80243214 00000000 */ nop -/* C79EF8 80243218 4602003C */ c.lt.s $f0, $f2 -/* C79EFC 8024321C 00000000 */ nop -/* C79F00 80243220 45010002 */ bc1t .L8024322C -/* C79F04 80243224 24020002 */ addiu $v0, $zero, 2 -/* C79F08 80243228 0000102D */ daddu $v0, $zero, $zero -.L8024322C: -/* C79F0C 8024322C 8FBF0010 */ lw $ra, 0x10($sp) -/* C79F10 80243230 03E00008 */ jr $ra -/* C79F14 80243234 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802424D0.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802424D0.s deleted file mode 100644 index f76e0c54dd..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802424D0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424D0 -/* C87F80 802424D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C87F84 802424D4 AFBF0010 */ sw $ra, 0x10($sp) -/* C87F88 802424D8 0C00EAD2 */ jal get_npc_safe -/* C87F8C 802424DC 8C84014C */ lw $a0, 0x14c($a0) -/* C87F90 802424E0 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* C87F94 802424E4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* C87F98 802424E8 C44C0038 */ lwc1 $f12, 0x38($v0) -/* C87F9C 802424EC C44E0040 */ lwc1 $f14, 0x40($v0) -/* C87FA0 802424F0 8C660028 */ lw $a2, 0x28($v1) -/* C87FA4 802424F4 0C00A7B5 */ jal dist2D -/* C87FA8 802424F8 8C670030 */ lw $a3, 0x30($v1) -/* C87FAC 802424FC 3C014248 */ lui $at, 0x4248 -/* C87FB0 80242500 44811000 */ mtc1 $at, $f2 -/* C87FB4 80242504 00000000 */ nop -/* C87FB8 80242508 4602003C */ c.lt.s $f0, $f2 -/* C87FBC 8024250C 00000000 */ nop -/* C87FC0 80242510 45010002 */ bc1t .L8024251C -/* C87FC4 80242514 24020002 */ addiu $v0, $zero, 2 -/* C87FC8 80242518 0000102D */ daddu $v0, $zero, $zero -.L8024251C: -/* C87FCC 8024251C 8FBF0010 */ lw $ra, 0x10($sp) -/* C87FD0 80242520 03E00008 */ jr $ra -/* C87FD4 80242524 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024047C_864FBC.s b/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024047C_864FBC.s deleted file mode 100644 index 6d8e22ca67..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024047C_864FBC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024047C_864FBC -/* 864FBC 8024047C 44800000 */ mtc1 $zero, $f0 -/* 864FC0 80240480 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 864FC4 80240484 44050000 */ mfc1 $a1, $f0 -/* 864FC8 80240488 0000202D */ daddu $a0, $zero, $zero -/* 864FCC 8024048C AFBF0018 */ sw $ra, 0x18($sp) -/* 864FD0 80240490 AFA00014 */ sw $zero, 0x14($sp) -/* 864FD4 80240494 E7A00010 */ swc1 $f0, 0x10($sp) -/* 864FD8 80240498 00A0302D */ daddu $a2, $a1, $zero -/* 864FDC 8024049C 0C01CA54 */ jal func_80072950 -/* 864FE0 802404A0 00A0382D */ daddu $a3, $a1, $zero -/* 864FE4 802404A4 8FBF0018 */ lw $ra, 0x18($sp) -/* 864FE8 802404A8 24020002 */ addiu $v0, $zero, 2 -/* 864FEC 802404AC 03E00008 */ jr $ra -/* 864FF0 802404B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 864FF4 802404B4 00000000 */ nop -/* 864FF8 802404B8 00000000 */ nop -/* 864FFC 802404BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index c2019d8868..1f599c0d12 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -119,7 +119,7 @@ glabel func_80240DF0_B9E750 /* B9E910 80240FB0 0000102D */ daddu $v0, $zero, $zero /* B9E914 80240FB4 0260202D */ daddu $a0, $s3, $zero /* B9E918 80240FB8 0280282D */ daddu $a1, $s4, $zero -/* B9E91C 80240FBC 0C090273 */ jal func_802409CC +/* B9E91C 80240FBC 0C090273 */ jal func_802409CC_B9E32C /* B9E920 80240FC0 0200302D */ daddu $a2, $s0, $zero /* B9E924 80240FC4 0260202D */ daddu $a0, $s3, $zero /* B9E928 80240FC8 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240344_AACB74.s b/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240344_AACB74.s deleted file mode 100644 index 572361ed0d..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240344_AACB74.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_AACB74 -/* AACB74 80240344 44800000 */ mtc1 $zero, $f0 -/* AACB78 80240348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AACB7C 8024034C 44050000 */ mfc1 $a1, $f0 -/* AACB80 80240350 0000202D */ daddu $a0, $zero, $zero -/* AACB84 80240354 AFBF0018 */ sw $ra, 0x18($sp) -/* AACB88 80240358 AFA00014 */ sw $zero, 0x14($sp) -/* AACB8C 8024035C E7A00010 */ swc1 $f0, 0x10($sp) -/* AACB90 80240360 00A0302D */ daddu $a2, $a1, $zero -/* AACB94 80240364 0C01CA54 */ jal func_80072950 -/* AACB98 80240368 00A0382D */ daddu $a3, $a1, $zero -/* AACB9C 8024036C 8FBF0018 */ lw $ra, 0x18($sp) -/* AACBA0 80240370 24020002 */ addiu $v0, $zero, 2 -/* AACBA4 80240374 03E00008 */ jr $ra -/* AACBA8 80240378 27BD0020 */ addiu $sp, $sp, 0x20 -/* AACBAC 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_00/929270/func_80240000_929270.s b/asm/nonmatchings/world/area_sbk/sbk_00/929270/func_80240000_929270.s deleted file mode 100644 index 5d2adaa84e..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_00/929270/func_80240000_929270.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_929270 -/* 929270 80240000 44800000 */ mtc1 $zero, $f0 -/* 929274 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 929278 80240008 44050000 */ mfc1 $a1, $f0 -/* 92927C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 929280 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 929284 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 929288 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 92928C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 929290 80240020 0C01CA54 */ jal func_80072950 -/* 929294 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 929298 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 92929C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9292A0 80240030 03E00008 */ jr $ra -/* 9292A4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9292A8 80240038 00000000 */ nop -/* 9292AC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_00/9292B0/func_80240040_9292B0.s b/asm/nonmatchings/world/area_sbk/sbk_00/9292B0/func_80240040_9292B0.s deleted file mode 100644 index f2d33af5cd..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_00/9292B0/func_80240040_9292B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_9292B0 -/* 9292B0 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 9292B4 80240044 24020003 */ addiu $v0, $zero, 3 -/* 9292B8 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 9292BC 8024004C 03E00008 */ jr $ra -/* 9292C0 80240050 24020002 */ addiu $v0, $zero, 2 -/* 9292C4 80240054 00000000 */ nop -/* 9292C8 80240058 00000000 */ nop -/* 9292CC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_01/929A90/func_80240000_929A90.s b/asm/nonmatchings/world/area_sbk/sbk_01/929A90/func_80240000_929A90.s deleted file mode 100644 index d7efcf3633..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_01/929A90/func_80240000_929A90.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_929A90 -/* 929A90 80240000 44800000 */ mtc1 $zero, $f0 -/* 929A94 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 929A98 80240008 44050000 */ mfc1 $a1, $f0 -/* 929A9C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 929AA0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 929AA4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 929AA8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 929AAC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 929AB0 80240020 0C01CA54 */ jal func_80072950 -/* 929AB4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 929AB8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 929ABC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 929AC0 80240030 03E00008 */ jr $ra -/* 929AC4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 929AC8 80240038 00000000 */ nop -/* 929ACC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_03/92F8B0/func_80240000_92F8B0.s b/asm/nonmatchings/world/area_sbk/sbk_03/92F8B0/func_80240000_92F8B0.s deleted file mode 100644 index 07756d5116..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_03/92F8B0/func_80240000_92F8B0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_92F8B0 -/* 92F8B0 80240000 44800000 */ mtc1 $zero, $f0 -/* 92F8B4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 92F8B8 80240008 44050000 */ mfc1 $a1, $f0 -/* 92F8BC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 92F8C0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 92F8C4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 92F8C8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 92F8CC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 92F8D0 80240020 0C01CA54 */ jal func_80072950 -/* 92F8D4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 92F8D8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 92F8DC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 92F8E0 80240030 03E00008 */ jr $ra -/* 92F8E4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 92F8E8 80240038 00000000 */ nop -/* 92F8EC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_04/9304D0/func_80240000_9304D0.s b/asm/nonmatchings/world/area_sbk/sbk_04/9304D0/func_80240000_9304D0.s deleted file mode 100644 index 1fd03f5b91..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_04/9304D0/func_80240000_9304D0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9304D0 -/* 9304D0 80240000 44800000 */ mtc1 $zero, $f0 -/* 9304D4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9304D8 80240008 44050000 */ mfc1 $a1, $f0 -/* 9304DC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 9304E0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9304E4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 9304E8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9304EC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 9304F0 80240020 0C01CA54 */ jal func_80072950 -/* 9304F4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 9304F8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 9304FC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 930500 80240030 03E00008 */ jr $ra -/* 930504 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 930508 80240038 00000000 */ nop -/* 93050C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_05/930CF0/func_80240000_930CF0.s b/asm/nonmatchings/world/area_sbk/sbk_05/930CF0/func_80240000_930CF0.s deleted file mode 100644 index 0fba2990c9..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_05/930CF0/func_80240000_930CF0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_930CF0 -/* 930CF0 80240000 44800000 */ mtc1 $zero, $f0 -/* 930CF4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 930CF8 80240008 44050000 */ mfc1 $a1, $f0 -/* 930CFC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 930D00 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 930D04 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 930D08 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 930D0C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 930D10 80240020 0C01CA54 */ jal func_80072950 -/* 930D14 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 930D18 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 930D1C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 930D20 80240030 03E00008 */ jr $ra -/* 930D24 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 930D28 80240038 00000000 */ nop -/* 930D2C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_06/9325C0/func_80240000_9325C0.s b/asm/nonmatchings/world/area_sbk/sbk_06/9325C0/func_80240000_9325C0.s deleted file mode 100644 index e4a479ebb6..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_06/9325C0/func_80240000_9325C0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9325C0 -/* 9325C0 80240000 44800000 */ mtc1 $zero, $f0 -/* 9325C4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9325C8 80240008 44050000 */ mfc1 $a1, $f0 -/* 9325CC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 9325D0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9325D4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 9325D8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9325DC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 9325E0 80240020 0C01CA54 */ jal func_80072950 -/* 9325E4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 9325E8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 9325EC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9325F0 80240030 03E00008 */ jr $ra -/* 9325F4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9325F8 80240038 00000000 */ nop -/* 9325FC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_10/933C80/func_80240000_933C80.s b/asm/nonmatchings/world/area_sbk/sbk_10/933C80/func_80240000_933C80.s deleted file mode 100644 index 318bb7c27d..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_10/933C80/func_80240000_933C80.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_933C80 -/* 933C80 80240000 44800000 */ mtc1 $zero, $f0 -/* 933C84 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 933C88 80240008 44050000 */ mfc1 $a1, $f0 -/* 933C8C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 933C90 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 933C94 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 933C98 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 933C9C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 933CA0 80240020 0C01CA54 */ jal func_80072950 -/* 933CA4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 933CA8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 933CAC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 933CB0 80240030 03E00008 */ jr $ra -/* 933CB4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 933CB8 80240038 00000000 */ nop -/* 933CBC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_11/934040/func_80240000_934040.s b/asm/nonmatchings/world/area_sbk/sbk_11/934040/func_80240000_934040.s deleted file mode 100644 index 97b1fc42d2..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_11/934040/func_80240000_934040.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_934040 -/* 934040 80240000 44800000 */ mtc1 $zero, $f0 -/* 934044 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 934048 80240008 44050000 */ mfc1 $a1, $f0 -/* 93404C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 934050 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 934054 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 934058 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93405C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 934060 80240020 0C01CA54 */ jal func_80072950 -/* 934064 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 934068 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93406C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 934070 80240030 03E00008 */ jr $ra -/* 934074 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 934078 80240038 00000000 */ nop -/* 93407C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_12/934D40/func_80240000_934D40.s b/asm/nonmatchings/world/area_sbk/sbk_12/934D40/func_80240000_934D40.s deleted file mode 100644 index ea3f5e5c87..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_12/934D40/func_80240000_934D40.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_934D40 -/* 934D40 80240000 44800000 */ mtc1 $zero, $f0 -/* 934D44 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 934D48 80240008 44050000 */ mfc1 $a1, $f0 -/* 934D4C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 934D50 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 934D54 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 934D58 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 934D5C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 934D60 80240020 0C01CA54 */ jal func_80072950 -/* 934D64 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 934D68 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 934D6C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 934D70 80240030 03E00008 */ jr $ra -/* 934D74 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 934D78 80240038 00000000 */ nop -/* 934D7C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_13/9357E0/func_80240000_9357E0.s b/asm/nonmatchings/world/area_sbk/sbk_13/9357E0/func_80240000_9357E0.s deleted file mode 100644 index 1d923b2f41..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_13/9357E0/func_80240000_9357E0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9357E0 -/* 9357E0 80240000 44800000 */ mtc1 $zero, $f0 -/* 9357E4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9357E8 80240008 44050000 */ mfc1 $a1, $f0 -/* 9357EC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 9357F0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9357F4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 9357F8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9357FC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 935800 80240020 0C01CA54 */ jal func_80072950 -/* 935804 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 935808 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93580C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 935810 80240030 03E00008 */ jr $ra -/* 935814 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 935818 80240038 00000000 */ nop -/* 93581C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_14/9366E0/func_80240000_9366E0.s b/asm/nonmatchings/world/area_sbk/sbk_14/9366E0/func_80240000_9366E0.s deleted file mode 100644 index 56634b13cf..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_14/9366E0/func_80240000_9366E0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9366E0 -/* 9366E0 80240000 44800000 */ mtc1 $zero, $f0 -/* 9366E4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9366E8 80240008 44050000 */ mfc1 $a1, $f0 -/* 9366EC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 9366F0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9366F4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 9366F8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9366FC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 936700 80240020 0C01CA54 */ jal func_80072950 -/* 936704 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 936708 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93670C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 936710 80240030 03E00008 */ jr $ra -/* 936714 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 936718 80240038 00000000 */ nop -/* 93671C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_15/936CD0/func_80240000_936CD0.s b/asm/nonmatchings/world/area_sbk/sbk_15/936CD0/func_80240000_936CD0.s deleted file mode 100644 index 4d06768b3e..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_15/936CD0/func_80240000_936CD0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_936CD0 -/* 936CD0 80240000 44800000 */ mtc1 $zero, $f0 -/* 936CD4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 936CD8 80240008 44050000 */ mfc1 $a1, $f0 -/* 936CDC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 936CE0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 936CE4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 936CE8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 936CEC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 936CF0 80240020 0C01CA54 */ jal func_80072950 -/* 936CF4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 936CF8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 936CFC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 936D00 80240030 03E00008 */ jr $ra -/* 936D04 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 936D08 80240038 00000000 */ nop -/* 936D0C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_16/937570/func_80240000_937570.s b/asm/nonmatchings/world/area_sbk/sbk_16/937570/func_80240000_937570.s deleted file mode 100644 index b25dad606c..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_16/937570/func_80240000_937570.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_937570 -/* 937570 80240000 44800000 */ mtc1 $zero, $f0 -/* 937574 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 937578 80240008 44050000 */ mfc1 $a1, $f0 -/* 93757C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 937580 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 937584 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 937588 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93758C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 937590 80240020 0C01CA54 */ jal func_80072950 -/* 937594 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 937598 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93759C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9375A0 80240030 03E00008 */ jr $ra -/* 9375A4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9375A8 80240038 00000000 */ nop -/* 9375AC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_20/938590/func_80240000_938590.s b/asm/nonmatchings/world/area_sbk/sbk_20/938590/func_80240000_938590.s deleted file mode 100644 index 7e825702dd..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_20/938590/func_80240000_938590.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_938590 -/* 938590 80240000 44800000 */ mtc1 $zero, $f0 -/* 938594 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 938598 80240008 44050000 */ mfc1 $a1, $f0 -/* 93859C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 9385A0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9385A4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 9385A8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9385AC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 9385B0 80240020 0C01CA54 */ jal func_80072950 -/* 9385B4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 9385B8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 9385BC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9385C0 80240030 03E00008 */ jr $ra -/* 9385C4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9385C8 80240038 00000000 */ nop -/* 9385CC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_21/939560/func_80240000_939560.s b/asm/nonmatchings/world/area_sbk/sbk_21/939560/func_80240000_939560.s deleted file mode 100644 index 77c03037d5..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_21/939560/func_80240000_939560.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_939560 -/* 939560 80240000 44800000 */ mtc1 $zero, $f0 -/* 939564 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 939568 80240008 44050000 */ mfc1 $a1, $f0 -/* 93956C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 939570 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 939574 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 939578 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93957C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 939580 80240020 0C01CA54 */ jal func_80072950 -/* 939584 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 939588 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93958C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 939590 80240030 03E00008 */ jr $ra -/* 939594 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 939598 80240038 00000000 */ nop -/* 93959C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_22/939930/func_80240000_939930.s b/asm/nonmatchings/world/area_sbk/sbk_22/939930/func_80240000_939930.s deleted file mode 100644 index bce021b86e..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_22/939930/func_80240000_939930.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_939930 -/* 939930 80240000 44800000 */ mtc1 $zero, $f0 -/* 939934 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 939938 80240008 44050000 */ mfc1 $a1, $f0 -/* 93993C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 939940 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 939944 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 939948 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93994C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 939950 80240020 0C01CA54 */ jal func_80072950 -/* 939954 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 939958 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93995C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 939960 80240030 03E00008 */ jr $ra -/* 939964 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 939968 80240038 00000000 */ nop -/* 93996C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_23/93A760/func_80240000_93A760.s b/asm/nonmatchings/world/area_sbk/sbk_23/93A760/func_80240000_93A760.s deleted file mode 100644 index 79f7870d07..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_23/93A760/func_80240000_93A760.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_93A760 -/* 93A760 80240000 44800000 */ mtc1 $zero, $f0 -/* 93A764 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93A768 80240008 44050000 */ mfc1 $a1, $f0 -/* 93A76C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 93A770 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 93A774 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 93A778 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93A77C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 93A780 80240020 0C01CA54 */ jal func_80072950 -/* 93A784 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 93A788 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93A78C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 93A790 80240030 03E00008 */ jr $ra -/* 93A794 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 93A798 80240038 00000000 */ nop -/* 93A79C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_24/93AC30/func_80240000_93AC30.s b/asm/nonmatchings/world/area_sbk/sbk_24/93AC30/func_80240000_93AC30.s deleted file mode 100644 index ba225a2345..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_24/93AC30/func_80240000_93AC30.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_93AC30 -/* 93AC30 80240000 44800000 */ mtc1 $zero, $f0 -/* 93AC34 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93AC38 80240008 44050000 */ mfc1 $a1, $f0 -/* 93AC3C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 93AC40 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 93AC44 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 93AC48 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93AC4C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 93AC50 80240020 0C01CA54 */ jal func_80072950 -/* 93AC54 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 93AC58 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93AC5C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 93AC60 80240030 03E00008 */ jr $ra -/* 93AC64 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 93AC68 80240038 00000000 */ nop -/* 93AC6C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_25/93C280/func_80240000_93C280.s b/asm/nonmatchings/world/area_sbk/sbk_25/93C280/func_80240000_93C280.s deleted file mode 100644 index 829dacd552..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_25/93C280/func_80240000_93C280.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_93C280 -/* 93C280 80240000 44800000 */ mtc1 $zero, $f0 -/* 93C284 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93C288 80240008 44050000 */ mfc1 $a1, $f0 -/* 93C28C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 93C290 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 93C294 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 93C298 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93C29C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 93C2A0 80240020 0C01CA54 */ jal func_80072950 -/* 93C2A4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 93C2A8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93C2AC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 93C2B0 80240030 03E00008 */ jr $ra -/* 93C2B4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 93C2B8 80240038 00000000 */ nop -/* 93C2BC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_26/93DCD0/func_80240000_93DCD0.s b/asm/nonmatchings/world/area_sbk/sbk_26/93DCD0/func_80240000_93DCD0.s deleted file mode 100644 index 05cbe4d571..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_26/93DCD0/func_80240000_93DCD0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_93DCD0 -/* 93DCD0 80240000 44800000 */ mtc1 $zero, $f0 -/* 93DCD4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93DCD8 80240008 44050000 */ mfc1 $a1, $f0 -/* 93DCDC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 93DCE0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 93DCE4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 93DCE8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93DCEC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 93DCF0 80240020 0C01CA54 */ jal func_80072950 -/* 93DCF4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 93DCF8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 93DCFC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 93DD00 80240030 03E00008 */ jr $ra -/* 93DD04 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 93DD08 80240038 00000000 */ nop -/* 93DD0C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240338_93F8E8.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240338_93F8E8.s deleted file mode 100644 index affeb9099b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240338_93F8E8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240338_93F8E8 -/* 93F8E8 80240338 44800000 */ mtc1 $zero, $f0 -/* 93F8EC 8024033C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93F8F0 80240340 44050000 */ mfc1 $a1, $f0 -/* 93F8F4 80240344 0000202D */ daddu $a0, $zero, $zero -/* 93F8F8 80240348 AFBF0018 */ sw $ra, 0x18($sp) -/* 93F8FC 8024034C AFA00014 */ sw $zero, 0x14($sp) -/* 93F900 80240350 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93F904 80240354 00A0302D */ daddu $a2, $a1, $zero -/* 93F908 80240358 0C01CA54 */ jal func_80072950 -/* 93F90C 8024035C 00A0382D */ daddu $a3, $a1, $zero -/* 93F910 80240360 8FBF0018 */ lw $ra, 0x18($sp) -/* 93F914 80240364 24020002 */ addiu $v0, $zero, 2 -/* 93F918 80240368 03E00008 */ jr $ra -/* 93F91C 8024036C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_31/944000/func_80240000_944000.s b/asm/nonmatchings/world/area_sbk/sbk_31/944000/func_80240000_944000.s deleted file mode 100644 index 00b709a6bd..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_31/944000/func_80240000_944000.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_944000 -/* 944000 80240000 44800000 */ mtc1 $zero, $f0 -/* 944004 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 944008 80240008 44050000 */ mfc1 $a1, $f0 -/* 94400C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 944010 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 944014 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 944018 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 94401C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 944020 80240020 0C01CA54 */ jal func_80072950 -/* 944024 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 944028 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 94402C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 944030 80240030 03E00008 */ jr $ra -/* 944034 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 944038 80240038 00000000 */ nop -/* 94403C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_32/944A60/func_80240000_944A60.s b/asm/nonmatchings/world/area_sbk/sbk_32/944A60/func_80240000_944A60.s deleted file mode 100644 index 7ec4da71bc..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_32/944A60/func_80240000_944A60.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_944A60 -/* 944A60 80240000 44800000 */ mtc1 $zero, $f0 -/* 944A64 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 944A68 80240008 44050000 */ mfc1 $a1, $f0 -/* 944A6C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 944A70 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 944A74 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 944A78 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 944A7C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 944A80 80240020 0C01CA54 */ jal func_80072950 -/* 944A84 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 944A88 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 944A8C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 944A90 80240030 03E00008 */ jr $ra -/* 944A94 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 944A98 80240038 00000000 */ nop -/* 944A9C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_33/9459D0/func_80240000_9459D0.s b/asm/nonmatchings/world/area_sbk/sbk_33/9459D0/func_80240000_9459D0.s deleted file mode 100644 index a4c973b2b2..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_33/9459D0/func_80240000_9459D0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9459D0 -/* 9459D0 80240000 44800000 */ mtc1 $zero, $f0 -/* 9459D4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9459D8 80240008 44050000 */ mfc1 $a1, $f0 -/* 9459DC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 9459E0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9459E4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 9459E8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9459EC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 9459F0 80240020 0C01CA54 */ jal func_80072950 -/* 9459F4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 9459F8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 9459FC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 945A00 80240030 03E00008 */ jr $ra -/* 945A04 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 945A08 80240038 00000000 */ nop -/* 945A0C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945ED0/func_80240000_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/945ED0/func_80240000_945ED0.s deleted file mode 100644 index 17096f4ccf..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945ED0/func_80240000_945ED0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_945ED0 -/* 945ED0 80240000 44800000 */ mtc1 $zero, $f0 -/* 945ED4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 945ED8 80240008 44050000 */ mfc1 $a1, $f0 -/* 945EDC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 945EE0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 945EE4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 945EE8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 945EEC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 945EF0 80240020 0C01CA54 */ jal func_80072950 -/* 945EF4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 945EF8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 945EFC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 945F00 80240030 03E00008 */ jr $ra -/* 945F04 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 945F08 80240038 00000000 */ nop -/* 945F0C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_35/9486B0/func_80240000_9486B0.s b/asm/nonmatchings/world/area_sbk/sbk_35/9486B0/func_80240000_9486B0.s deleted file mode 100644 index c8d9212121..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_35/9486B0/func_80240000_9486B0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9486B0 -/* 9486B0 80240000 44800000 */ mtc1 $zero, $f0 -/* 9486B4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9486B8 80240008 44050000 */ mfc1 $a1, $f0 -/* 9486BC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 9486C0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9486C4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 9486C8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9486CC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 9486D0 80240020 0C01CA54 */ jal func_80072950 -/* 9486D4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 9486D8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 9486DC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9486E0 80240030 03E00008 */ jr $ra -/* 9486E4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9486E8 80240038 00000000 */ nop -/* 9486EC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_36/949E60/func_80240000_949E60.s b/asm/nonmatchings/world/area_sbk/sbk_36/949E60/func_80240000_949E60.s deleted file mode 100644 index df7250ebde..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_36/949E60/func_80240000_949E60.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_949E60 -/* 949E60 80240000 44800000 */ mtc1 $zero, $f0 -/* 949E64 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 949E68 80240008 44050000 */ mfc1 $a1, $f0 -/* 949E6C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 949E70 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 949E74 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 949E78 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 949E7C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 949E80 80240020 0C01CA54 */ jal func_80072950 -/* 949E84 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 949E88 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 949E8C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 949E90 80240030 03E00008 */ jr $ra -/* 949E94 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 949E98 80240038 00000000 */ nop -/* 949E9C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_40/94B3A0/func_80240000_94B3A0.s b/asm/nonmatchings/world/area_sbk/sbk_40/94B3A0/func_80240000_94B3A0.s deleted file mode 100644 index c3d57c6c80..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_40/94B3A0/func_80240000_94B3A0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_94B3A0 -/* 94B3A0 80240000 44800000 */ mtc1 $zero, $f0 -/* 94B3A4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 94B3A8 80240008 44050000 */ mfc1 $a1, $f0 -/* 94B3AC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 94B3B0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 94B3B4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 94B3B8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 94B3BC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 94B3C0 80240020 0C01CA54 */ jal func_80072950 -/* 94B3C4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 94B3C8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 94B3CC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 94B3D0 80240030 03E00008 */ jr $ra -/* 94B3D4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 94B3D8 80240038 00000000 */ nop -/* 94B3DC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_41/94C040/func_80240000_94C040.s b/asm/nonmatchings/world/area_sbk/sbk_41/94C040/func_80240000_94C040.s deleted file mode 100644 index 37f96a827c..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_41/94C040/func_80240000_94C040.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_94C040 -/* 94C040 80240000 44800000 */ mtc1 $zero, $f0 -/* 94C044 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 94C048 80240008 44050000 */ mfc1 $a1, $f0 -/* 94C04C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 94C050 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 94C054 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 94C058 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 94C05C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 94C060 80240020 0C01CA54 */ jal func_80072950 -/* 94C064 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 94C068 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 94C06C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 94C070 80240030 03E00008 */ jr $ra -/* 94C074 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 94C078 80240038 00000000 */ nop -/* 94C07C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_42/94C510/func_80240000_94C510.s b/asm/nonmatchings/world/area_sbk/sbk_42/94C510/func_80240000_94C510.s deleted file mode 100644 index 616665d977..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_42/94C510/func_80240000_94C510.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_94C510 -/* 94C510 80240000 44800000 */ mtc1 $zero, $f0 -/* 94C514 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 94C518 80240008 44050000 */ mfc1 $a1, $f0 -/* 94C51C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 94C520 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 94C524 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 94C528 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 94C52C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 94C530 80240020 0C01CA54 */ jal func_80072950 -/* 94C534 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 94C538 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 94C53C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 94C540 80240030 03E00008 */ jr $ra -/* 94C544 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 94C548 80240038 00000000 */ nop -/* 94C54C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_43/94D170/func_80240000_94D170.s b/asm/nonmatchings/world/area_sbk/sbk_43/94D170/func_80240000_94D170.s deleted file mode 100644 index 46512046e0..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_43/94D170/func_80240000_94D170.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_94D170 -/* 94D170 80240000 44800000 */ mtc1 $zero, $f0 -/* 94D174 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 94D178 80240008 44050000 */ mfc1 $a1, $f0 -/* 94D17C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 94D180 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 94D184 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 94D188 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 94D18C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 94D190 80240020 0C01CA54 */ jal func_80072950 -/* 94D194 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 94D198 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 94D19C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 94D1A0 80240030 03E00008 */ jr $ra -/* 94D1A4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 94D1A8 80240038 00000000 */ nop -/* 94D1AC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_44/94D5A0/func_80240000_94D5A0.s b/asm/nonmatchings/world/area_sbk/sbk_44/94D5A0/func_80240000_94D5A0.s deleted file mode 100644 index 0b220f9c0c..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_44/94D5A0/func_80240000_94D5A0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_94D5A0 -/* 94D5A0 80240000 44800000 */ mtc1 $zero, $f0 -/* 94D5A4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 94D5A8 80240008 44050000 */ mfc1 $a1, $f0 -/* 94D5AC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 94D5B0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 94D5B4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 94D5B8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 94D5BC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 94D5C0 80240020 0C01CA54 */ jal func_80072950 -/* 94D5C4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 94D5C8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 94D5CC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 94D5D0 80240030 03E00008 */ jr $ra -/* 94D5D4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 94D5D8 80240038 00000000 */ nop -/* 94D5DC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_45/94E4A0/func_80240000_94E4A0.s b/asm/nonmatchings/world/area_sbk/sbk_45/94E4A0/func_80240000_94E4A0.s deleted file mode 100644 index d21d2360ee..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_45/94E4A0/func_80240000_94E4A0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_94E4A0 -/* 94E4A0 80240000 44800000 */ mtc1 $zero, $f0 -/* 94E4A4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 94E4A8 80240008 44050000 */ mfc1 $a1, $f0 -/* 94E4AC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 94E4B0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 94E4B4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 94E4B8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 94E4BC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 94E4C0 80240020 0C01CA54 */ jal func_80072950 -/* 94E4C4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 94E4C8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 94E4CC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 94E4D0 80240030 03E00008 */ jr $ra -/* 94E4D4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 94E4D8 80240038 00000000 */ nop -/* 94E4DC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_46/94E9A0/func_80240000_94E9A0.s b/asm/nonmatchings/world/area_sbk/sbk_46/94E9A0/func_80240000_94E9A0.s deleted file mode 100644 index e37b366769..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_46/94E9A0/func_80240000_94E9A0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_94E9A0 -/* 94E9A0 80240000 44800000 */ mtc1 $zero, $f0 -/* 94E9A4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 94E9A8 80240008 44050000 */ mfc1 $a1, $f0 -/* 94E9AC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 94E9B0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 94E9B4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 94E9B8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 94E9BC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 94E9C0 80240020 0C01CA54 */ jal func_80072950 -/* 94E9C4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 94E9C8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 94E9CC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 94E9D0 80240030 03E00008 */ jr $ra -/* 94E9D4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 94E9D8 80240038 00000000 */ nop -/* 94E9DC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_50/950610/func_80240000_950610.s b/asm/nonmatchings/world/area_sbk/sbk_50/950610/func_80240000_950610.s deleted file mode 100644 index 0c0def844b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_50/950610/func_80240000_950610.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_950610 -/* 950610 80240000 44800000 */ mtc1 $zero, $f0 -/* 950614 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 950618 80240008 44050000 */ mfc1 $a1, $f0 -/* 95061C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 950620 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 950624 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 950628 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95062C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 950630 80240020 0C01CA54 */ jal func_80072950 -/* 950634 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 950638 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 95063C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 950640 80240030 03E00008 */ jr $ra -/* 950644 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 950648 80240038 00000000 */ nop -/* 95064C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_51/950970/func_80240000_950970.s b/asm/nonmatchings/world/area_sbk/sbk_51/950970/func_80240000_950970.s deleted file mode 100644 index 37d9eaa128..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_51/950970/func_80240000_950970.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_950970 -/* 950970 80240000 44800000 */ mtc1 $zero, $f0 -/* 950974 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 950978 80240008 44050000 */ mfc1 $a1, $f0 -/* 95097C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 950980 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 950984 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 950988 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95098C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 950990 80240020 0C01CA54 */ jal func_80072950 -/* 950994 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 950998 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 95099C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9509A0 80240030 03E00008 */ jr $ra -/* 9509A4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9509A8 80240038 00000000 */ nop -/* 9509AC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_52/951670/func_80240000_951670.s b/asm/nonmatchings/world/area_sbk/sbk_52/951670/func_80240000_951670.s deleted file mode 100644 index c2347e6d39..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_52/951670/func_80240000_951670.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_951670 -/* 951670 80240000 44800000 */ mtc1 $zero, $f0 -/* 951674 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 951678 80240008 44050000 */ mfc1 $a1, $f0 -/* 95167C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 951680 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 951684 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 951688 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95168C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 951690 80240020 0C01CA54 */ jal func_80072950 -/* 951694 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 951698 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 95169C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9516A0 80240030 03E00008 */ jr $ra -/* 9516A4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9516A8 80240038 00000000 */ nop -/* 9516AC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_53/951AE0/func_80240000_951AE0.s b/asm/nonmatchings/world/area_sbk/sbk_53/951AE0/func_80240000_951AE0.s deleted file mode 100644 index 4b63a989a5..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_53/951AE0/func_80240000_951AE0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_951AE0 -/* 951AE0 80240000 44800000 */ mtc1 $zero, $f0 -/* 951AE4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 951AE8 80240008 44050000 */ mfc1 $a1, $f0 -/* 951AEC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 951AF0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 951AF4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 951AF8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 951AFC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 951B00 80240020 0C01CA54 */ jal func_80072950 -/* 951B04 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 951B08 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 951B0C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 951B10 80240030 03E00008 */ jr $ra -/* 951B14 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 951B18 80240038 00000000 */ nop -/* 951B1C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_54/952580/func_80240000_952580.s b/asm/nonmatchings/world/area_sbk/sbk_54/952580/func_80240000_952580.s deleted file mode 100644 index 6112313a35..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_54/952580/func_80240000_952580.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_952580 -/* 952580 80240000 44800000 */ mtc1 $zero, $f0 -/* 952584 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 952588 80240008 44050000 */ mfc1 $a1, $f0 -/* 95258C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 952590 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 952594 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 952598 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95259C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 9525A0 80240020 0C01CA54 */ jal func_80072950 -/* 9525A4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 9525A8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 9525AC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9525B0 80240030 03E00008 */ jr $ra -/* 9525B4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9525B8 80240038 00000000 */ nop -/* 9525BC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_55/952A50/func_80240000_952A50.s b/asm/nonmatchings/world/area_sbk/sbk_55/952A50/func_80240000_952A50.s deleted file mode 100644 index 317b06c10f..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_55/952A50/func_80240000_952A50.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_952A50 -/* 952A50 80240000 44800000 */ mtc1 $zero, $f0 -/* 952A54 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 952A58 80240008 44050000 */ mfc1 $a1, $f0 -/* 952A5C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 952A60 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 952A64 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 952A68 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 952A6C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 952A70 80240020 0C01CA54 */ jal func_80072950 -/* 952A74 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 952A78 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 952A7C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 952A80 80240030 03E00008 */ jr $ra -/* 952A84 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 952A88 80240038 00000000 */ nop -/* 952A8C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240000_953FC0.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240000_953FC0.s deleted file mode 100644 index eca06c2beb..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240000_953FC0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_953FC0 -/* 953FC0 80240000 44800000 */ mtc1 $zero, $f0 -/* 953FC4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 953FC8 80240008 44050000 */ mfc1 $a1, $f0 -/* 953FCC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 953FD0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 953FD4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 953FD8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 953FDC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 953FE0 80240020 0C01CA54 */ jal func_80072950 -/* 953FE4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 953FE8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 953FEC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 953FF0 80240030 03E00008 */ jr $ra -/* 953FF4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_60/9569F0/func_80240000_9569F0.s b/asm/nonmatchings/world/area_sbk/sbk_60/9569F0/func_80240000_9569F0.s deleted file mode 100644 index 0a330553b5..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_60/9569F0/func_80240000_9569F0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9569F0 -/* 9569F0 80240000 44800000 */ mtc1 $zero, $f0 -/* 9569F4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9569F8 80240008 44050000 */ mfc1 $a1, $f0 -/* 9569FC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 956A00 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 956A04 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 956A08 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 956A0C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 956A10 80240020 0C01CA54 */ jal func_80072950 -/* 956A14 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 956A18 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 956A1C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 956A20 80240030 03E00008 */ jr $ra -/* 956A24 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 956A28 80240038 00000000 */ nop -/* 956A2C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_61/956F90/func_80240000_956F90.s b/asm/nonmatchings/world/area_sbk/sbk_61/956F90/func_80240000_956F90.s deleted file mode 100644 index 8d3684818b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_61/956F90/func_80240000_956F90.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_956F90 -/* 956F90 80240000 44800000 */ mtc1 $zero, $f0 -/* 956F94 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 956F98 80240008 44050000 */ mfc1 $a1, $f0 -/* 956F9C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 956FA0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 956FA4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 956FA8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 956FAC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 956FB0 80240020 0C01CA54 */ jal func_80072950 -/* 956FB4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 956FB8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 956FBC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 956FC0 80240030 03E00008 */ jr $ra -/* 956FC4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 956FC8 80240038 00000000 */ nop -/* 956FCC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_62/957350/func_80240000_957350.s b/asm/nonmatchings/world/area_sbk/sbk_62/957350/func_80240000_957350.s deleted file mode 100644 index 7565d437df..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_62/957350/func_80240000_957350.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_957350 -/* 957350 80240000 44800000 */ mtc1 $zero, $f0 -/* 957354 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 957358 80240008 44050000 */ mfc1 $a1, $f0 -/* 95735C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 957360 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 957364 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 957368 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95736C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 957370 80240020 0C01CA54 */ jal func_80072950 -/* 957374 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 957378 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 95737C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 957380 80240030 03E00008 */ jr $ra -/* 957384 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 957388 80240038 00000000 */ nop -/* 95738C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_63/957D70/func_80240000_957D70.s b/asm/nonmatchings/world/area_sbk/sbk_63/957D70/func_80240000_957D70.s deleted file mode 100644 index 793d2ef3f5..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_63/957D70/func_80240000_957D70.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_957D70 -/* 957D70 80240000 44800000 */ mtc1 $zero, $f0 -/* 957D74 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 957D78 80240008 44050000 */ mfc1 $a1, $f0 -/* 957D7C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 957D80 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 957D84 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 957D88 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 957D8C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 957D90 80240020 0C01CA54 */ jal func_80072950 -/* 957D94 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 957D98 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 957D9C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 957DA0 80240030 03E00008 */ jr $ra -/* 957DA4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 957DA8 80240038 00000000 */ nop -/* 957DAC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_64/958590/func_80240000_958590.s b/asm/nonmatchings/world/area_sbk/sbk_64/958590/func_80240000_958590.s deleted file mode 100644 index aaf6fcda25..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_64/958590/func_80240000_958590.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_958590 -/* 958590 80240000 44800000 */ mtc1 $zero, $f0 -/* 958594 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 958598 80240008 44050000 */ mfc1 $a1, $f0 -/* 95859C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 9585A0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9585A4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 9585A8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9585AC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 9585B0 80240020 0C01CA54 */ jal func_80072950 -/* 9585B4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 9585B8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 9585BC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 9585C0 80240030 03E00008 */ jr $ra -/* 9585C4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9585C8 80240038 00000000 */ nop -/* 9585CC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_65/958950/func_80240000_958950.s b/asm/nonmatchings/world/area_sbk/sbk_65/958950/func_80240000_958950.s deleted file mode 100644 index ee4188ef47..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_65/958950/func_80240000_958950.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_958950 -/* 958950 80240000 44800000 */ mtc1 $zero, $f0 -/* 958954 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 958958 80240008 44050000 */ mfc1 $a1, $f0 -/* 95895C 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 958960 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 958964 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 958968 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95896C 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 958970 80240020 0C01CA54 */ jal func_80072950 -/* 958974 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 958978 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 95897C 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 958980 80240030 03E00008 */ jr $ra -/* 958984 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 958988 80240038 00000000 */ nop -/* 95898C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_66/958CB0/func_80240000_958CB0.s b/asm/nonmatchings/world/area_sbk/sbk_66/958CB0/func_80240000_958CB0.s deleted file mode 100644 index 372197ee2d..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_66/958CB0/func_80240000_958CB0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_958CB0 -/* 958CB0 80240000 44800000 */ mtc1 $zero, $f0 -/* 958CB4 80240004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 958CB8 80240008 44050000 */ mfc1 $a1, $f0 -/* 958CBC 8024000C 0000202D */ daddu $a0, $zero, $zero -/* 958CC0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 958CC4 80240014 AFA00014 */ sw $zero, 0x14($sp) -/* 958CC8 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 958CCC 8024001C 00A0302D */ daddu $a2, $a1, $zero -/* 958CD0 80240020 0C01CA54 */ jal func_80072950 -/* 958CD4 80240024 00A0382D */ daddu $a3, $a1, $zero -/* 958CD8 80240028 8FBF0018 */ lw $ra, 0x18($sp) -/* 958CDC 8024002C 24020002 */ addiu $v0, $zero, 2 -/* 958CE0 80240030 03E00008 */ jr $ra -/* 958CE4 80240034 27BD0020 */ addiu $sp, $sp, 0x20 -/* 958CE8 80240038 00000000 */ nop -/* 958CEC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_8024217C.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_8024217C.s deleted file mode 100644 index 98396921b2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_8024217C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024217C -/* 88AD4C 8024217C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88AD50 80242180 AFBF0010 */ sw $ra, 0x10($sp) -/* 88AD54 80242184 0C00EAD2 */ jal get_npc_safe -/* 88AD58 80242188 8C84014C */ lw $a0, 0x14c($a0) -/* 88AD5C 8024218C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88AD60 80242190 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 88AD64 80242194 C44C0038 */ lwc1 $f12, 0x38($v0) -/* 88AD68 80242198 C44E0040 */ lwc1 $f14, 0x40($v0) -/* 88AD6C 8024219C 8C660028 */ lw $a2, 0x28($v1) -/* 88AD70 802421A0 0C00A7B5 */ jal dist2D -/* 88AD74 802421A4 8C670030 */ lw $a3, 0x30($v1) -/* 88AD78 802421A8 3C014248 */ lui $at, 0x4248 -/* 88AD7C 802421AC 44811000 */ mtc1 $at, $f2 -/* 88AD80 802421B0 00000000 */ nop -/* 88AD84 802421B4 4602003C */ c.lt.s $f0, $f2 -/* 88AD88 802421B8 00000000 */ nop -/* 88AD8C 802421BC 45010002 */ bc1t .L802421C8 -/* 88AD90 802421C0 24020002 */ addiu $v0, $zero, 2 -/* 88AD94 802421C4 0000102D */ daddu $v0, $zero, $zero -.L802421C8: -/* 88AD98 802421C8 8FBF0010 */ lw $ra, 0x10($sp) -/* 88AD9C 802421CC 03E00008 */ jr $ra -/* 88ADA0 802421D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/docs/doxygen_custom.css b/docs/doxygen_custom.css index 877606101a..943a4fe917 100644 --- a/docs/doxygen_custom.css +++ b/docs/doxygen_custom.css @@ -2,7 +2,7 @@ body, table, div, p, dl { font: inherit } -body, table, div, p, dl, p.reference, p.definition, .memberdecls .header { +body, table, div, p, dl, p.reference, p.definition, .memberdecls .header, .mdescRight { color: #121212; font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji; } @@ -48,7 +48,7 @@ body { flex-direction: row; width: 100%; - max-width: 1000px; + max-width: 1100px; min-height: 100%; margin: 0 auto; } @@ -92,9 +92,7 @@ table { #details + .groupheader, .definition, -.memtitle, -.contents > p:first-child > a:first-child /* "Go to the source code of this file." */ -{ display: none } +.memtitle { display: none } table.memname * { display: inline; @@ -125,19 +123,22 @@ code { display: block !important; border-left: 1px solid #eee; padding-left: 1em; - margin: 1em 0; + margin: 1.5em 0; width: 100%; box-sizing: border-box; } .memproto { padding: 8px; - margin-bottom: .5em; box-shadow: none; text-shadow: none; display: inline-block; } +.memdoc p:first-child { + margin-top: 0; +} + .memname { margin-left: 0; } diff --git a/include/common_structs.h b/include/common_structs.h index 4e1d121026..f5b8e5dd1c 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -115,6 +115,8 @@ typedef struct Npc { /* 0x0AB */ char unk_AB[661]; } Npc; // size = 0x340 +typedef Npc* NpcList[MAX_NPCS]; + typedef struct PlayerData { /* 0x000 */ s8 bootsLevel; /* 0x001 */ s8 hammerLevel; @@ -204,6 +206,8 @@ typedef struct Trigger { /* 0x34 */ ScriptID runningScriptID; } Trigger; // size = 0x38 +typedef Trigger* TriggerList[MAX_TRIGGERS]; + typedef struct ScriptInstance { /* 0x000 */ u8 state; /* 0x001 */ u8 currentArgc; @@ -271,6 +275,10 @@ typedef struct Entity { /* 0xB1 */ char unk_B1[71]; } Entity; // size = 0xF8 +typedef Entity* EntityList[MAX_ENTITIES]; + +typedef UNK_TYPE* DynamicEntityList[MAX_DYNAMIC_ENTITIES]; + typedef struct StaticEntityData { /* 0x00 */ s16 flags; /* 0x02 */ s16 argSize; @@ -364,6 +372,7 @@ typedef struct UiStatus { /* 0x68 */ s32 iconIndex13; /* 0x6C */ s8 unk_6C[4]; } UiStatus; // size = 0x70 + typedef struct Collider { /* 0x00 */ s32 flags; /* 0x04 */ s16 nextSibling; @@ -672,6 +681,8 @@ typedef struct Model { /* 0xAA */ char unk_AA[6]; } Model; // size = 0xB0 +typedef Model* ModelList[MAX_MODELS]; + typedef struct AnimatedMesh { /* 0x000 */ s32 flags; /* 0x004 */ u8 renderMode; @@ -921,6 +932,8 @@ typedef struct Shadow { /* 0x28 */ char unk_28[80]; } Shadow; // size = 0x78 +typedef Shadow* ShadowList[MAX_SHADOWS]; + typedef struct PushBlockGrid { /* 0x00 */ s8* cells; /* 0x04 */ u8 numCellsX; diff --git a/include/functions.h b/include/functions.h index 397a968563..a1820a3dfc 100644 --- a/include/functions.h +++ b/include/functions.h @@ -32,6 +32,8 @@ s32 get_model_list_index_from_tree_index(s32 treeIndex); void get_model_center_and_size(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); +void func_80072950(s32, f32, f32, f32, f32, s32 time); + void update_collider_transform(s16 colliderID); void get_collider_center(s32 colliderID, f32* x, f32* y, f32* z); diff --git a/include/macros.h b/include/macros.h index 29beb68336..f4e890ed7a 100644 --- a/include/macros.h +++ b/include/macros.h @@ -15,13 +15,21 @@ #define ASSERT(condition) if (!(condition)) { while (1) {} } #define PANIC() ASSERT(0) +#define STATIC_ASSERT(condition) enum { static_assert_fail = 1/(!!(condition)) } // Causes division by zero ("not integer constant") if false #define GAME_STATUS (*gGameStatusPtr) +#define PLAYER_STATUS (&gPlayerStatus) #define MAX_MAPVARS 16 #define MAX_MAPFLAGS 3 +#define MAX_MODELS 256 #define MAX_SCRIPTS 128 +#define MAX_NPCS 64 +#define MAX_TRIGGERS 64 +#define MAX_SHADOWS 60 +#define MAX_ENTITIES 30 +#define MAX_DYNAMIC_ENTITIES 16 //NOTE: SCRIPT_ALLOC is probably not quite correct, but this is the closest thing to matching for the functions its used in. Needs more work. #define SCRIPT_ALLOC(new, index) \ diff --git a/include/map.h b/include/map.h index 956fa203a1..2671514a12 100644 --- a/include/map.h +++ b/include/map.h @@ -63,12 +63,25 @@ typedef struct ItemDrop { /* 0x04 */ s16 unk_08; } ItemDrop; // size = 0x06 +/// @brief Describes heart/flower drop chances after defeating an Npc in the overworld. +/// +/// The algorithm for calculating the number of hearts/flowers from a StatDrop is: +/// - If current HP/FP > cutoff, drop 0. +/// - Roll generalChance. If it fails, drop 0. +/// - Roll chancePerAttempt attempts times. For each success, drop a heart/flower. +/// +/// StaticNpc holds a table of StatDrops for each stat (hearts, flowers). All are checked together +/// and the number of hearts/flowers to drop is the total number of successful attempts for each stat. +/// +/// Each heart/flower is worth 1 HP and 1 FP respectively, if picked up. +/// +/// cutoff, generalChance, and chancePerAttempt are short fixed-point percentage values. +/// That is, `F16(0)` is a 0% chance and `F16(100)` is a 100% chance. typedef struct StatDrop { - // NOTE: these %s are F16 - /* 0x00 */ s16 hpCutoff; // % of max HP/FP - /* 0x02 */ s16 generalChance; // % - /* 0x04 */ s16 attempts; - /* 0x06 */ s16 chancePerAttempt; // % + /* 0x00 */ s16 cutoff; ///< % of max HP/FP. If current HP/FP > cutoff, no hearts/flowers can be dropped. + /* 0x02 */ s16 generalChance; ///< % chance for any hearts/flowers to be dropped at all from this StatDrop. + /* 0x04 */ s16 attempts; ///< Maximum number of hearts/flowers that can be dropped from this StatDrop. + /* 0x06 */ s16 chancePerAttempt; ///< % chance for a single heart/flower to be dropped from each attempt. } StatDrop; // size = 0x08 #define NO_DROPS { F16(100), F16(0), 0, F16(0) } diff --git a/include/script_api/common.h b/include/script_api/common.h index 4af0f69b8d..2d51df65ec 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -4,7 +4,7 @@ #include "common_structs.h" #include "si.h" -typedef Bytecode Script[]; +typedef Bytecode Script[0]; ApiStatus FadeBackgroundToBlack(ScriptInstance* script, s32 isInitialCall); ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index acdf8f3fd4..62b185a0b0 100644 --- a/include/variables.h +++ b/include/variables.h @@ -38,30 +38,31 @@ extern s32 gScriptIndexList[MAX_SCRIPTS]; extern s32 gMoveScriptTable[][4]; -extern Model* gWorldModelList[256]; -extern Model* gBattleModelList[256]; -extern Model** gCurrentModelListPtr[256]; +extern ModelList gWorldModelList; +extern ModelList gBattleModelList; +extern ModelList* gCurrentModelListPtr; +// TODO: potentially a display list, figure this out extern u32* gWorldModelSpecialDls[32]; extern u32* gBattleModelSpecialDls[32]; extern u32** gCurrentModelSpecialDlsPtr[32]; -extern Entity* gWorldEntityList[30]; -extern Entity* gBattleEntityList[30]; -extern Entity** gCurrentEntityListPtr[30]; +extern EntityList gWorldEntityList; +extern EntityList gBattleEntityList; +extern EntityList* gCurrentEntityListPtr; extern s32 gLastCreatedEntityIndex; -extern UNK_TYPE* gWorldDynamicEntityList[16]; -extern UNK_TYPE* gBattleDynamicEntityList[16]; -extern UNK_TYPE*** gCurrentDynamicEntityListPtr; +extern DynamicEntityList gWorldDynamicEntityList; +extern DynamicEntityList gBattleDynamicEntityList; +extern DynamicEntityList* gCurrentDynamicEntityListPtr; -extern Npc* gWorldNpcList[64]; -extern Npc* gBattleNpcList[64]; -extern Npc** gCurrentNpcListPtr[64]; +extern NpcList gWorldNpcList; +extern NpcList gBattleNpcList; +extern NpcList* gCurrentNpcListPtr; -extern Shadow* gWorldShadowList[60]; -extern Shadow* gBattleShadowList[60]; -extern Shadow** gCurrentShadowListPtr[60]; +extern ShadowList gWorldShadowList; +extern ShadowList gBattleShadowList; +extern ShadowList* gCurrentShadowListPtr; extern Camera gCameras[4]; extern s32 gCurrentCameraID; @@ -89,9 +90,9 @@ extern PrintContext* D_802DB268; // Triggers extern s16 gTriggerCount; -extern Trigger* gTriggerList1[64]; -extern Trigger* gTriggerList2[64]; -extern Trigger** gCurrentTriggerListPtr[64]; +extern TriggerList gTriggerList1; +extern TriggerList gTriggerList2; +extern TriggerList* gCurrentTriggerListPtr; // Map transition data. Should probably be a struct extern u16 gMapTransitionAlpha; diff --git a/sources.mk b/sources.mk new file mode 100644 index 0000000000..9706dbe917 --- /dev/null +++ b/sources.mk @@ -0,0 +1,35 @@ +### ASSETS_FS and ASSETS_FS_SOURCES ### + +# The asset filesystem path. +ASSETS_FS = assets/fs + +# Source files to build the asset filesystem with. Each of these must be configured in `assets/fs.json'. +ASSETS_FS_SOURCES = $(wildcard $(ASSETS_FS)/*.bin) + + +### OBJECTS ### + +C_FILES = $(shell find src -type f -name "*.c" -not -name "*.inc.c") +S_FILES = $(wildcard asm/*.s asm/os/*.s) + +BIN_FILES = $(foreach dir, $(shell mkdir -p bin && find bin -type d -not -name Yay0), $(wildcard $(dir)/*.bin)) +COMPRESSED_BIN_FILES = $(wildcard bin/Yay0/*.bin) + +# The OBJECTS variable holds the filenames of all object files to be linked. +# Each of these objects should appear in `papermario.ld' (generated by n64splat). +# +# The extension of each object file specifies its source type (and, therefore, how it should be built): +# +# Object ext | Source ext | Description +# ------------+------------+------------- +# .o | | Special; must have build steps declared here +# .c.o | .c | C sourcecode +# .s.o | .s | Assembly (built with modern assembler) +# .bin.o | .bin | Uncompressed data +# .Yay0.o | .bin | Compressed data +# +# Note that ASSETS_FS is linked implicitly and does not need to be listed here. + +OBJECTS = \ + $(foreach file, $(C_FILES) $(S_FILES) $(BIN_FILES), $(BUILD_DIR)/$(file).o) \ + $(foreach file, $(COMPRESSED_BIN_FILES), $(BUILD_DIR)/$(file:.bin=.Yay0.o)) diff --git a/src/code_a5dd0_len_114e0.c b/src/code_a5dd0_len_114e0.c index 3c67595af5..26d7166ec7 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/code_a5dd0_len_114e0.c @@ -34,24 +34,24 @@ Shadow* get_shadow_by_index(s32 index) { return (*gCurrentShadowListPtr)[index & 0xFFF]; } -Entity** get_entity_list(void) { - Entity** ret; +EntityList* get_entity_list(void) { + EntityList* ret; if (!GAME_STATUS->isBattle) { - ret = gWorldEntityList; + ret = &gWorldEntityList; } else { - ret = gBattleEntityList; + ret = &gBattleEntityList; } return ret; } -Shadow** get_shadow_list(void) { - Shadow** ret; +ShadowList* get_shadow_list(void) { + ShadowList* ret; if (!GAME_STATUS->isBattle) { - ret = gWorldShadowList; + ret = &gWorldShadowList; } else { - ret = gBattleShadowList; + ret = &gBattleShadowList; } return ret; } diff --git a/src/code_dbd70_len_700.c b/src/code_dbd70_len_700.c index 9045c95c38..e5c36c58ce 100644 --- a/src/code_dbd70_len_700.c +++ b/src/code_dbd70_len_700.c @@ -8,9 +8,9 @@ INCLUDE_ASM(s32, "code_dbd70_len_700", clear_trigger_data); void init_trigger_list(void) { if (!GAME_STATUS->isBattle) { - *gCurrentTriggerListPtr = gTriggerList1; + gCurrentTriggerListPtr = &gTriggerList1; } else { - *gCurrentTriggerListPtr = gTriggerList2; + gCurrentTriggerListPtr = &gTriggerList2; } gTriggerCount = 0; @@ -22,16 +22,17 @@ INCLUDE_ASM(s32, "code_dbd70_len_700", update_triggers); void delete_trigger(Trigger* toDelete) { s32 i; + TriggerList** currentTriggerListPtr = &gCurrentTriggerListPtr; - for (i = 0; i < ARRAY_COUNT(gCurrentTriggerListPtr); i++) { - if ((*gCurrentTriggerListPtr)[i] == toDelete) { + for (i = 0; i < MAX_TRIGGERS; i++) { + if ((**currentTriggerListPtr)[i] == toDelete) { break; } } - if (i < ARRAY_COUNT(gCurrentTriggerListPtr)) { - heap_free((*gCurrentTriggerListPtr)[i]); - (*gCurrentTriggerListPtr)[i] = NULL; + if (i < MAX_TRIGGERS) { + heap_free((**currentTriggerListPtr)[i]); + (**currentTriggerListPtr)[i] = NULL; } } @@ -48,7 +49,7 @@ s32 func_80145CE8(s32 arg0) { return 0; } - for (i = 0; i < ARRAY_COUNT(gCurrentTriggerListPtr); i++) { + for (i = 0; i < MAX_TRIGGERS; i++) { Trigger* trigger = (*gCurrentTriggerListPtr)[i]; if ((trigger != NULL) && diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index 17e359d698..380c88ec1c 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -260,7 +260,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072890); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800728F0); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072950); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80072950, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 time); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800729B0); diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c index ff56ee5e5c..769c871e22 100644 --- a/src/world/area_flo/flo_07/CAC1F0.c +++ b/src/world/area_flo/flo_07/CAC1F0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC1F0", func_80240000_CAC1F0); INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC1F0", func_80240124_CAC314); -INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC1F0", func_8024030C_CAC4FC); +#include "world/common/SpawnSunEffect.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC1F0", func_80240344_CAC534); diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c index 5ff2545661..40313a04a5 100644 --- a/src/world/area_isk/isk_04/97B670.c +++ b/src/world/area_isk/isk_04/97B670.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802403D4); INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_80240814); -INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_8024085C_97BE8C); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802408B4_97BEE4); diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c index a6a272e9f5..86101c9330 100644 --- a/src/world/area_isk/isk_08/984E30.c +++ b/src/world/area_isk/isk_08/984E30.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240394); INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_802407D4); -INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_8024081C); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240874); diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c index 0e5ce7ea5f..25c057fc06 100644 --- a/src/world/area_isk/isk_18/997F70.c +++ b/src/world/area_isk/isk_18/997F70.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_80240394_998304); INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_802407D4_998744); -INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_8024081C_99878C); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_80240874_9987E4); diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c index 2012a6802a..ae27c8e2ed 100644 --- a/src/world/area_kpa/kpa_01/A470C0.c +++ b/src/world/area_kpa/kpa_01/A470C0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802404F4); INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_80240934); -INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_8024097C); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802409D4_A47934); diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index c57778a3d4..9f2b7bdb5d 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802404F4_A48AB4); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240934_A48EF4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_8024097C_A48F3C); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802409D4_A48F94); diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index 4c0f298cb5..ac8819fa06 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -16,6 +16,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240544_A9D174); INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240984_A9D5B4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_802409CC); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240A24_A9D654); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 8f2d202c8d..0b3fc40b84 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240AE4_C617F4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240B2C); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240B84_C61894); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 53a7a72bb1..1274636a66 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242D58); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243198_C79E78); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802431E0); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243238_C79F18); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index cdffa1376f..efe6fbe633 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242048); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242488_C87F38); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802424D0); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242528_C87FD8); diff --git a/src/world/area_mac/mac_06/864B40.c b/src/world/area_mac/mac_06/864B40.c index 979d66c5d7..c59ff6ef67 100644 --- a/src/world/area_mac/mac_06/864B40.c +++ b/src/world/area_mac/mac_06/864B40.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_80240124_864C64); INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_8024030C_864E4C); -INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_8024047C_864FBC); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_osr/osr_00/AAC830.c b/src/world/area_osr/osr_00/AAC830.c index b74fd7a8c1..e33949e50c 100644 --- a/src/world/area_osr/osr_00/AAC830.c +++ b/src/world/area_osr/osr_00/AAC830.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_80240124_AAC954); INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_8024030C_AACB3C); -INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_80240344_AACB74); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_00/929270.c b/src/world/area_sbk/sbk_00/929270.c index d89935d9ed..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_00/929270.c +++ b/src/world/area_sbk/sbk_00/929270.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_00/929270", func_80240000_929270); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c index 5a6fb53ccf..5d6a2f411c 100644 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ b/src/world/area_sbk/sbk_00/9292B0.c @@ -1,3 +1,7 @@ #include "common.h" +#include "map.h" -INCLUDE_ASM(s32, "world/area_sbk/sbk_00/9292B0", func_80240040_9292B0); +ApiStatus func_80240040_9292B0(ScriptInstance* script, s32 isInitialCall) { + script->ownerActorID->unk_B5 = 3; + return ApiStatus_DONE2; +} diff --git a/src/world/area_sbk/sbk_01/929A90.c b/src/world/area_sbk/sbk_01/929A90.c index e2d379945a..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_01/929A90.c +++ b/src/world/area_sbk/sbk_01/929A90.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_01/929A90", func_80240000_929A90); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_03/92F8B0.c b/src/world/area_sbk/sbk_03/92F8B0.c index d621ced1bf..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_03/92F8B0.c +++ b/src/world/area_sbk/sbk_03/92F8B0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_03/92F8B0", func_80240000_92F8B0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_04/9304D0.c b/src/world/area_sbk/sbk_04/9304D0.c index bbe4019788..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_04/9304D0.c +++ b/src/world/area_sbk/sbk_04/9304D0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_04/9304D0", func_80240000_9304D0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_05/930CF0.c b/src/world/area_sbk/sbk_05/930CF0.c index 492cfd4bc7..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_05/930CF0.c +++ b/src/world/area_sbk/sbk_05/930CF0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_05/930CF0", func_80240000_930CF0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_06/9325C0.c b/src/world/area_sbk/sbk_06/9325C0.c index bfe93b0056..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_06/9325C0.c +++ b/src/world/area_sbk/sbk_06/9325C0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_06/9325C0", func_80240000_9325C0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_10/933C80.c b/src/world/area_sbk/sbk_10/933C80.c index 937e206896..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_10/933C80.c +++ b/src/world/area_sbk/sbk_10/933C80.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_10/933C80", func_80240000_933C80); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_11/934040.c b/src/world/area_sbk/sbk_11/934040.c index 451628333b..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_11/934040.c +++ b/src/world/area_sbk/sbk_11/934040.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_11/934040", func_80240000_934040); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_12/934D40.c b/src/world/area_sbk/sbk_12/934D40.c index 0f628163c7..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_12/934D40.c +++ b/src/world/area_sbk/sbk_12/934D40.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_12/934D40", func_80240000_934D40); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_13/9357E0.c b/src/world/area_sbk/sbk_13/9357E0.c index 3d1405f504..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_13/9357E0.c +++ b/src/world/area_sbk/sbk_13/9357E0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_13/9357E0", func_80240000_9357E0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_14/9366E0.c b/src/world/area_sbk/sbk_14/9366E0.c index 65fe62bab4..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_14/9366E0.c +++ b/src/world/area_sbk/sbk_14/9366E0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_14/9366E0", func_80240000_9366E0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_15/936CD0.c b/src/world/area_sbk/sbk_15/936CD0.c index 349a325a67..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_15/936CD0.c +++ b/src/world/area_sbk/sbk_15/936CD0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_15/936CD0", func_80240000_936CD0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_16/937570.c b/src/world/area_sbk/sbk_16/937570.c index 317a30f651..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_16/937570.c +++ b/src/world/area_sbk/sbk_16/937570.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_16/937570", func_80240000_937570); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_20/938590.c b/src/world/area_sbk/sbk_20/938590.c index e54494fb07..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_20/938590.c +++ b/src/world/area_sbk/sbk_20/938590.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_20/938590", func_80240000_938590); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_21/939560.c b/src/world/area_sbk/sbk_21/939560.c index f43883365b..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_21/939560.c +++ b/src/world/area_sbk/sbk_21/939560.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_21/939560", func_80240000_939560); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_22/939930.c b/src/world/area_sbk/sbk_22/939930.c index a37b169162..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_22/939930.c +++ b/src/world/area_sbk/sbk_22/939930.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_22/939930", func_80240000_939930); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_23/93A760.c b/src/world/area_sbk/sbk_23/93A760.c index af8cd0e2d1..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_23/93A760.c +++ b/src/world/area_sbk/sbk_23/93A760.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_23/93A760", func_80240000_93A760); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_24/93AC30.c b/src/world/area_sbk/sbk_24/93AC30.c index 0808bc4895..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_24/93AC30.c +++ b/src/world/area_sbk/sbk_24/93AC30.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_24/93AC30", func_80240000_93AC30); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_25/93C280.c b/src/world/area_sbk/sbk_25/93C280.c index 801f8c451e..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_25/93C280.c +++ b/src/world/area_sbk/sbk_25/93C280.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_25/93C280", func_80240000_93C280); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_26/93DCD0.c b/src/world/area_sbk/sbk_26/93DCD0.c index c7591e333f..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_26/93DCD0.c +++ b/src/world/area_sbk/sbk_26/93DCD0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_26/93DCD0", func_80240000_93DCD0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 3990e6288b..55592babaf 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240040_93F5F0); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240164_93F714); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240338_93F8E8); +#include "world/common/SpawnSunEffect.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240370_93F920); diff --git a/src/world/area_sbk/sbk_31/944000.c b/src/world/area_sbk/sbk_31/944000.c index ab14f28998..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_31/944000.c +++ b/src/world/area_sbk/sbk_31/944000.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_31/944000", func_80240000_944000); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_32/944A60.c b/src/world/area_sbk/sbk_32/944A60.c index 44ea3d90e7..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_32/944A60.c +++ b/src/world/area_sbk/sbk_32/944A60.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_32/944A60", func_80240000_944A60); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_33/9459D0.c b/src/world/area_sbk/sbk_33/9459D0.c index 5228a510a2..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_33/9459D0.c +++ b/src/world/area_sbk/sbk_33/9459D0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_33/9459D0", func_80240000_9459D0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_34/945ED0.c b/src/world/area_sbk/sbk_34/945ED0.c index 2e353c9f0a..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_34/945ED0.c +++ b/src/world/area_sbk/sbk_34/945ED0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945ED0", func_80240000_945ED0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_35/9486B0.c b/src/world/area_sbk/sbk_35/9486B0.c index 74c3f1cd26..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_35/9486B0.c +++ b/src/world/area_sbk/sbk_35/9486B0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_35/9486B0", func_80240000_9486B0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_36/949E60.c b/src/world/area_sbk/sbk_36/949E60.c index 1952119f02..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_36/949E60.c +++ b/src/world/area_sbk/sbk_36/949E60.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_36/949E60", func_80240000_949E60); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_40/94B3A0.c b/src/world/area_sbk/sbk_40/94B3A0.c index 462a463ea6..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_40/94B3A0.c +++ b/src/world/area_sbk/sbk_40/94B3A0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_40/94B3A0", func_80240000_94B3A0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_41/94C040.c b/src/world/area_sbk/sbk_41/94C040.c index 6e196a52b5..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_41/94C040.c +++ b/src/world/area_sbk/sbk_41/94C040.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_41/94C040", func_80240000_94C040); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_42/94C510.c b/src/world/area_sbk/sbk_42/94C510.c index 9a2c1af3de..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_42/94C510.c +++ b/src/world/area_sbk/sbk_42/94C510.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_42/94C510", func_80240000_94C510); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_43/94D170.c b/src/world/area_sbk/sbk_43/94D170.c index 741977cc35..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_43/94D170.c +++ b/src/world/area_sbk/sbk_43/94D170.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_43/94D170", func_80240000_94D170); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_44/94D5A0.c b/src/world/area_sbk/sbk_44/94D5A0.c index fbaa10e291..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_44/94D5A0.c +++ b/src/world/area_sbk/sbk_44/94D5A0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_44/94D5A0", func_80240000_94D5A0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_45/94E4A0.c b/src/world/area_sbk/sbk_45/94E4A0.c index 1c33d23a65..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_45/94E4A0.c +++ b/src/world/area_sbk/sbk_45/94E4A0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_45/94E4A0", func_80240000_94E4A0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_46/94E9A0.c b/src/world/area_sbk/sbk_46/94E9A0.c index 88c8f9d10e..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_46/94E9A0.c +++ b/src/world/area_sbk/sbk_46/94E9A0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_46/94E9A0", func_80240000_94E9A0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_50/950610.c b/src/world/area_sbk/sbk_50/950610.c index 27e2d7b3dd..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_50/950610.c +++ b/src/world/area_sbk/sbk_50/950610.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_50/950610", func_80240000_950610); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_51/950970.c b/src/world/area_sbk/sbk_51/950970.c index 44ab8afd3d..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_51/950970.c +++ b/src/world/area_sbk/sbk_51/950970.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_51/950970", func_80240000_950970); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_52/951670.c b/src/world/area_sbk/sbk_52/951670.c index f296bdb4f2..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_52/951670.c +++ b/src/world/area_sbk/sbk_52/951670.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_52/951670", func_80240000_951670); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_53/951AE0.c b/src/world/area_sbk/sbk_53/951AE0.c index 7c0765ed03..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_53/951AE0.c +++ b/src/world/area_sbk/sbk_53/951AE0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_53/951AE0", func_80240000_951AE0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_54/952580.c b/src/world/area_sbk/sbk_54/952580.c index 4901ea0b52..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_54/952580.c +++ b/src/world/area_sbk/sbk_54/952580.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_54/952580", func_80240000_952580); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_55/952A50.c b/src/world/area_sbk/sbk_55/952A50.c index 806e95f239..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_55/952A50.c +++ b/src/world/area_sbk/sbk_55/952A50.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_55/952A50", func_80240000_952A50); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index fee6fa5cfe..3387daa697 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240000_953FC0); +#include "world/common/SpawnSunEffect.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240038_953FF8); diff --git a/src/world/area_sbk/sbk_60/9569F0.c b/src/world/area_sbk/sbk_60/9569F0.c index 2c0da8df32..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_60/9569F0.c +++ b/src/world/area_sbk/sbk_60/9569F0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_60/9569F0", func_80240000_9569F0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_61/956F90.c b/src/world/area_sbk/sbk_61/956F90.c index c7708dab18..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_61/956F90.c +++ b/src/world/area_sbk/sbk_61/956F90.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_61/956F90", func_80240000_956F90); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_62/957350.c b/src/world/area_sbk/sbk_62/957350.c index 81a9b333c1..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_62/957350.c +++ b/src/world/area_sbk/sbk_62/957350.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_62/957350", func_80240000_957350); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_63/957D70.c b/src/world/area_sbk/sbk_63/957D70.c index 3a1cb1649c..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_63/957D70.c +++ b/src/world/area_sbk/sbk_63/957D70.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_63/957D70", func_80240000_957D70); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_64/958590.c b/src/world/area_sbk/sbk_64/958590.c index 264eb15512..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_64/958590.c +++ b/src/world/area_sbk/sbk_64/958590.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_64/958590", func_80240000_958590); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_65/958950.c b/src/world/area_sbk/sbk_65/958950.c index 07f9ab2151..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_65/958950.c +++ b/src/world/area_sbk/sbk_65/958950.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_65/958950", func_80240000_958950); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_66/958CB0.c b/src/world/area_sbk/sbk_66/958CB0.c index 278481fdad..f3f4f6db3a 100644 --- a/src/world/area_sbk/sbk_66/958CB0.c +++ b/src/world/area_sbk/sbk_66/958CB0.c @@ -1,3 +1 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_66/958CB0", func_80240000_958CB0); +#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c index 0069e6b4cc..1db5f9659e 100644 --- a/src/world/area_tik/tik_12/88A530.c +++ b/src/world/area_tik/tik_12/88A530.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241CF4); INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80242134); -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_8024217C); +#include "world/common/AwaitPlayerNearNPC.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_802421D4); diff --git a/src/world/common/AwaitPlayerNearNPC.inc.c b/src/world/common/AwaitPlayerNearNPC.inc.c new file mode 100644 index 0000000000..77426813fa --- /dev/null +++ b/src/world/common/AwaitPlayerNearNPC.inc.c @@ -0,0 +1,11 @@ +#include "common.h" + +static ApiStatus AwaitPlayerNearNPC(ScriptInstance* script, s32 isInitialCall) { + PlayerStatus* playerStatus = PLAYER_STATUS; + Npc* npc = get_npc_safe(script->ownerID); + + if (dist2D(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z) < 50.0f) { + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/SpawnSunEffect.inc.c b/src/world/common/SpawnSunEffect.inc.c new file mode 100644 index 0000000000..a8ae6ba016 --- /dev/null +++ b/src/world/common/SpawnSunEffect.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus SpawnSunEffect(ScriptInstance* script, s32 isInitialCall) { + func_80072950(0, 0.0f, 0.0f, 0.0f, 0.0f, 0); + return ApiStatus_DONE2; +} diff --git a/tools/assist.py b/tools/assist.py new file mode 100755 index 0000000000..67ee32784a --- /dev/null +++ b/tools/assist.py @@ -0,0 +1,177 @@ +#!/usr/bin/python3 + +import argparse +from collections import OrderedDict +import os +import re +import pickle +import sys + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +asm_dir = root_dir + "asm/nonmatchings/" +build_dir = root_dir + "build/" + +def read_rom(): + with open("baserom.z64", "rb") as f: + return f.read() + + +def find_dir(query): + for root, dirs, files in os.walk(asm_dir): + for d in dirs: + if d == query: + return os.path.join(root, d) + return None + + +def get_all_s_files(): + ret = set() + for root, dirs, files in os.walk(asm_dir): + for f in files: + if f.endswith(".s"): + ret.add(f[:-2]) + return ret + + +def get_symbol_bytes(offsets, func): + if func not in offsets or "start" not in offsets[func] or "end" not in offsets[func]: + return None + start = offsets[func]["start"] + end = offsets[func]["end"] + return list(rom_bytes[start:end]) + + +def parse_map(fname): + ram_offset = None + cur_file = "" + syms = {} + prev_sym = None + prev_line = "" + with open(fname) as f: + for line in f: + if "load address" in line: + if "noload" in line or "noload" in prev_line: + ram_offset = None + continue + ram = int(line[16 : 16 + 18], 0) + rom = int(line[59 : 59 + 18], 0) + ram_offset = ram - rom + continue + prev_line = line + + if ( + ram_offset is None + or "=" in line + or "*fill*" in line + or " 0x" not in line + ): + continue + ram = int(line[16 : 16 + 18], 0) + rom = ram - ram_offset + fn = line.split()[-1] + if "0x" in fn: + ram_offset = None + elif "/" in fn: + cur_file = fn + else: + syms[fn] = (rom, cur_file, prev_sym, ram) + prev_sym = fn + return syms + + +def get_map_offsets(syms): + offsets = {} + for sym in syms: + prev_sym = syms[sym][2] + if sym not in offsets: + offsets[sym] = {} + if prev_sym not in offsets: + offsets[prev_sym] = {} + offsets[sym]["start"] = syms[sym][0] + offsets[prev_sym]["end"] = syms[sym][0] + return offsets + + +def diff_syms(qb, tb): + if len(tb) < 8: + return 0 + + if len(qb) > len(tb): + larger = qb + smaller = tb + else: + larger = tb + smaller = qb + + len_ratio = len(smaller) / len(larger) + + n_bytes = len(smaller) + matches = 0 + for i in range(0, n_bytes, 4): + if smaller[i] == larger[i]: + matches += 4 + return (matches / n_bytes) * len_ratio + + +def get_matches(query): + query_bytes = get_symbol_bytes(map_offsets, query) + if query_bytes is None: + sys.exit("Symbol '" + query + "' not found") + + ret = {} + for symbol in map_offsets: + if symbol is not None and query != symbol: + target_bytes = get_symbol_bytes(map_offsets, symbol) + if target_bytes is not None: + score = diff_syms(query_bytes, target_bytes) + if score >= args.threshold: + ret[symbol] = score + return OrderedDict(sorted(ret.items(), key=lambda kv: kv[1], reverse=True)) + + +def do_query(query): + matches = get_matches(query) + num_matches = len(matches) + + if num_matches == 0: + print(query + " - found no matches") + return + + i = 0 + more_str = ":" + if args.num_out < num_matches: + more_str = " (showing only " + str(args.num_out) + "):" + + print(query + " - found " + str(num_matches) + " matches total" + more_str) + for match in matches: + if i == args.num_out: + break + match_str = "{:.2f} - {}".format(matches[match], match) + if match not in s_files: + match_str += " (decompiled)" + print(match_str) + i += 1 + print() + +parser = argparse.ArgumentParser(description="Tools to assist with decomp") +parser.add_argument("query", help="function or file") +parser.add_argument("--threshold", help="score threshold between 0 and 1 (higher is more restrictive)", type=float, default=0.95, required=False) +parser.add_argument("--num-out", help="number of functions to display", type=int, default=10, required=False) + +args = parser.parse_args() + +rom_bytes = read_rom() +map_syms = parse_map(build_dir + "papermario.map") +map_offsets = get_map_offsets(map_syms) + +s_files = get_all_s_files() + +query_dir = find_dir(args.query) + +if query_dir is not None: + files = os.listdir(query_dir) + for f_name in files: + do_query(f_name[:-2]) +else: + do_query(args.query) diff --git a/tools/build_assets_fs.py b/tools/build_assets_fs.py index 39a8e329f7..2830691963 100755 --- a/tools/build_assets_fs.py +++ b/tools/build_assets_fs.py @@ -39,7 +39,7 @@ def build_mapfs(src_dir, build_dir, out_bin): size = next_multiple(build_path.stat().st_size, 2) decompressed_size = src_path.stat().st_size - print(f"{name} {offset:08X} {size:08X} {decompressed_size:08X}") + #print(f"{name} {offset:08X} {size:08X} {decompressed_size:08X}") written_names.append(name) # write all previously-written names; required to match @@ -93,9 +93,14 @@ def build_file(src_dir, out_dir, filename): shutil.copy(src_path, out_path) if __name__ == "__main__": - if len(sys.argv) > 1: - # copy (and compress if required) the given file - build_file("assets/fs", "build/assets/fs", sys.argv[1]) + sys.argv.pop(0) + src = sys.argv.pop(0) + dest = sys.argv.pop(0) + + if len(sys.argv) > 0: + # copy (and compress if required) the given file(s) + while len(sys.argv) > 0: + build_file(src, dest, sys.argv.pop()) else: # build the aggregate file - build_mapfs("assets/fs", "build/assets/fs", "build/assets/fs.bin") + build_mapfs(src, dest, dest + ".bin") diff --git a/tools/n64splat b/tools/n64splat index b349796f4e..895abeff31 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit b349796f4ef5d7f796ac0796c7a9974f5b735547 +Subproject commit 895abeff31cc0bd5de3a05a55715d3457f8425eb diff --git a/tools/splat.yaml b/tools/splat.yaml index 8e62f4b8b1..9ec7e2990e 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -4,7 +4,7 @@ options: find-file-boundaries: True compiler: "GCC" mnemonic_ljust: 10 - o_as_suffix: yes + ld_o_replace_extension: no segments: - name: header type: header