From e1bf4549e3775def2db19e85af45cd5b61f1c2ed Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Fri, 28 Oct 2022 02:46:26 -0400 Subject: [PATCH] Created inital yaml for decompressed rom, edited makefile to build it and fixed all undefined symbol/multiple definition errors --- Makefile | 287 +-- decompressed.us.v10.yaml | 2209 +++++++++++++++++++ first_diff.py | 255 +++ include/2.0L/PR/ultraerror.h | 2 +- include/n_synth.h | 2 +- include/seqp.h | 26 +- rzip_dummy_addrs.txt | 32 + src/BGS/ch/croctus.c | 2 +- src/BGS/ch/flibbit.c | 12 +- src/BGS/ch/mrvile.c | 34 +- src/BGS/ch/tanktup.c | 4 +- src/BGS/ch/yellowflibbit.c | 14 +- src/BGS/code_3030.c | 16 +- src/BGS/code_3420.c | 30 +- src/BGS/code_9750.c | 12 +- src/BGS/done/ch/code_2270.c | 34 +- src/BGS/done/ch/code_6730.c | 8 +- src/BGS/done/code_8DF0.c | 10 +- src/CC/ch/sawblade.c | 4 +- src/CC/code_0.c | 14 +- src/CC/code_13C0.c | 12 +- src/CC/code_19B0.c | 2 +- src/CC/code_1B90.c | 4 +- src/CC/code_1F70.c | 12 +- src/CC/code_530.c | 20 +- src/CC/code_BF0.c | 12 +- src/CCW/code_0.c | 6 +- src/CCW/code_14B0.c | 10 +- src/CCW/code_160.c | 4 +- src/CCW/code_1B20.c | 10 +- src/CCW/code_2270.c | 24 +- src/CCW/code_3050.c | 6 +- src/CCW/code_3310.c | 6 +- src/CCW/code_5BF0.c | 6 +- src/CCW/code_61E0.c | 20 +- src/CCW/code_6620.c | 6 +- src/CCW/code_7120.c | 4 +- src/CCW/code_76C0.c | 12 +- src/CCW/code_7BF0.c | 4 +- src/CCW/code_950.c | 4 +- src/FP/code_0.c | 12 +- src/FP/code_19E0.c | 2 +- src/FP/code_2350.c | 20 +- src/FP/code_3E00.c | 6 +- src/FP/code_45D0.c | 2 +- src/FP/code_4770.c | 20 +- src/FP/code_4D0.c | 18 +- src/FP/code_6AE0.c | 6 +- src/FP/code_790.c | 16 +- src/FP/code_8E20.c | 22 +- src/FP/code_A40.c | 34 +- src/FP/code_A880.c | 6 +- src/FP/code_ABD0.c | 36 +- src/GV/code_0.c | 14 +- src/GV/code_1570.c | 10 +- src/GV/code_230.c | 24 +- src/GV/code_2730.c | 11 +- src/GV/code_2B80.c | 8 +- src/GV/code_2EE0.c | 2 +- src/GV/code_30C0.c | 14 +- src/GV/code_3AA0.c | 10 +- src/GV/code_3BB0.c | 6 +- src/GV/code_43B0.c | 6 +- src/GV/code_4740.c | 38 +- src/GV/code_5570.c | 8 +- src/GV/code_61E0.c | 23 +- src/GV/code_7530.c | 16 +- src/GV/code_7D50.c | 8 +- src/GV/code_7FC0.c | 8 +- src/GV/code_7FF0.c | 30 +- src/GV/code_9DB0.c | 4 +- src/GV/code_A490.c | 27 +- src/GV/code_D60.c | 28 +- src/MM/ch/conga.c | 4 +- src/MM/ch/lmonkey.c | 4 +- src/MM/ch/orange.c | 6 +- src/MM/ch/orangepad.c | 4 +- src/MM/code_24C0.c | 2 +- src/MM/crc.c | 2 +- src/MMM/ch/napper.c | 2 +- src/MMM/code_16B0.c | 4 +- src/MMM/code_2040.c | 8 +- src/MMM/code_3120.c | 2 +- src/MMM/code_3420.c | 26 +- src/MMM/code_3D50.c | 64 +- src/MMM/code_47D0.c | 6 +- src/MMM/code_5000.c | 2 +- src/MMM/code_DC0.c | 6 +- src/RBB/code_0.c | 6 +- src/RBB/code_1570.c | 20 +- src/RBB/code_1FC0.c | 4 +- src/RBB/code_34B0.c | 10 +- src/RBB/code_3CB0.c | 10 +- src/RBB/code_47D0.c | 4 +- src/RBB/code_4C70.c | 10 +- src/RBB/code_5490.c | 2 +- src/RBB/code_5AB0.c | 8 +- src/RBB/code_5C10.c | 2 +- src/RBB/code_5F80.c | 56 +- src/RBB/code_640.c | 34 +- src/RBB/code_7A60.c | 2 +- src/RBB/code_8520.c | 4 +- src/RBB/code_9670.c | 12 +- src/RBB/code_9840.c | 4 +- src/SM/ch/attacktutorial.c | 8 +- src/SM/code_0.c | 8 +- src/SM/code_2990.c | 10 +- src/SM/code_4070.c | 6 +- src/SM/code_5B0.c | 16 +- src/SM/code_BF0.c | 6 +- src/SM/code_F0.c | 2 +- src/TTC/ch/lockup.c | 4 +- src/TTC/code_0.c | 30 +- src/TTC/code_10A0.c | 8 +- src/TTC/code_19D0.c | 20 +- src/TTC/code_26D0.c | 18 +- src/TTC/code_2B80.c | 4 +- src/TTC/code_35D0.c | 18 +- src/TTC/code_3E30.c | 28 +- src/core1/code_0.c | 4 +- src/core1/code_10A00.c | 4 +- src/core1/code_18350.c | 10 +- src/core1/code_1D00.c | 2 +- src/core1/code_8C50.c | 6 +- src/core1/code_E360.c | 2 +- src/core1/done/audio/drvrNew.c | 4 +- src/core1/done/audio/n_csplayer.c | 66 +- src/core1/done/audio/n_env.c | 4 +- src/core1/done/audio/n_envresample.c | 2 +- src/core1/done/audio/n_synallocvoice.c | 4 +- src/core1/done/audio/n_synfreevoice.c | 2 +- src/core1/done/audio/n_synsetfxmix.c | 2 +- src/core1/done/audio/n_synsetpan.c | 2 +- src/core1/done/audio/n_synsetpitch.c | 2 +- src/core1/done/audio/n_synsetvol.c | 2 +- src/core1/done/audio/n_synstartvoice.c | 2 +- src/core1/done/audio/n_synstartvoiceparam.c | 2 +- src/core1/done/audio/n_synstopvoice.c | 2 +- src/core1/done/audio/n_synthesizer.c | 2 +- src/core1/done/audio/reverb.c | 2 +- src/core2/bs/bEggAss.c | 2 +- src/core2/bs/bEggHead.c | 2 +- src/core2/code_3BB80.c | 26 +- src/core2/code_5C870.c | 2 +- src/core2/code_9B990.c | 8 +- src/core2/code_AD110.c | 4 +- src/core2/code_C4320.c | 4 +- src/core2/code_C4B0.c | 2 +- src/core2/code_CC1E0.c | 2 +- src/core2/code_CF3E0.c | 4 +- src/core2/yaw.c | 4 +- src/cutscenes/code_0.c | 52 +- src/cutscenes/code_60F0.c | 2 +- src/cutscenes/code_6730.c | 4 +- src/fight/chbossjinjo.c | 20 +- src/fight/chbossjinjobase.c | 4 +- src/fight/chfinalboss.c | 115 +- src/fight/chjinjonator.c | 6 +- src/fight/chjinjonatorbase.c | 6 +- src/fight/chspellfireball.c | 14 +- src/fight/chstonejinjo.c | 6 +- src/fight/code_0.c | 18 +- src/fight/code_9850.c | 12 +- src/lair/code_0.c | 74 +- src/lair/code_42A0.c | 10 +- src/lair/code_5640.c | 4 +- src/lair/code_5ED0.c | 62 +- src/lair/code_86F0.c | 18 +- src/lair/code_9C40.c | 6 +- src/lair/code_AD70.c | 6 +- symbol_addrs.core1.us.v10.txt | 34 +- symbol_addrs.global.us.v10.txt | 10 +- undefined_syms.libultra.txt | 27 + undefined_syms.us.v10.txt | 30 +- 174 files changed, 3648 insertions(+), 1282 deletions(-) create mode 100644 decompressed.us.v10.yaml create mode 100755 first_diff.py create mode 100644 rzip_dummy_addrs.txt diff --git a/Makefile b/Makefile index 62d960da..ef6621af 100644 --- a/Makefile +++ b/Makefile @@ -59,20 +59,6 @@ PROGRESS_READ := $(PYTHON) tools/progress_read.py # Inputs OVERLAYS := core1 core2 MM TTC CC BGS FP lair GV CCW RBB MMM SM fight cutscenes -# Creates a list of all the source files for the given overlay (e.g. BGS_C_SRCS) -# Appends that list to OVERLAY_C_FILES -define get_overlay_sources - $(1)_C_SRCS := $(filter $(SRC_ROOT)/$(1)/%,$(ALL_C_SRCS)) - $(1)_ASM_SRCS := $(filter $(ASM_ROOT)/$(1)/%,$(ALL_ASM_SRCS)) - $(1)_BINS := $(filter $(BIN_ROOT)/$(1)/%,$(ALL_BINS)) - OVERLAY_C_SRCS += $$($(1)_C_SRCS) - OVERLAY_ASM_SRCS += $$($(1)_ASM_SRCS) - OVERLAY_BINS += $$($(1)_BINS) - # Overlay inputs - $(1)_NEW_FILES := $$(filter $(BIN_ROOT)/$(1)/%, $(NEW_BINS)) $$(filter $(SRC_ROOT)/$(1)/%, $(NEW_C_SRCS)) $$(filter $(ASM_ROOT)/$(1)/%, $(NEW_ASM_SRCS)) $$(filter $(ASM_ROOT)/data/$(1)/%, $(NEW_ASM_SRCS)) - OVERLAY_NEW_FILES += $$($(1)_NEW_FILES) -endef - # Source files SRC_ROOT := src ASM_ROOT := asm @@ -84,35 +70,27 @@ NONMATCHING_DIR := $(ASM_ROOT)/$(NONMATCHINGS) BUILD_ROOT := build BUILD_DIR := $(BUILD_ROOT)/$(VERSION) ALL_ASSET_FILES := $(shell find $(ASSET_ROOT) -type f -iname '*.*' 2> /dev/null) -ALL_C_SRCS := $(shell find $(SRC_ROOT) -type f -iname '*.c' 2> /dev/null) +C_SRCS := $(shell find $(SRC_ROOT) -type f -iname '*.c' 2> /dev/null) +BOOT_C_SRCS := $(wildcard $(SRC_ROOT)/done/*.c) ALL_ASM_SRCS := $(filter-out $(ASM_ROOT)/$(NONMATCHINGS), $(shell find $(ASM_ROOT) -name $(NONMATCHINGS) -prune -o -iname '*.s' 2> /dev/null)) ALL_BINS := $(shell find $(BIN_ROOT) -type f -iname '*.bin' 2> /dev/null) -# Files referenced in the splat files -YAML_CALL := $(SPLAT_INPUTS) $(BASENAME).$(VERSION).yaml $(addprefix $(SUBYAML)/, $(addsuffix .$(VERSION).yaml, $(OVERLAYS))) -YAML_SRCS := $(shell $(SPLAT_INPUTS) $(BASENAME).$(VERSION).yaml $(addprefix $(SUBYAML)/, $(addsuffix .$(VERSION).yaml, $(OVERLAYS)))) +# Files referenced in the splat file +YAML_CALL := $(SPLAT_INPUTS) decompressed.$(VERSION).yaml +YAML_SRCS := $(sort $(shell $(SPLAT_INPUTS) decompressed.$(VERSION).yaml)) YAML_C_SRCS := $(filter %.c, $(YAML_SRCS)) YAML_ASM_SRCS := $(filter %.s, $(YAML_SRCS)) YAML_BINS := $(filter %.bin, $(YAML_SRCS)) # Files that need to be extracted -NEW_C_SRCS := $(filter-out $(ALL_C_SRCS), $(YAML_C_SRCS)) +NEW_C_SRCS := $(filter-out $(C_SRCS), $(YAML_C_SRCS)) NEW_ASM_SRCS := $(filter-out $(ALL_ASM_SRCS), $(YAML_ASM_SRCS)) NEW_BINS := $(filter-out $(ALL_BINS), $(YAML_BINS)) NEW_FILES := $(NEW_C_SRCS) $(NEW_ASM_SRCS) $(NEW_BINS) -$(foreach overlay,$(OVERLAYS),$(eval $(call get_overlay_sources,$(overlay)))) -# Files for the rom itself -MAIN_C_SRCS := $(filter-out $(OVERLAY_C_SRCS),$(ALL_C_SRCS)) -MAIN_ASM_SRCS := $(filter-out $(OVERLAY_ASM_SRCS),$(ALL_ASM_SRCS)) -MAIN_BINS := $(filter-out $(OVERLAY_BINS),$(ALL_BINS)) -# Files that need to be extracted for the rom itself -MAIN_NEW_FILES := $(filter-out $(OVERLAY_NEW_FILES), $(NEW_FILES)) +BOOT_ASM_SRCS := $(filter-out asm/core1/%,$(NEW_ASM_SRCS) $(ALL_ASM_SRCS)) # Any source files that have GLOBAL_ASM in them or do not exist before splitting GLOBAL_ASM_C_SRCS := $(shell $(GREP) GLOBAL_ASM $(SRC_ROOT) /dev/null && \ + @$(DIFF) decompressed.us.v10.z64 $(Z64) > /dev/null && \ $(PRINT) "$(YELLOW) _\n _( )_\n [ ]_\n ) _ _)\n [_( )_]\n$(BLUE)$(BASENAME).$(VERSION).z64$(NO_COL): $(GREEN)OK$(NO_COL)\n" || \ $(PRINT) "$(BLUE)$(BASEROM) $(RED)differs$(NO_COL)\n" - @$(PRINT) "def apply(config, args):\n" > diff_settings.py - @$(PRINT) "\tconfig[\"baseimg\"] = \"$(BASEROM)\"\n" >> diff_settings.py - @$(PRINT) "\tconfig[\"myimg\"] = \"$(Z64)\"\n" >> diff_settings.py - @$(PRINT) "\tconfig[\"mapfile\"] = \"$(Z64:.z64=.map)\"\n" >> diff_settings.py - @$(PRINT) "\tconfig[\"source_directories\"] = ['$(SRC_ROOT)', 'include']\n" >> diff_settings.py - @$(PRINT) "\tconfig[\"makeflags\"] = ['-s']\n" >> diff_settings.py - -# Musical note print for individual overlays -# Need to figure out how to print this only when building a single overlay -# $(YELLOW) ╒════╕\n │ │\n _│ _│\n └─┘ └─┘\n - -# Verify that any given overlay matches, also sets up diff_settings -verify-%: $(BUILD_DIR)/%.rzip.bin $(BIN_ROOT)/%.$(VERSION).rzip.bin $(BUILD_DIR)/%.full progress/progress_%.svg - @$(DIFF) $< $(BIN_ROOT)/$*.$(VERSION).rzip.bin > /dev/null && \ - $(PRINT) "$(BLUE)%-10s$(NO_COL): $(GREEN)OK$(NO_COL)\n" "$*" || \ - $(PRINT) "$(BLUE)$* $(RED)differs$(NO_COL)\n" - @$(PRINT) "def apply(config, args):\n" > diff_settings.py - @$(PRINT) "\tconfig[\"baseimg\"] = \"$(BUILD_DIR)/$*.$(VERSION).bin\"\n" >> diff_settings.py - @$(PRINT) "\tconfig[\"myimg\"] = \"$(BUILD_DIR)/$*.full\"\n" >> diff_settings.py - @$(PRINT) "\tconfig[\"mapfile\"] = \"$(BUILD_DIR)/$*.map\"\n" >> diff_settings.py - @$(PRINT) "\tconfig[\"source_directories\"] = ['$(SRC_ROOT)/$*', 'include']\n" >> diff_settings.py - @$(PRINT) "\tconfig[\"makeflags\"] = ['TARGET=$*','-s']\n" >> diff_settings.py +# @$(PRINT) "def apply(config, args):\n" > diff_settings.py +# @$(PRINT) "\tconfig[\"baseimg\"] = \"$(BASEROM)\"\n" >> diff_settings.py +# @$(PRINT) "\tconfig[\"myimg\"] = \"$(Z64)\"\n" >> diff_settings.py +# @$(PRINT) "\tconfig[\"mapfile\"] = \"$(Z64:.z64=.map)\"\n" >> diff_settings.py +# @$(PRINT) "\tconfig[\"source_directories\"] = ['$(SRC_ROOT)', 'include']\n" >> diff_settings.py +# @$(PRINT) "\tconfig[\"makeflags\"] = ['-s']\n" >> diff_settings.py $(OVERLAY_PROG_SVGS) : progress/progress_%.svg: progress/progress.%.csv $(call print1,Creating progress svg for:,$*) @@ -292,29 +227,6 @@ $(TOTAL_PROG_CSV): $(OVERLAY_PROG_CSVS) $(MAIN_PROG_CSV) $(README_MD): $(TOTAL_PROG_SVG) @head -n 21 $< | tail -n 1 | head -c -8 | tail -c +32 | xargs -i sed -i "/# banjo*/c\# banjo ({})" $@ -# Verify that each overlay matches -verify-each: $(addprefix verify-,$(OVERLAYS)) - -# per-overlay rules -define overlay_rules - # .o -> .elf (overlay) - $(BUILD_DIR)/$(1).elf : $$($(1)_ALL_OBJS) $(1).ld - $(LD) -T $(1).ld -R core2.elf --allow-multiple-definition -Map $(BUILD_DIR)/$(1).map $$(LDFLAGS_COMMON) -T undefined_syms_auto.$(1).$(VERSION).txt -T undefined_funcs_auto.$(1).$(VERSION).txt -o $$@ - # split overlay - $(BUILD_DIR)/$(1)_SPLAT_TIMESTAMP : $(SUBYAML)/$(1).$(VERSION).yaml $(BUILD_DIR)/$(1).$(VERSION).bin $(SYMBOL_ADDRS) - $(call print1,Splitting bin:,$$<) - $(SPLAT) $(SUBYAML)/$(1).$(VERSION).yaml - @touch $$@ - @touch $(1).ld - # Dummy target to make sure extraction happens before compilation, mainly for extracted asm - $$($(1)_C_SRCS) $$($(1)_ASM_SRCS) $$($(1)_BINS) : | $(BUILD_DIR)/$(1)_SPLAT_TIMESTAMP - @: - # Dummy target to make sure extraction happens before processing extracted files and linking - $$($(1)_NEW_FILES) $(1).ld: $(BUILD_DIR)/$(1)_SPLAT_TIMESTAMP - @: -endef -$(foreach overlay,$(OVERLAYS),$(eval $(call overlay_rules,$(overlay)))) - # Additional symbols for core2 $(BUILD_DIR)/core2.elf: LDFLAGS_COMMON = -T symbol_addrs.core1.$(VERSION).txt -T symbol_addrs.core2.$(VERSION).txt -T symbol_addrs.global.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T undefined_syms.libultra.txt --no-check-sections --accept-unknown-input-arch -T level_symbols.$(VERSION).txt $(BUILD_DIR)/core2.temp.elf: LDFLAGS_COMMON = -T symbol_addrs.core1.$(VERSION).txt -T symbol_addrs.core2.$(VERSION).txt -T symbol_addrs.global.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T undefined_syms.libultra.txt --no-check-sections --accept-unknown-input-arch -T level_symbols.$(VERSION).txt @@ -329,29 +241,20 @@ $(BUILD_DIR)/%.s.o: %.s | $(ASM_BUILD_DIRS) $(call print2,Assembling:,$<,$@) @$(GCC) $(GCC_ASFLAGS) $(INCLUDE_CFLAGS) -o $@ $< +# .s -> .o (boot) +$(BOOT_ASM_OBJS) : $(BUILD_DIR)/%.s.o : %.s | $(ASM_BUILD_DIRS) + $(call print2,Assembling:,$<,$@) + @$(GCC) $(GCC_ASFLAGS) $(INCLUDE_CFLAGS) -o $@ $< + $(OBJCOPY) --prefix-symbols=boot_ $@ + # .bin -> .o $(BIN_OBJS) : $(BUILD_DIR)/%.bin.o : %.bin | $(BIN_BUILD_DIRS) $(call print2,Objcopying:,$<,$@) @$(OBJCOPY) $(BINOFLAGS) $< $@ -# .bin -> .o (overlay) -$(OVERLAY_RZIP_OBJS) : $(BUILD_DIR)/$(BIN_ROOT)/%.$(VERSION).rzip.bin.o : $(BUILD_DIR)/%.rzip.bin - $(call print2,Objcopying:,$<,$@) - @$(OBJCOPY) $(BINOFLAGS) $< $@ - $(BUILD_DIR)/bk_boot.full: $(BUILD_DIR)/bk_boot.elf @mips-linux-gnu-objcopy -I elf32-tradbigmips -O binary --only-section .boot_bk_boot $(BUILD_DIR)/bk_boot.elf $@ -$(BUILD_DIR)/crc.bin : $(BUILD_DIR)/bk_boot.full $(BUILD_DIR)/core1.code $(BUILD_DIR)/core1.data $(BK_CRC) - @$(BK_CRC) $(BUILD_DIR)/bk_boot.full > $(BUILD_DIR)/crc.bin - @$(BK_CRC) $(BUILD_DIR)/core1.code >> $(BUILD_DIR)/crc.bin - @$(BK_CRC) $(BUILD_DIR)/core1.data >> $(BUILD_DIR)/crc.bin - -# .bin -> .o (overlay crc check) -$(CRC_OBJS) : $(BUILD_DIR)/crc.bin - $(call print2,Objcopying:,$<,$@) - @$(OBJCOPY) $(BINOFLAGS) $< $@ - # Creates a dummy crc file of 32 bytes to use in the initial link $(BUILD_DIR)/dummy_crc.bin: $(call print1,Creating dummy crc file:$@) @@ -381,113 +284,38 @@ $(GLOBAL_ASM_C_OBJS) : $(BUILD_DIR)/%.c.o : %.c | $(C_BUILD_DIRS) @$(ASM_PROCESSOR) $(OPT_FLAGS) $< --post-process $@ \ --assembler "$(AS) $(ASFLAGS)" --asm-prelude include/prelude.s +# .c -> .o (boot) +$(BOOT_C_OBJS) : $(BUILD_DIR)/%.c.o : %.c | $(C_BUILD_DIRS) + $(call print2,Compiling:,$<,$@) + @$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_CFLAGS) $(OPT_FLAGS) $(MIPSBIT) -o $@ $< + mips-linux-gnu-strip $@ -N asdasdasasdasd + $(OBJCOPY) --prefix-symbols=boot_ $@ + $(OBJCOPY) --strip-unneeded $@ + +# .c -> .o (mips3, boot) +$(BOOT_MIPS3_OBJS) : $(BUILD_DIR)/%.c.o : %.c | $(C_BUILD_DIRS) + $(call print2,Compiling:,$<,$@) + @$(CC) -c -32 $(CFLAGS) $(CPPFLAGS) $(INCLUDE_CFLAGS) $(OPT_FLAGS) $(LOOP_UNROLL) $(MIPSBIT) -o $@ $< + @tools/set_o32abi_bit.py $@ + $(OBJCOPY) --prefix-symbols=boot_ $@ + $(OBJCOPY) --strip-unneeded $@ + # Split baserom -$(BUILD_DIR)/SPLAT_TIMESTAMP: $(BASENAME).$(VERSION).yaml $(SYMBOL_ADDRS) | $(BUILD_DIR) +$(BUILD_DIR)/SPLAT_TIMESTAMP: decompressed.$(VERSION).yaml $(SYMBOL_ADDRS) | $(BUILD_DIR) $(call print1,Splitting rom:,$<) @touch $@ - @$(SPLAT) $(BASENAME).$(VERSION).yaml + @$(SPLAT) decompressed.$(VERSION).yaml @touch $(LD_SCRIPT) + sed -i '7s/.*/glabel D_80392D90\n .double 0.99999/' asm/nonmatchings/FP/code_5CC0/func_8038C428.s # Dummy target to make the LD script and overlay rzips depend on splat being run # without causing it to be rerun once for every overlay # Bin files are also dependent on the splat timestamp since they get overwritten on resplit -$(MAIN_NEW_FILES) $(LD_SCRIPT) $(MAIN_BINS) : $(BUILD_DIR)/SPLAT_TIMESTAMP +$(NEW_FILES) $(LD_SCRIPT) $(ALL_BINS) : $(BUILD_DIR)/SPLAT_TIMESTAMP @: # Dummy target to make sure extraction happens before compilation, mainly for extracted asm -$(MAIN_C_SRCS) $(MAIN_ASM_SRCS) : | $(BUILD_DIR)/SPLAT_TIMESTAMP +$(C_SRCS) $(ASM_SRCS) : | $(BUILD_DIR)/SPLAT_TIMESTAMP @: -# .rzip.bin -> .bin -$(OVERLAY_BINS) : $(BUILD_DIR)/%.$(VERSION).bin : $(BIN_ROOT)/%.$(VERSION).rzip.bin $(BK_INFLATE) | $(BUILD_DIR) - $(call print1,Decompressing rzip:,$<) - @$(BK_INFLATE) $< $@ - -# Special rules to handle core2 code checksumming -ifneq ($(CORE2_CODE_CRC_C_OBJS),) - CORE2_TEMP_LD := core2.temp.ld - CORE2_CODE_CRC_C_TEMP_OBJS := $(CORE2_CODE_CRC_C_OBJS:.c.o=.c.o_) - core2_NON_CRC_OBJS := $(filter-out $(CORE2_CODE_CRC_C_OBJS),$(core2_ALL_OBJS)) - - # core2.ld -> core2.temp.ld - $(CORE2_TEMP_LD) : core2.ld - $(call print0,Creating linker script for initial core2 linking step) - @$(CP) $< $@ - $(foreach obj, $(CORE2_CODE_CRC_C_OBJS), sed -i 's:$(obj):$(obj)_:g' $@) - - # core2 .c -> .o with zero for core2 code CRC - $(CORE2_CODE_CRC_C_TEMP_OBJS) : $(BUILD_DIR)/%.c.o_ : %.c | $(C_BUILD_DIRS) - $(call print2,Compiling temp file:,$<,$@) - @$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_CFLAGS) $(OPT_FLAGS) $(MIPSBIT) -o $@ $< - - # core2 objects with zero for code CRC -> core2.temp.elf - $(BUILD_DIR)/core2.temp.elf : $(core2_NON_CRC_OBJS) $(CORE2_TEMP_LD) $(CORE2_CODE_CRC_C_TEMP_OBJS) - $(call print1,Linking elf:,$@) - @$(LD) -T $(CORE2_TEMP_LD) -Map $(BUILD_DIR)/core2.map $(LDFLAGS_COMMON) -T undefined_syms_auto.core2.$(VERSION).txt -T undefined_funcs_auto.core2.$(VERSION).txt -o $@ - - $(BUILD_DIR)/core2.temp.full : $(BUILD_DIR)/core2.temp.elf - @$(OBJCOPY) -I elf32-tradbigmips -O binary $< $@ - - # core2.temp.elf -> core2.temp.code - $(BUILD_DIR)/core2.temp.code : $(BUILD_DIR)/core2.temp.full $(BUILD_DIR)/core2.temp.elf - $(call print2,Converting initial core2 code:,$<,$@) - @head -c $(shell {\ - text_offset=0x$$(nm $(BUILD_DIR)/core2.temp.elf | grep core2_TEXT_START | head -c 8) ;\ - data_offset=0x$$(nm $(BUILD_DIR)/core2.temp.elf | grep core2_DATA_START | head -c 8) ;\ - echo $$(($$data_offset - $$text_offset)) ;\ - }) $< > $@ - - # core2 code -> core2 code crc - $(BUILD_DIR)/core2.code.crc : $(BUILD_DIR)/core2.temp.code $(BK_CRC) - $(call print0,Calculating core2 code CRC) - @$(BK_CRC) -D CORE2_CODE $< > $@ - - # core2 .c -> .o with correct core2 code CRC - $(CORE2_CODE_CRC_C_OBJS) : $(BUILD_DIR)/%.c.o : %.c $(BUILD_DIR)/core2.code.crc | $(C_BUILD_DIRS) - $(call print2,Compiling:,$<,$@) - @$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_CFLAGS) $(OPT_FLAGS) $(MIPSBIT) $(shell cat $(BUILD_DIR)/core2.code.crc) -o $@ $< -endif - -# core2 data -> core2 data CRC -$(BUILD_DIR)/core2.data.crc : $(BUILD_DIR)/core2.data $(BK_CRC) - $(call print0,Calculating core2 data CRC) - @$(BK_CRC) -D CORE2_DATA $< > $@ - -# core1 .c -> .o with correct core2 data CRC -$(CORE2_DATA_CRC_C_OBJS) : $(BUILD_DIR)/%.o : % $(BUILD_DIR)/core2.data.crc | $(C_BUILD_DIRS) - $(call print2,Compiling file with core2 data CRC (with ASM Processor):,$<,$@) - @$(ASM_PROCESSOR) $(OPT_FLAGS) $< > $(BUILD_DIR)/$< - @$(CC) -32 $(CFLAGS) $(CPPFLAGS) $(INCLUDE_CFLAGS) $(OPT_FLAGS) $(MIPSBIT) $(shell cat $(BUILD_DIR)/core2.data.crc) -o $@ $(BUILD_DIR)/$< - @$(ASM_PROCESSOR) $(OPT_FLAGS) $< --post-process $@ \ - --assembler "$(AS) $(ASFLAGS)" --asm-prelude include/prelude.s - -# .elf -> .code -$(OVERLAY_CODE_BINS) : $(BUILD_DIR)/%.code : $(BUILD_DIR)/%.full $(BUILD_DIR)/%.elf - $(call print2,Converting overlay code:,$<,$@) - @head -c $(shell {\ - text_offset=0x$$(nm $(BUILD_DIR)/$*.elf | grep $*_TEXT_START | head -c 8) ;\ - data_offset=0x$$(nm $(BUILD_DIR)/$*.elf | grep $*_DATA_START | sort -r | head -c 8) ;\ - echo $$(($$data_offset - $$text_offset)) ;\ - }) $< > $@ -# @$(OBJCOPY) -I elf32-tradbigmips -O binary --only-section .$*_code --only-section .$*_mips3 $< $@ - -# .elf -> .data -$(OVERLAY_DATA_BINS) : $(BUILD_DIR)/%.data : $(BUILD_DIR)/%.full $(BUILD_DIR)/%.elf - $(call print2,Converting overlay data:,$<,$@) - @tail -c +$(shell {\ - text_offset=0x$$(nm $(BUILD_DIR)/$*.elf | grep $*_TEXT_START | head -c 8) ;\ - data_offset=0x$$(nm $(BUILD_DIR)/$*.elf | grep $*_DATA_START | sort -r | head -c 8) ;\ - echo $$(($$data_offset - $$text_offset + 1)) ;\ - }) $< > $@ -# @$(OBJCOPY) -I elf32-tradbigmips -O binary --only-section .$*_data --only-section .*_data_* $< $@ - -# .elf -> .full -$(BUILD_DIR)/%.full : $(BUILD_DIR)/%.elf - @$(OBJCOPY) -I elf32-tradbigmips -O binary $< $@ - -# .data + .code -> .rzip.bin -$(BUILD_DIR)/%.rzip.bin : $(BUILD_DIR)/%.code $(BUILD_DIR)/%.data $(BK_DEFLATE) - $(call print1,Compressing overlay:,$@) - @cd $(BK_TOOLS) && ../../$(BK_DEFLATE) ../../$@ ../../$(BUILD_DIR)/$*.code ../../$(BUILD_DIR)/$*.data - # .bin -> .yaml $(ASSET_ROOT)/assets.yaml : $(BIN_ROOT)/assets.bin $(BK_ASSET_TOOL) $(call print1,Extracting Assets:,$@) @@ -510,20 +338,21 @@ $(ASSET_OBJS): $(ASSET_BIN) @$(OBJCOPY) $(BINOFLAGS) $< $@ # .o -> .elf (game) -$(ELF): $(MAIN_ALL_OBJS) $(LD_SCRIPT) $(OVERLAY_RZIP_OBJS) $(addprefix $(BUILD_DIR)/, $(addsuffix .full, $(OVERLAYS))) $(ASSET_OBJS) +$(ELF): $(ALL_OBJS) $(LD_SCRIPT) $(ASSET_OBJS) $(call print1,Linking elf:,$@) - @$(LD) $(LDFLAGS) -T undefined_syms_auto.$(VERSION).txt -o $@ + @$(LD) $(LDFLAGS) -T undefined_syms_auto.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T rzip_dummy_addrs.txt -o $@ $(BK_BOOT_LD_SCRIPT): $(LD_SCRIPT) sed 's|$(CRC_OBJS)|$(DUMMY_CRC_OBJ)|' $< > $@ # .o -> .elf (game) -$(BUILD_DIR)/bk_boot.elf: $(DUMMY_CRC_OBJ) $(filter-out $(CRC_OBJS),$(MAIN_ALL_OBJS)) $(BK_BOOT_LD_SCRIPT) $(OVERLAY_RZIP_OBJS) $(addprefix $(BUILD_DIR)/, $(addsuffix .full, $(OVERLAYS))) +$(BUILD_DIR)/bk_boot.elf: $(DUMMY_CRC_OBJ) $(filter-out $(CRC_OBJS),$(MAIN_ALL_OBJS)) $(BK_BOOT_LD_SCRIPT) $(ASSET_OBJS) $(call print1,Linking elf:,$@) - @$(LD) -T $(BK_BOOT_LD_SCRIPT) -Map $(ELF:.elf=.map) --no-check-sections --accept-unknown-input-arch -T undefined_syms.libultra.txt -T undefined_syms_auto.$(VERSION).txt -o $@ + @$(LD) -T $(BK_BOOT_LD_SCRIPT) -Map $(ELF:.elf=.map) --no-check-sections --accept-unknown-input-arch -T undefined_syms.libultra.txt -T undefined_syms_auto.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T rzip_dummy_addrs.txt -o $@ # .elf -> .z64 -$(Z64) : $(ELF) $(OVERLAY_PROG_SVGS) $(MAIN_PROG_SVG) $(TOTAL_PROG_SVG) $(README_MD) +$(Z64) : $(ELF) +#$(OVERLAY_PROG_SVGS) $(MAIN_PROG_SVG) $(TOTAL_PROG_SVG) $(README_MD) $(call print1,Creating z64:,$@) @$(OBJCOPY) $< $@ -O binary $(OCOPYFLAGS) @@ -550,9 +379,6 @@ $(SYMBOL_ADDRS): $(SYMBOL_ADDR_FILES) $(call print0,Combining symbol address files) @$(CAT) symbol_addrs.*.$(VERSION).txt > $@ -# Shorthand rules for each overlay (e.g. SM) -$(OVERLAYS): %: verify-% - clean: $(call print0,Cleaning build artifacts) @$(RM) -rf $(BUILD_ROOT) @@ -564,7 +390,6 @@ clean: @$(RM) -rf $(ASM_ROOT)/core1/os @$(RM) -f undefined_syms_auto* undefined_funcs_auto* @$(RM) -f *.ld - @$(RM) -f $(SYMBOL_ADDRS) # Per-file flag definitions build/$(VERSION)/src/core1/io/%.c.o: OPT_FLAGS = -O1 diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml new file mode 100644 index 00000000..b27db544 --- /dev/null +++ b/decompressed.us.v10.yaml @@ -0,0 +1,2209 @@ +sha1: 1fb13cad402518d3ae9a8dc4b52c5c54b2a4adc7 +options: + basename: banjo + find_file_boundaries: True + compiler: "IDO" + platform: n64 + asm_endlabels: "endlabel" + cpp_args: + - "-Iinclude" + - "-Iinclude/2.0L" + - "-D_LANGUAGE_C" + generated_c_preamble: | + #include + #include "functions.h" + #include "variables.h" + undefined_syms_path: undefined_syms.us.v10.txt + symbol_addrs_path: symbol_addrs.us.v10.txt + undefined_funcs_auto_path: undefined_funcs_auto.us.v10.txt + undefined_syms_auto_path: undefined_syms_auto.us.v10.txt + base_path: . + target_path: decompressed.us.v10.z64 + asset_path: bin + build_path: build/us.v10 +segments: +- name: header + type: header + start: 0x00000000 +- name: boot + type: code + start: 0x0040 + vram: 0xA4000040 + subsegments: + - [0x0040, bin, ipl3] + - [0x0B70, bin, ipl3font] +- name: entry + type: code + start: 0x1000 + vram: 0x80000400 + subsegments: + - [0x1000, hasm, entry] +- name: boot/bk_boot + type: code + start: 0x1050 + vram: 0x80000450 + subsegments: + - [0x1050, c, done/bk_boot_1050] + - [0x1150, c, done/rarezip] + - [0x12B0, c, done/inflate] + - [0x27F0, c, done/overlays] + - [0x2970, c, done/initialize] + - [0x2C00, c, done/pirawdma] + - [0x2CE0, c, done/pigetstat] + - [0x2CF0, hasm, bzero] + - [0x2D90, hasm, setsr] + - [0x2DA0, hasm, getsr] + - [0x2DB0, hasm, setfpccsr] + - [0x2DC0, c, done/sirawread] + - [0x2E10, c, done/sirawwrite] + - [0x2E60, hasm, ultra/exceptasm] + - [0x3770, hasm, writebackdcache] + - [0x37F0, hasm, invalicache] + - [0x3870, hasm, maptlbrdb] + - [0x38D0, c, done/pirawread] + - [0x3930, c, done/ll] + - [0x3BF0, bin, padding3BF0] # Empty space + - [0x3C50, c, done/virtualtophysical] + - [0x3CD0, c, done/si] + - [0x3D00, c, done/thread] + - [0x3D40, c, done/leointerrupt] + - [0x45C0, c, done/seteventmesg] + - [0x4630, hasm, ultra/setintmask] + - [0x46D0, c, done/destroythread] + - [0x47D0, hasm, probetlb] + - [0x4890, c, done/leodiskinit] + - [0x4990, c, done/epirawdma] + - [0x4BC0, hasm, interrupt] + - [0x4C00, c, done/pimgr] + - [0x4D90, c, done/cartrominit] + - [0x4E90, c, done/createmesgqueue] + - [0x4EC0, c, done/piacs] + - [0x4F80, c, done/getthreadpri] + - [0x4FA0, c, done/setthreadpri] + - [0x5080, c, done/createthread] + - [0x51D0, c, done/devmgr] + - [0x5660, c, done/startthread] + - [0x57B0, c, done/sendmesg] + - [0x5900, c, done/recvmesg] + - [0x5A40, c, done/resetglobalintmask] + - [0x5AA0, c, done/epirawwrite] + - [0x5AF0, c, done/epirawread] + - [0x5B40, c, done/setglobalintmask] + - [0x5B90, c, done/yieldthread] + - [0x5BE0, c, done/kdebugserver] + - [0x5BE0, .data, done/inflate] + - [0x5CE0, .data, done/initialize] + - [0x5D00, .data, ultra/exceptasm] + - [0x5D20, .data, done/thread] + - [0x5D40, .data, done/pimgr] + - [0x5D70, .data, done/piacs] + - [0x5D80, .rodata, ultra/exceptasm] + - [0x5DD0, .rodata, ultra/setintmask] + - [0x5E50, .rodata, done/devmgr] + - [0x5E70, .bss, done/bk_boot_1050] + - [0x5E70, .bss, done/rarezip] + - [0x5E70, .bss, done/inflate] + - [0x5E70, .bss, done/initialize] + - [0x5E70, .bss, done/kdebugserver] + - [0x5E70, .bss, done/leointerrupt] + - [0x5E70, .bss, done/seteventmesg] + - [0x5E70, .bss, done/leodiskinit] + - [0x5E70, .bss, done/pimgr] + - [0x5E70, .bss, done/cartrominit] + - [0x5E70, .bss, done/piacs] +- name: crc + type: bin + start: 0x5E70 + align: 16 + subsegments: + - [0x5E70, bin, crc] +- name: assets + type: bin + start: 0x5E90 + subsegments: + - [0x5E90, bin, assets] +- name: soundfont1 + type: bin + start: 0xD846C0 + subsegments: + - [0xD846C0, bin, soundfont1.ctl] + - [0xD954B0, bin, soundfont1.tbl] +- name: soundfont2 + type: bin + start: 0xEA3EB0 + subsegments: + - [0xEA3EB0, bin, soundfont2.ctl] + - [0xEADE60, bin, soundfont2.tbl] +- name: core1 + dir: core1 + type: code + start: 0x00F19250 + vram: 0x8023DA20 # via https://hack64.net/wiki/doku.php?id=player_kazooie:ram_map + subalign: 4 + subsegments: + - [0xF19250, c, code_0] + - [0xF198B0, c, code_660] #DONE + - [0xF19A10, c, inflate] #DONE + - [0xF1AF50, c, code_1D00] + - [0xF1BE20, c, code_2BD0] + - [0xF1BFF0, c, code_2DA0] #DONE + - [0xF1C1F0, c, code_2FA0] #DONE + - [0xF1C410, c, code_31C0] #DONE + - [0xF1C4A0, c, code_3250] #DONE + - [0xF1CCC0, c, code_3A70] + - [0xF1E8A0, c, code_5650] + - [0xF202E0, c, code_7090] #DONE + - [0xF20500, c, code_72B0] #DONE + - [0xF211B0, c, code_7F60] + - [0xF21EA0, c, code_8C50] #DONE + - [0xF22F80, c, code_9D30] + - [0xF260B0, c, done/code_CE60] #DONE + - [0xF275B0, c, code_E360] #DONE + - [0xF27D40, c, code_EAF0] + - [0xF29C50, c,code_10A00] + - [0xF2AD10, c, code_11AC0] + - [0xF2C160, c, code_12F10] #DONE + - [0xF2C890, c, code_13640] #DONE + - [0xF2C8D0, c, code_13680] + - [0xF2C920, c, code_136D0] + - [0xF2CBE0, c, code_13990] + - [0xF2E840, hasm, code_155F0] #DONE + - [0xF2E880, c, code_15630] #DONE + - [0xF2E9C0, c, code_15770] + - [0xF2ED80, c, code_15B30] #DONE + - [0xF2FCA0, c, memory] + - [0xF31360, c, code_18110] #DONE + - [0xF31460, c, code_18210] #DONE + - [0xF31560, c, code_18310] #DONE + - [0xF315A0, c, code_18350] #DONE + - [0xF350E0, c, code_1BE90] #DONE + - [0xF367E0, c, done/code_1D590] #DONE + - [0xF36810, hasm, code_1D5C0] #DONE + - [0xF36820, c, code_1D5D0] #DONE + - [0xF375B0, c, done/code_1E360] #DONE + - [0xF37930, c, code_1E6E0] #DONE + - [0xF37A70, c, code_1E820] + - [0xF37B10, c, done/audio/n_sl] #DONE + - [0xF37BA0, c, done/audio/n_synthesizer] #DONE + - [0xF38580, c, done/audio/event] #DONE + - [0xF38860, c, done/audio/n_synaddplayer] #DONE + - [0xF38A30, c, done/audio/n_synallocvoice] #DONE + - [0xF38C30, c, done/audio/n_synsetvol] #DONE + - [0xF38CD0, c, done/audio/n_synstartvoice] #DONE + - [0xF38D50, c, done/audio/n_synsetpan] #DONE + - [0xF38DD0, c, done/audio/n_synsetpitch] #DONE + - [0xF38E50, c, done/audio/n_synsetfxmix] #DONE + - [0xF38EE0, c, done/audio/n_synstopvoice] #DONE + - [0xF38F50, c, done/audio/n_synfreevoice] #DONE + - [0xF38FF0, c, audio/n_csplayer] + - [0xF3A460, c, done/audio/cspsetbank] #DONE + - [0xF3A4A0, c, done/audio/cspstop] #DONE + - [0xF3A4D0, c, done/audio/n_csq] #DONE + - [0xF3AB70, c, done/audio/cspsetseq] #DONE + - [0xF3ABB0, c, done/audio/cspplay] #DONE + - [0xF3ABE0, c, done/audio/cspsetvol] #DONE + - [0xF3AC20, c, done/audio/code_219D0] #DONE + - [0xF3AC60, c, done/audio/cspsettempo] #DONE + - [0xF3ACD0, c, done/audio/code_21A80] #DONE + - [0xF3AD00, c, done/audio/cspgettempo] #DONE + - [0xF3AD40, c, done/audio/code_21AF0] #DONE + - [0xF3ADA0, c, done/audio/code_21B50] #DONE + - [0xF3AE40, c, done/audio/n_syndelete] #DONE + - [0xF3AEA0, c, done/audio/n_synallocfx] #DONE + - [0xF3AF00, c, done/audio/n_reverb] #DONE + - [0xF3B990, c, done/audio/n_auxbus] #DONE + - [0xF3BA40, c, done/audio/n_drvrNew] #DONE + - [0xF3BFA0, c, done/audio/n_save] #DONE + - [0xF3BFF0, c, done/audio/n_envresample] #DONE + - [0xF3C090, c, done/audio/n_env] #DONE + - [0xF3CA40, c, done/audio/n_seqplayer] #DONE + - [0xF3E5B0, c, done/audio/n_synstartvoiceparam] #DONE + - [0xF3E690, c, done/audio/n_mainbus] #DONE + - [0xF3E710, c, done/audio/n_load] #DONE + - [0xF3E8D0, c, audio/n_adpcm] + - [0xF3EE90, c, done/audio/n_resample] #DONE + - [0xF3F070, c, done/audio/n_seq] #DONE + - [0xF3F360, c, done/audio/n_synsetpriority] #DONE + - [0xF3F370, asm, os/invaldcache] #DONE + - [0xF3F410, asm, os/writebackdcacheall] #DONE + - [0xF3F440, c, os/initialize] #DONE + - [0xF3F6D0, c, done/os/createthread] #DONE + - [0xF3F820, c, done/gu/sinf] #DONE + - [0xF3F9E0, c, done/audio/cents2ratio] #DONE + - [0xF3FA30, c, done/audio/heapinit] #DONE + - [0xF3FA70, asm, padding] # 0x60 bytes of zeroes? + - [0xF3FAD0, c, done/os/createmesgqueue] #DONE + - [0xF3FB00, c, done/io/aisetfreq] #DONE + - [0xF3FC60, c, done/audio/sl] #DONE + - [0xF3FD20, c, done/audio/heapalloc] #DONE + - [0xF3FD80, c, done/os/recvmesg] #DONE + - [0xF3FEC0, c, done/io/aigetlen] #DONE + - [0xF3FED0, c, done/os/virtualtophysical] #DONE + - [0xF3FF50, c, done/io/aisetnextbuf] #DONE + - [0xF40000, c, done/os/pidma] #DONE + - [0xF40110, c, done/os/stopthread] #DONE + - [0xF401D0, c, done/os/startthread] #DONE + - [0xF40320, hasm, os/writebackdcache] #DONE + - [0xF403A0, hasm, invaldcache] #DONE + - [0xF40450, c, done/io/pimgr] #DONE + - [0xF405E0, c, done/os/destroythread] #DONE + - [0xF406E0, c, done/os/sendmesg] #DONE + - [0xF40830, c, done/os/settreadpri] #DONE + - [0xF40910, c, done/gu/mtxutil] #DONE + - [0xF40B80, c, done/gu/sqrtf] #DONE + - [0xF40B90, c, gu/cosf] + - [0xF40D00, hasm, ultra/setintmask] #DONE + - [0xF40DA0, c, done/io/dpsetstat] #DONE + - [0xF40DB0, c, done/io/sptask] #DONE + - [0xF410A0, c, done/io/dpgetstat] #DONE + - [0xF410A0, c, done/io/vigetcurrframebuf] #DONE + - [0xF410F0, c, done/os/stoptimer] #DONE + - [0xF411E0, c, done/os/settimer] #DONE + - [0xF412C0, c, done/ll] #DONE + - [0xF41580, c, done/io/sptaskyielded] #DONE + - [0xF41600, c, done/io/sptaskyield] #DONE + - [0xF41620, c, done/io/visetmode] #DONE + - [0xF41690, c, done/os/seteventmesg] #DONE + - [0xF41700, c, done/io/vimgr] #DONE + - [0xF41A60, c, done/io/visetspecial] #DONE + - [0xF41C20, c, done/io/viswapbuf] #DONE + - [0xF41C70, c, done/io/visetevent] #DONE + - [0xF41CE0, c, done/io/vigetnextframebuf] #DONE + - [0xF41D20, c, done/io/viblack] #DONE + - [0xF41D90, c, done/gu/ortho] #DONE + - [0xF41F50, c, done/gu/translate] #DONE + - [0xF41FF0, c, done/gu/rotate] + - [0xF421E0, c, done/io/contreaddata] #DONE + - [0xF42440, c, done/io/controller] #DONE + - [0xF42800, c, done/io/contsetch] #DONE + - [0xF42870, c, done/audio/bnkf] #DONE + - [0xF42AC0, c, done/os/gettime] #DONE + - [0xF42B50, c, done/audio/cseq] #DONE + - [0xF43610, c, done/io/motor] #DONE + - [0xF43C30, c, done/io/pfsinit] #DONE + - [0xF43CF0, hasm, invalicache] #DONE + - [0xF43D70, c, done/io/conteeplongwrite] #DONE + - [0xF43EA0, c, done/io/conteeplongread] #DONE + - [0xF43F30, c, done/io/piread] #DONE + - [0xF43F70, c, done/audio/copy] #DONE + - [0xF43FF0, c, done/audio/drvrNew] #DONE + - [0xF44790, c, done/audio/reverb] #DONE + - [0xF453E0, c, done/syncprintf] #DONE + - [0xF45420, c, done/audio/seq] #DONE + - [0xF45A40, hasm, setsr] #DONE + - [0xF45A50, hasm, getsr] #DONE + - [0xF45A60, hasm, setfpccsr] #DONE + - [0xF45A70, c, done/io/sirawread] #DONE + - [0xF45AC0, c, done/io/sirawwrite] #DONE + - [0xF45B10, hasm, exceptasm] #DONE + - [0xF46480, c, done/io/pirawread] #DONE + - [0xF464E0, hasm, interrupt] #DONE + - [0xF46520, c, done/os/thread] #DONE + - [0xF46560, c, done/audio/synthesizer] #DONE + - [0xF46C40, c, done/audio/syndelete] #DONE + - [0xF46C50, hasm, probetlb] #DONE + - [0xF46D10, c, done/io/ai] #DONE + - [0xF46D40, c, done/os/jammesg] #DONE + - [0xF46E90, c, done/io/pigetcmdq] #DONE + - [0xF46EC0, c, done/io/cartrominit] #DONE + - [0xF46FC0, c, done/io/leodiskinit] #DONE + - [0xF470C0, c, done/io/piacs] #DONE + - [0xF47180, c, done/os/getthreadpri] #DONE + - [0xF471A0, c, done/io/pirawdma] #DONE + - [0xF47280, c, done/io/epirawdma] #DONE + - [0xF474B0, c, done/io/devmgr] #DONE + - [0xF47940, hasm, bcopy] #DONE + - [0xF47C50, c, done/io/spsetstat] #DONE + - [0xF47C60, c, done/io/spsetpc] #DONE + - [0xF47CA0, c, done/io/sprawdma] #DONE + - [0xF47D30, c, done/io/sp] #DONE + - [0xF47D60, c, done/io/vi] #DONE + - [0xF47EA0, c, done/os/timerintr] #DONE + - [0xF482A0, hasm, setcompare] #DONE + - [0xF482B0, c, done/io/spgetstat] #DONE + - [0xF482C0, c, done/io/vigetcurrcontext] #DONE + - [0xF482D0, c, done/io/viswapcontext] #DONE + - [0xF48630, hasm, getcount] #DONE + - [0xF48640, c, done/gu/normalize] #DONE + - [0xF486D0, c, done/io/siacs] #DONE + - [0xF48790, c, done/io/sirawdma] #DONE + - [0xF48840, c, done/io/pfsisplug] #DONE + - [0xF48BB0, c, done/io/crc] #DONE + - [0xF48D30, c, done/io/contramwrite] #DONE + - [0xF490B0, c, done/io/contramread] #DONE + - [0xF49440, c, done/io/pfsgetstatus] #DONE + - [0xF49550, c, done/io/contpfs] #DONE + - [0xF4A2B0, c, done/io/pfschecker] #DONE + - [0xF4AD10, c, done/io/conteepwrite] #DONE + - [0xF4B260, c, done/io/conteepread] #DONE + - [0xF4B5C0, c, done/audio/filter] #DONE + - [0xF4B5E0, c, done/audio/env] #DONE + - [0xF4C160, c, done/audio/load] #DONE + - [0xF4CCB0, c, done/audio/resample] #DONE + - [0xF4CFB0, c, done/audio/auxbus] #DONE + - [0xF4D0C0, c, done/audio/mainbus] #DONE + - [0xF4D210, c, done/audio/save] #DONE + - [0xF4D2D0, c, done/io/si] #DONE + - [0xF4D300, c, done/io/leointerrupt] #DONE + - [0xF4DB80, c, done/audio/synallocfx] #DONE + - [0xF4DC20, c, done/os/resetglobalintmask] #DONE + - [0xF4DC80, c, done/io/epirawwrite] #DONE + - [0xF4DCD0, c, done/io/epirawread] #DONE + - [0xF4DD20, c, done/os/setglobalintmask] #DONE + - [0xF4DD70, c, done/os/yieldthread] #DONE + - [0xF4DDC0, bin, n_aspMain_text] + - [0xF4EA20, bin, gSPF3DEX_fifo_text] + - [0xF4FE50, bin, gSPL3DEX_fifo_text] + - [0xF50E40, linker_offset, DATA_START] #data Section + - [0xF50E40, bin, data_37BF0] #data Section + - [0xF50EA0, .data, code_660] + - [0xF50FA0, .data, code_1D00] + - [0xF51080, bin, data_37E30] #data Section + - [0xF51090, .data, code_2FA0] + - [0xF510A0, .data, code_3250] + - [0xF510B0, .data, code_3A70] + - [0xF510F0, bin, data_37EA0] # .data, code_5650] + - [0xF51110, bin, data_37EC0] + - [0xF51140, .data, code_8C50] + - [0xF51280, bin, data_38030] + - [0xF51440, bin, data_381F0] # .data, done/code_CE60] + - [0xF514B0, bin, data_38260] + - [0xF51570, .data, code_11AC0] + - [0xF51B00, .data, code_136D0] + - [0xF51DA0, bin, data_38B50] + - [0xF51DF0, .data, code_18310] + - [0xF524E0, bin, data_39290] + - [0xF526C0, .data, done/audio/n_drvrNew] + - [0xF52850, .data, done/audio/n_env] + - [0xF52950, .data, os/initialize] + - [0xF52970, .data, done/audio/sl] + - [0xF52980, .data, done/io/aisetnextbuf] + - [0xF52990, .data, done/io/pimgr] + - [0xF529C0, .data, done/io/vimgr] + - [0xF529E0, .data, done/io/controller] + - [0xF529F0, .data, done/audio/drvrNew] + - [0xF52B80, bin, data_39930] # .data, ultra/exceptasm] + - [0xF52BA0, .data, done/os/thread] + - [0xF52BC0, .data, done/io/piacs] + - [0xF52BD0, .data, done/io/vi] + - [0xF52C40, .data, done/os/timerintr] + - [0xF52C50, .data, done/io/siacs] + - [0xF52C60, .data, done/audio/env] + - [0xF52D60, .data, done/io/vimodepallan1] + - [0xF52DB0, .data, done/io/vimodempallan1] + - [0xF52DB0, .data, done/io/vimodentsclan1] + - [0xF52E50, bin, data_39C00] # .rodata, code_1D00] + - [0xF52E70, .rodata, code_3250] + - [0xF52E80, bin, data_39C30] # .rodata, code_3A70] + - [0xF52E90, .rodata, code_5650] + - [0xF52EF0, .rodata, code_72B0] + - [0xF52F10, .rodata, code_7F60] + - [0xF52F30, bin, data_39CE0] # .rodata, code_9D30] + - [0xF52F50, .rodata, done/code_CE60] + - [0xF53220, .rodata, code_EAF0] + - [0xF532A0, .rodata, code_10A00] + - [0xF539B0, .rodata, code_11AC0] + - [0xF539C0, bin, data_3A770] + - [0xF539D0, .rodata, code_136D0] + - [0xF53A50, bin, data_3A800] # .rodata, code_13990] + - [0xF53A70, .rodata, code_18350] + - [0xF53B70, .rodata, code_1BE90] + - [0xF53BA0, .rodata, code_1D5D0] + - [0xF53C00, .rodata, done/audio/n_synthesizer] + - [0xF53C10, bin, data_3A9C0] # .rodata, audio/n_csplayer] + - [0xF53F80, .rodata, done/audio/n_reverb] + - [0xF53FB0, .rodata, done/audio/n_drvrNew] + - [0xF53FD0, .rodata, done/audio/n_env] + - [0xF54020, .rodata, done/audio/n_seqplayer] + - [0xF543D0, .rodata, done/audio/n_resample] + - [0xF543E0, .rodata, done/gu/sinf] + - [0xF54430, .rodata, done/audio/cents2ratio] + - [0xF54440, bin, data_3B1F0] # .rodata, ultra/setintmask] # splat bug preventing this from linking correctly + - [0xF54510, .rodata, done/gu/rotate] # need to resolve .data section first + - [0xF54520, .rodata, done/audio/cseq] + - [0xF54530, .rodata, done/audio/drvrNew] + - [0xF54550, .rodata, done/audio/reverb] + - [0xF54580, .rodata, done/audio/seq] + - [0xF54590, bin, data_3B340] # .rodata, ultra/exceptasm] + - [0xF545E0, hasm, ultra/libm_vals] # Nothing in this file, just here so splat sees it's ASM + - [0xF545E0, .rodata, ultra/libm_vals] + - [0xF545F0, .rodata, done/audio/synthesizer] + - [0xF54600, .rodata, done/io/devmgr] + - [0xF54620, .rodata, done/audio/env] + - [0xF54670, .rodata, done/audio/resample] + - [0xF546B0, bin, n_aspMain_data] + - [0xF54960, bin, gSPF3DEX_fifo_data] + - [0xF55160, bin, gSPL3DEX_fifo_data] + - [0xF55960, .bss, code_0] + - [0xF55960, .bss, code_660] + - [0xF55960, .bss, inflate] + - [0xF55960, .bss, code_1D00] + - [0xF55960, .bss, code_2BD0] + - [0xF55960, .bss, code_2DA0] + - [0xF55960, .bss, code_31C0] + - [0xF55960, .bss, code_5650] + - [0xF55960, .bss, code_7090] + - [0xF55960, .bss, code_72B0] + - [0xF55960, .bss, code_8C50] + - [0xF55960, .bss, code_9D30] + - [0xF55960, .bss, done/code_CE60] + - [0xF55960, .bss, code_E360] + - [0xF55960, .bss, code_EAF0] + - [0xF55960, .bss, code_10A00] + - [0xF55960, .bss, code_11AC0] + - [0xF55960, .bss, code_12F10] + - [0xF55960, .bss, code_13640] + - [0xF55960, .bss, code_136D0] + - [0xF55960, .bss, code_13990] + - [0xF55960, .bss, code_15770] + - [0xF55960, .bss, code_15B30] + - [0xF55960, .bss, memory] + - [0xF55960, .bss, code_18210] + - [0xF55960, .bss, code_1D5D0] + - [0xF55960, .bss, done/code_1E360] + - [0xF55960, .bss, os/initialize] + - [0xF55960, .bss, done/io/pimgr] + - [0xF55960, .bss, done/io/sptask] + - [0xF55960, .bss, done/os/seteventmesg] + - [0xF55960, .bss, done/io/vimgr] + - [0xF55960, .bss, done/gu/rotate] +- name: core2 + dir: core2 + type: code + start: 0x00F55960 + vram: 0x80286F90 # via https://hack64.net/wiki/doku.php?id=player_kazooie:ram_map + subsegments: + - [0xF55960, c, animctrl] #DONE + - [0xF56430, c, code_AD0] #DONE + - [0xF56A40, c, code_10E0] #DONE + - [0xF56EB0, c, code_1550] #DONE + - [0xF57290, c, code_1930] + - [0xF57BA0, c, code_2240] #DONE + - [0xF581F0, c, code_2890] #DONE + - [0xF58DE0, c, code_3480] #DONE + - [0xF59330, c, code_39D0] #DONE + - [0xF5A120, c, code_47C0] #DONE + - [0xF5C490, c, code_6B30] #DONE + - [0xF5C9C0, c, code_7060] #DONE + - [0xF5E700, c, code_8DA0] #DONE + - [0xF5EA40, c, code_90E0] #DONE + - [0xF5EBF0, c, code_9290] #DONE + - [0xF5EDB0, c, code_9450] #DONE + - [0xF5F260, c, code_9900] #DONE + - [0xF5F530, c, code_9BD0] #DONE + - [0xF5FF60, c, code_A600] #DONE + - [0xF60040, c, code_A6E0] #DONE + - [0xF602C0, c, code_A960] #DONE + - [0xF603C0, c, code_AA60] #DONE + - [0xF60FB0, c, code_B650] #DONE + - [0xF611B0, c, code_B850] #DONE + - [0xF614B0, c, code_BB50] #DONE + - [0xF61680, c, code_BD20] #DONE + - [0xF61A40, c, code_C0E0] #DONE + - [0xF61D50, c, code_C3F0] #DONE + - [0xF61E10, c, code_C4B0] + - [0xF63160, c, code_D800] #DONE + - [0xF63310, c, code_D9B0] #DONE + - [0xF638D0, c, code_DF70] #DONE + - [0xF63D70, c, code_E410] #DONE + - [0xF63FE0, c, code_E680] #DONE + - [0xF64270, c, code_E910] #DONE + - [0xF647A0, c, code_EE40] #DONE + - [0xF648B0, c, code_EF50] #DONE + - [0xF656C0, c, code_FD60] #DONE + - [0xF66630, c, code_10CD0] #DONE + - [0xF66700, c, pitch] #DONE + - [0xF669A0, c, code_11040] #DONE + - [0xF66BB0, c, done/climb] #DONE + - [0xF66DC0, c, code_11460] #DONE + - [0xF66FC0, c, code_11660] #DONE + - [0xF67130, c, code_117D0] #DONE + - [0xF671D0, c, code_11870] #DONE + - [0xF674A0, c, roll] #DONE + - [0xF67740, c, yaw] #DONE + - [0xF67CC0, c, code_12360] #DONE + - [0xF68020, c, code_126C0] #DONE + - [0xF68890, c, code_12F30] + - [0xF68FD0, c, bsList] #DONE + - [0xF690E0, c, code_13780] #DONE + - [0xF69260, c, code_13900] #DONE + - [0xF69360, c, code_13A00] #DONE + - [0xF69920, c, code_13FC0] #DONE + - [0xF69D80, c, code_14420] #DONE + - [0xF6B880, c, code_15F20] #DONE + - [0xF6B970, c, code_16010] #DONE + - [0xF6C5C0, c, code_16C60] #DONE + - [0xF6CB50, c, code_171F0] #DONE + - [0xF6CDB0, c, bs/ant] #DONE + - [0xF6DEB0, c, bs/bBarge] #DONE + - [0xF6E4F0, c, bs/bbuster] #DONE + - [0xF6EC90, c, bs/bee] #DONE + - [0xF6EEC0, c, bs/beeFly] #DONE + - [0xF6F960, c, bs/beeMain] #DONE + - [0xF70B40, c, bs/bEggAss] #DONE + - [0xF70DB0, c, bs/bEggHead] #DONE + - [0xF71060, c, bs/bFlap] #DONE + - [0xF71730, c, bs/bFlip] #DONE + - [0xF71D20, c, bs/bFly] #DONE + - [0xF73BA0, c, bs/bLongLeg] #DONE + - [0xF74EE0, c, bs/bPeck] #DONE + - [0xF75380, c, bs/bShock] #DONE + - [0xF75B10, c, bs/bSwim] #DONE + - [0xF77190, c, bs/bTrot] #DONE + - [0xF78DD0, c, bs/bWhirl] #DONE + - [0xF79850, c, bs/carry] #DONE + - [0xF79C50, c, bs/claw] #DONE + - [0xF79F90, c, bs/climb] #DONE + - [0xF7A790, c, bs/croc] #DONE + - [0xF7C0A0, c, bs/crouch] #DONE + - [0xF7C7D0, c, bs/die] #DONE + - [0xF7CD40, c, bs/drone] #DONE + - [0xF7CEB0, c, code_27550] #DONE #drone_enter??? + - [0xF7D530, c, bs/dronegoto] #DONE + - [0xF7D8A0, c, code_27F40] #DONE #dronelook??? + - [0xF7DB80, c, code_28220] #DONE #dronevanish??? + - [0xF7E170, c, bs/dronexform] #DONE + - [0xF7F430, c, bs/jig] #DONE + - [0xF7FAD0, c, bs/jump] #DONE + - [0xF809A0, c, bs/ow] #DONE + - [0xF80BA0, c, bs/pumpkin] #DONE + - [0xF81FA0, c, bs/rebound] #DONE + - [0xF82420, c, bs/rest] #DONE + - [0xF828F0, c, bs/sled] #DONE + - [0xF82AA0, c, bs/slide] #DONE + - [0xF82F40, c, bs/splat] #DONE + - [0xF83240, c, bs/stand] #DONE + - [0xF83E50, c, bs/swim] #DONE + - [0xF849A0, c, bs/surf] #DONE + - [0xF84B00, c, done/bs/talk] #DONE + - [0xF84C40, c, bs/timeout] #DONE + - [0xF84F10, c, bs/throw] #DONE + - [0xF85130, c, bs/turn] #DONE + - [0xF85410, c, bs/twirl] #DONE + - [0xF856D0, c, bs/walk] #DONE + - [0xF867D0, c, bs/walrus] #DONE + - [0xF88350, c, bs/washy] #DONE + - [0xF88710, c, code_32DB0] #DONE + - [0xF88BB0, c, code_33250] #DONE + - [0xF88BB0, c, code_33310] #DONE + - [0xF89050, c, code_336F0] #DONE + - [0xF89410, c, code_33AB0] #DONE + - [0xF89590, c, code_33C30] #DONE + - [0xF896A0, c, code_33D40] #DONE + - [0xF898F0, c, code_33F90] #DONE + - [0xF89C70, c, code_34310] #DONE + - [0xF8A0F0, c, code_34790] + - [0xF8AE80, c, code_35520] #DONE + - [0xF8B010, c, code_356B0] #DONE + - [0xF8D310, c, code_379B0] + - [0xF8D630, c, code_37CD0] #DONE + - [0xF8D7B0, c, code_37E50] #DONE + - [0xF8DAB0, c, code_38150] #DONE + - [0xF8DC40, c, code_382E0] #DONE + - [0xF8DDC0, c, code_38460] #DONE + - [0xF8DF90, c, code_38630] #DONE + - [0xF8E240, c, code_388E0] #DONE + - [0xF8E430, c, code_38AD0] #DONE + - [0xF8E8A0, c, code_38F40] #DONE + - [0xF8EAF0, c, code_39190] #DONE + - [0xF8F010, c, code_396B0] #DONE + - [0xF8F370, c, code_39A10] #DONE + - [0xF8F850, c, code_39EF0] #DONE + - [0xF90770, c, code_3AE10] #DONE + - [0xF90C20, c, done/code_3B2C0] #DONE + - [0xF90F20, c, code_3B5C0] #DONE + - [0xF914E0, c, code_3BB80] #DONE + - [0xF92D30, c, ch/gameSelect] #DONE + - [0xF94430, c, code_3EAD0] #DONE + - [0xF94590, c, code_3EC30] #DONE + - [0xF94640, c, code_3ECE0] #DONE + - [0xF94850, c, ch/bigbutt] #DONE + - [0xF95A50, c, code_400F0] #DONE + - [0xF96400, c, ch/jiggy] #DONE + - [0xF96A90, c, ch/jigsawdance] #DONE + - [0xF96DC0, c, code_41460] #DONE + - [0xF97890, c, code_41F30] #DONE + - [0xF97910, c, code_41FB0] #DONE + - [0xF98600, c, ch/musicnote] #DONE + - [0xF98610, c, code_42CB0] #DONE + - [0xF98BB0, c, code_43250] #DONE + - [0xF98CF0, c, ch/trainers] #DONE + - [0xF99160, c, code_43800] #DONE + - [0xF993A0, c, code_43A40] #DONE + - [0xF99630, c, mapspecificflags] #DONE + - [0xF99A10, c, code_440B0] #DONE + - [0xF9AC70, c, code_45310] #DONE + - [0xF9C240, c, ch/code_468E0] #DONE + - [0xF9C520, c, ch/jinjo] + - [0xF9D1B0, c, ch/beehive] #DONE + - [0xF9D530, c, code_47BD0] #DONE + - [0xF9EED0, c, ch/soundsource] #DONE + - [0xF9F3D0, c, code_49A70] #DONE + - [0xF9FD80, c, ch/gloop] #DONE + - [0xFA0050, c, code_4A6F0] #DONE + - [0xFA16D0, c, code_4BD70] #DONE + - [0xFA1770, c, code_4BE10] #DONE + - [0xFA1980, c, code_4C020] #DONE + - [0xFA54E0, c, ch/wadingboots] #DONE + - [0xFA5870, c, ch/badShad] #DONE + - [0xFA5DF0, c, code_50490] #DONE + - [0xFA60B0, c, ch/climbBase] #DONE + - [0xFA6330, c, code_509D0] #DONE + - [0xFA7100, c, code_517A0] #DONE + - [0xFA72B0, c, code_51950] #DONE + - [0xFA75F0, c, code_51C90] #DONE + - [0xFA7BF0, c, ch/mole] #DONE + - [0xFA8F30, c, ch/molehill] #DONE + - [0xFA9370, c, code_53A10] #DONE + - [0xFA9570, c, code_53C10] #DONE + - [0xFAA6B0, c, code_54D50] #DONE + - [0xFAAAE0, c, code_55180] #DONE + - [0xFAACF0, c, code_55390] #DONE + - [0xFAB020, c, code_556C0] #DONE + - [0xFAB1B0, c, code_55850] #DONE + - [0xFAB3F0, c, code_55A90] #DONE + - [0xFAB520, c, code_55BC0] #DONE + - [0xFAB780, c, code_55E70] #DONE + - [0xFABA50, c, code_560F0] #DONE + - [0xFAD5D0, c, code_57C70] #DONE + - [0xFADB30, c, code_581D0] #DONE + - [0xFADE30, c, code_584D0] #DONE + - [0xFAF0E0, c, code_59780] #DONE + - [0xFAF340, c, code_599E0] #DONE + - [0xFAF3E0, c, code_59A80] #DONE + - [0xFAF6A0, c, code_59D40] #DONE + - [0xFB0490, c, ch/code_5AB30] #DONE + - [0xFB1000, c, code_5B6A0] #DONE + - [0xFB16F0, c, code_5BD90] #DONE + - [0xFB1810, c, code_5BEB0] + - [0xFB1BA0, c, code_5C240] #DONE + - [0xFB21D0, c, code_5C870] #DONE + - [0xFB3520, c, code_5DBC0] + - [0xFB5460, c, code_5FB00] #DONE + - [0xFB56E0, c, code_5FD80] #DONE + - [0xFB56F0, c, code_5FD90] + - [0xFB8930, c, code_62FD0] #DONE + - [0xFB8A30, c, code_630D0] #DONE + - [0xFB8D70, c, code_63410] #DONE + - [0xFB8FF0, c, code_63690] #DONE + - [0xFB9130, c, code_637D0] + - [0xFBAE20, c, code_654C0] #DONE + - [0xFBBDF0, c, code_66490] #DONE + - [0xFBBFF0, c, vla] #DONE + - [0xFBC410, c, sla] + - [0xFBC6F0, c, code_66D90] #DONE + - [0xFBC910, c, code_66FB0] #DONE + - [0xFBCDF0, c, gc/bound] #DONE + - [0xFBCFB0, c, code_67650] #DONE + - [0xFBD300, c, code_679A0] + - [0xFBF8C0, c, code_69F60] #DONE + - [0xFBFE10, c, code_6A4B0] + - [0xFC0850, c, code_6AEF0] #DONE + - [0xFC0990, c, code_6B030] #DONE + - [0xFC1D40, c, code_6C3E0] #DONE + - [0xFC2680, c, code_6CD20] #DONE + - [0xFC2820, c, code_6CEC0] #DONE + - [0xFC2990, c, code_6D030] #DONE + - [0xFC2BD0, c, code_6D270] #DONE + - [0xFC2DF0, c, code_6D490] #DONE + - [0xFC3390, c, code_6DA30] + - [0xFC6590, c, code_70C30] #DONE + - [0xFC6880, c, code_70F20] #DONE + - [0xFC7180, c, code_71820] #DONE + - [0xFC79C0, c, code_72060] + - [0xFC8470, c, code_72B10] + - [0xFC8FA0, c, code_73640] #DONE + - [0xFC99F0, c, code_74090] #DONE + - [0xFC9BF0, c, code_74290] #DONE + - [0xFC9D80, c, code_74420] #DONE + - [0xFCA270, c, code_74910] #DONE + - [0xFCA830, c, code_74ED0] #DONE + - [0xFCADE0, c, code_75480] #DONE + - [0xFCB290, c, code_75930] #DONE + - [0xFCB7F0, c, code_75E90] #DONE + - [0xFCBCF0, c, code_76390] #DONE + - [0xFCBD30, c, code_763D0] #DONE + - [0xFCC6F0, c, code_76D90] + - [0xFCD7B0, c, code_77E50] #DONE + - [0xFCDA60, c, code_78100] + - [0xFCE7B0, c, code_78E50] + - [0xFCF190, c, fxcommon3score] #DONE + - [0xFCF5E0, c, code_79C80] #DONE + - [0xFD00C0, c, code_7A760] #DONE + - [0xFD08E0, c, code_7AF80] + - [0xFD7960, c, code_82000] #DONE + - [0xFD8CA0, c, code_83340] + - [0xFD96D0, c, gc/section] #DONE + - [0xFD9A30, c, gc/sky] #DONE + - [0xFD9DD0, c, gc/transition] #DONE + - [0xFDAB30, c, code_851D0] + - [0xFDB110, c, code_857B0] #DONE + - [0xFDB160, c, code_85800] #DONE + - [0xFDD790, c, code_87E30] + - [0xFE0110, c, gc/pauseMenu] #DONE + - [0xFE3580, c, code_8DC20] + - [0xFE3BD0, c, gc/zoombox] #DONE + - [0xFE7770, c, code_91E10] + - [0xFE8F50, c, code_935F0] #DONE #chminigmae + - [0xFE9570, c, gc/parade] #DONE + - [0xFE9F80, c, code_94620] #DONE + - [0xFEA0E0, c, code_94780] #DONE + - [0xFEA380, c, code_94A20] #DONE + - [0xFEB010, c, code_956B0] #DONE + - [0xFEE610, c, code_98CB0] + - [0xFEF1C0, c, code_99860] #DONE + - [0xFEF300, c, code_999A0] #DONE + - [0xFEF8E0, c, jiggyscore] #DONE + - [0xFEFC80, c, code_9A320] #DONE + - [0xFEFEE0, c, code_9A580] #DONE + - [0xFF00A0, c, code_9A740] #DONE + - [0xFF0330, c, code_9A9D0] #DONE + - [0xFF0660, c, levelspecificflags] #DONE + - [0xFF0AE0, c, code_9B180] #DONE + - [0xFF0FB0, c, code_9B650] #DONE + - [0xFF12F0, c, code_9B990] #DONE + - [0xFF1AD0, c, code_9C170] #DONE + - [0xFF2FA0, c, code_9D640] #DONE + - [0xFF30C0, c, code_9D760] #DONE + - [0xFF31C0, c, timedfuncqueue] #DONE + - [0xFF3CD0, c, code_9E370] + - [0xFFA660, c, code_A4D00] #DONE + - [0xFFB520, c, code_A5BC0] + - [0x1001560, c, code_ABC00] + - [0x1001E80, c, code_AC520] #DONE + - [0x1002A70, c, code_AD110] #DONE + - [0x1002F10, c, code_AD5B0] #DONE + - [0x1003BF0, c, code_AE290] #DONE + - [0x1003F30, c, code_AE5D0] #DONE + - [0x1004700, c, code_AEDA0] + - [0x1006D60, c, code_B1400] + - [0x1008EE0, c, code_B3580] #DONE + - [0x10093E0, c, code_B3A80] + - [0x100A9A0, c, code_B5040] #DONE + - [0x100B760, c, code_B5E00] #DONE + - [0x100BC10, c, code_B62B0] #DONE + - [0x100BFA0, c, code_B6640] #DONE + - [0x100C030, c, string] #DONE + - [0x100C5C0, c, code_B6C60] #DONE + - [0x100C640, c, code_B6CE0] #DONE + - [0x100C800, c, code_B6EA0] #DONE + - [0x100D480, c, code_B7B20] #DONE + - [0x100D8A0, c, code_B7F40] #DONE + - [0x100D980, c, code_B8020] #DONE + - [0x100D9D0, c, code_B8070] #DONE + - [0x100D9E0, c, code_B8080] + - [0x100E1C0, c, code_B8860] #DONE + - [0x100E9F0, c, code_B9090] #DONE + - [0x100F0D0, c, code_B9770] + - [0x1012A60, c, code_BD100] #DONE + - [0x1013620, c, code_BDCC0] #DONE + - [0x1013C20, c, code_BE2C0] #DONE + - [0x1014880, c, code_BEF20] + - [0x10164E0, c, code_C0B80] #DONE + - [0x1016650, c, code_C0CF0] #DONE + - [0x10167C0, c, code_C0E60] + - [0x1018580, c, code_C2C20] #DONE + - [0x1018890, c, code_C2F30] #DONE + - [0x1018B00, c, code_C31A0] #DONE + - [0x1018D60, c, rand] #DONE + - [0x10193A0, c, code_C3A40] #DONE + - [0x1019480, c, code_C3B20] #DONE + - [0x1019C80, c, code_C4320] #DONE + - [0x101A8A0, c, code_C4F40] #DONE + - [0x101ADA0, c, code_C5440] #DONE + - [0x101B450, c, code_C5AF0] #DONE + - [0x101B620, c, code_C5CC0] #DONE + - [0x101B860, c, code_C5F00] #DONE + - [0x101BB20, c, code_C61C0] #DONE + - [0x101BC10, c, code_C62B0] #DONE + - [0x101D030, c, code_C76D0] #DONE + - [0x101D620, c, code_C7CC0] #DONE + - [0x101DB90, c, code_C8230] #DONE + - [0x101DCC0, c, code_C8360] #DONE + - [0x101DDF0, c, code_C8490] #DONE + - [0x101E0C0, c, code_C8760] #DONE + - [0x101E320, c, code_C89C0] + - [0x101F150, c, code_C97F0] #DONE + - [0x101F7D0, c, code_C9E70] #DONE + - [0x101F860, c, code_C9F00] #DONE + - [0x10209B0, c, code_CB050] #DONE + - [0x1020F70, c, code_CB610] #DONE + - [0x1021200, c, code_CB8A0] #DONE + - [0x1021550, c, code_CBBF0] #DONE + - [0x1021670, c, code_CBD10] #DONE + - [0x1021B40, c, code_CC1E0] #DONE + - [0x1022A00, c, code_CD0A0] #DONE + - [0x1022D50, c, code_CD3F0] #DONE + - [0x1023040, c, code_CD6E0] #DONE + - [0x1024630, c, code_CECD0] #DONE + - [0x10249F0, c, code_CF090] #DONE + - [0x1024D40, c, code_CF3E0] #DONE + - [0x1025140, c, ch/clankerwhipcrack] #DONE + - [0x10253C0, c, ch/code_CFA60] #DONE + - [0x1025B20, c, ch/clucker] #DONE + - [0x1026600, c, code_D0CA0] #DONE + - [0x1027AE0, c, code_D2180] #DONE + - [0x1027E60, c, ch/firefx] #DONE + - [0x1028410, c, ch/drips] #DONE + - [0x1028770, c, ch/icecube] #DONE + - [0x10299B0, c, ch/ghost] #DONE + - [0x102AA50, c, ch/flotsam] #DONE + - [0x102B670, c, code_D5D10] #DONE + - [0x102B930, c, code_D5FD0] #DONE + - [0x102BAE0, c, code_D6180] #DONE + - [0x102BF60, c, code_D6600] #DONE + - [0x102C9A0, c, code_D7040] #DONE + - [0x102D670, c, code_D7D10] #DONE + - [0x102E340, c, code_D89E0] + - [0x102F700, c, ch/whipcrack] #DONE + - [0x102FD00, c, code_DA3A0] #DONE + - [0x10300C0, c, code_DA760] #DONE + - [0x1030400, c, code_DAAA0] #DONE + - [0x1030970, c, code_DB010] #DONE + - [0x1031E10, c, code_DC4B0] #DONE + - [0x1031F60, bin, data_DC600] + - [0x1031F90, .data, code_1550] + - [0x1031FB0, .data, code_2890] + - [0x1031FE0, .data, code_3480] + - [0x1032000, .data, code_47C0] + - [0x1032060, .data, code_7060] + - [0x10320A0, .data, code_90E0] + - [0x1032150, .data, code_AA60] + - [0x1032150, .data, code_B850] + - [0x1032170, .data, code_BB50] + - [0x10321C0, .data, code_C0E0] + - [0x10321F0, .data, code_E910] + - [0x1032E10, .data, code_FD60] + - [0x1032E20, .data, code_117D0] + - [0x1032F30, .data, code_126C0] + - [0x1032F50, .data, code_12F30] + - [0x1032FF0, .data, code_14420] + - [0x1033330, .data, bs/ant] + - [0x1033360, .data, bs/bbuster] + - [0x1033380, .data, bs/beeFly] + - [0x10333B0, .data, bs/beeMain] + - [0x10333E0, .data, bs/bFlap] + - [0x10333F0, .data, bs/bFlip] + - [0x1033410, .data, bs/bLongLeg] + - [0x1033430, .data, bs/bPeck] + - [0x1033440, .data, bs/bShock] + - [0x1033450, bin, data_DDAF0] + - [0x1033460, .data, bs/bTrot] + - [0x10334A0, .data, bs/bWhirl] + - [0x10334C0, .data, bs/carry] + - [0x10334D0, .data, bs/croc] + - [0x1033500, .data, bs/drone] + - [0x1033580, bin, data_DDC20] #.data, bs/dronexform] + - [0x10336A0, .data, bs/jump] + - [0x10336C0, .data, bs/pumpkin] + - [0x10336F0, .data, bs/stand] + - [0x1033710, .data, bs/swim] + - [0x1033740, .data, bs/walk] + - [0x1033790, .data, bs/walrus] + - [0x10337D0, bin, data_DDE70] + - [0x1034200, .data, code_35520] + - [0x10346A0, bin, data_DED40] + - [0x1034730, .data, code_37E50] + - [0x1034760, bin, data_DEE00] + - [0x10347A0, .data, ch/gameSelect] + - [0x1034900, .data, code_3EAD0] + - [0x1034980, .data, code_3EC30] + - [0x10349B0, .data, code_3ECE0] + - [0x10349E0, .data, ch/bigbutt] + - [0x1034AC0, .data, code_400F0] + - [0x1034C60, .data, ch/jiggy] + - [0x1034CA0, .data, ch/jigsawdance] + - [0x1034D00, .data, code_41460] + - [0x1034E00, .data, code_41F30] + - [0x1034E30, .data, code_41FB0] + - [0x1035620, .data, ch/musicnote] + - [0x1035650, .data, code_42CB0] + - [0x10356A0, bin, data_DFD40] + - [0x1035870, .data, ch/trainers] + - [0x10358C0, .data, code_43800] + - [0x10358F0, .data, code_43A40] + - [0x10359D0, bin, data_E0070] + - [0x10359E0, .data, code_440B0] + - [0x1035B00, bin, data_E01A0] + - [0x1035B30, .data, ch/code_468E0] + - [0x1035B80, bin, data_E0220] + - [0x1035C90, .data, ch/beehive] + - [0x1035CE0, .data, code_47BD0] + - [0x1035D10, .data, ch/soundsource] + - [0x1035D90, .data, code_49A70] + - [0x1035E00, .data, ch/gloop] + - [0x1035E60, bin, data_E0500] + - [0x1035F00, .data, code_4BD70] + - [0x1035FC0, bin, data_E0660] + - [0x1036050, .data, code_4C020] + - [0x10363D0, bin, data_E0A70] + - [0x1036420, .data, ch/badShad] + - [0x1036450, .data, code_50490] + - [0x10364F0, bin, data_E0B90] + - [0x1036630, .data, code_517A0] + - [0x1036660, .data, code_51950] + - [0x10366D0, .data, code_51C90] + - [0x1036740, .data, ch/mole] + - [0x10367D0, .data, ch/molehill] + - [0x1036840, .data, code_53A10] + - [0x1036870, bin, data_E0F10] + - [0x1036900, .data, code_54D50] + - [0x10369B0, bin, data_E1050] #.data, code_55180] + - [0x1036A10, .data, code_55390] + - [0x1036A40, .data, code_556C0] + - [0x1036A70, .data, code_55850] + - [0x1036AA0, .data, code_55A90] + - [0x1036AD0, .data, code_55BC0] + - [0x1036B20, .data, code_55E70] + - [0x1036B70, .data, code_560F0] + - [0x1036CD0, .data, code_57C70] + - [0x1036D30, .data, code_581D0] + - [0x1036D80, .data, code_584D0] + - [0x1036E10, bin, data_E14B0] + - [0x1036F70, .data, code_59A80] + - [0x1036FA0, .data, code_59D40] + - [0x1037020, .data, ch/code_5AB30] + - [0x10370E0, .data, code_5B6A0] + - [0x1037190, .data, code_5BD90] + - [0x10371C0, bin, data_E1860] + - [0x1037230, .data, code_66FB0] + - [0x10372B0, .data, gc/bound] + - [0x1037300, .data, code_67650] + - [0x1037310, bin, data_E19B0] + - [0x10373A0, .data, code_6A4B0] + - [0x1037470, bin, data_E1B10] + - [0x1037750, .data, code_6CD20] + - [0x10377A0, .data, code_6D030] + - [0x10377B0, bin, data_E1E50] + - [0x10377C0, .data, code_6D490] + - [0x10379D0, bin, data_E2070] + - [0x1037CB0, .data, code_73640] + - [0x10380F0, .data, code_74090] + - [0x10381A0, .data, code_74290] + - [0x10381D0, bin, data_E2870] + - [0x1038C80, .data, fxcommon3score] + - [0x10392E0, .data, code_79C80] + - [0x1039330, .data, code_7A760] + - [0x1039380, bin, data_E3A20] + - [0x10395B0, .data, code_82000] + - [0x103A1D0, bin, data_E4870] + - [0x103A1E0, .data, gc/section] + - [0x103A710, .data, gc/sky] + - [0x103AB20, .data, gc/transition] + - [0x103AE20, .data, code_851D0] + - [0x103AEA0, bin, data_E5540] + - [0x103AEB0, .data, gc/pauseMenu] + - [0x103B000, bin, data_E56A0] + - [0x103B090, .data, gc/zoombox] + - [0x103C310, bin, data_E69B0] + - [0x103C370, .data, gc/parade] + - [0x103C790, .data, code_94A20] + - [0x103C7A0, .data, code_956B0] + - [0x103C7C0, bin, data_E6E60] + - [0x103C850, .data, code_9B650] + - [0x103CC90, .data, code_9B990] + - [0x103CDF0, .data, code_9D640] + - [0x103CF30, bin, data_E75D0] + - [0x103CFA0, .data, code_A4D00] + - [0x103D180, bin, data_E7820] + - [0x103D1D0, .data, code_A5BC0] + - [0x103D200, .data, code_ABC00] + - [0x103E340, .data, code_AC520] + - [0x103E350, bin, data_E89F0] # .data, code_AD110] + - [0x103EC20, bin, data_E92C0] + - [0x103F490, .data, code_B62B0] + - [0x10407F0, .data, code_B6CE0] + - [0x1040800, .data, code_B6EA0] + - [0x1040830, .data, code_B7F40] + - [0x1040840, bin, data_EAEE0] + - [0x1040890, .data, code_BD100] + - [0x10408A0, .data, code_BE2C0] + - [0x10408B0, bin, data_EAF40] + - [0x10408D0, .data, code_C4320] + - [0x1040990, .data, code_C4F40] + - [0x1040A00, .data, code_C5440] + - [0x1040A70, bin, data_EB120] + - [0x10411C0, .data, code_CF3E0] + - [0x10411E0, .data, ch/clankerwhipcrack] + - [0x1041210, .data, ch/code_CFA60] + - [0x1041240, .data, ch/clucker] + - [0x1041270, bin, data_EB910] # .data, code_D0CA0] + - [0x1041310, .data, code_D2180] + - [0x1041460, .data, ch/firefx] + - [0x1041490, .data, ch/drips] + - [0x1041520, .data, ch/icecube] + - [0x10415B0, .data, ch/ghost] + - [0x1041650, .data, ch/flotsam] + - [0x10416F0, bin, data_EBD90] + - [0x10418E0, .data, code_D7040] + - [0x1041950, bin, data_EBFF0] + - [0x1041AD0, .data, ch/whipcrack] + - [0x1041B00, .data, code_DA3A0] + - [0x1041B80, .data, code_DA760] + - [0x1041BB0, bin, code_EC250] + - [0x1041CB0, bin, code_EC350] #.data, code_DB010] + - [0x1042790, .data, code_DC4B0] + - [0x10427C0, ".rodata", animctrl] + - [0x10427F0, .rodata, code_AD0] + - [0x1042800, .rodata, code_1930] + - [0x1042880, .rodata, code_2890] + - [0x1042890, .rodata, code_3480] + - [0x10428A0, .rodata, code_39D0] + - [0x1042940, .rodata, code_47C0] + - [0x1042D70, .rodata, code_6B30] + - [0x1042E60, .rodata, code_7060] + - [0x1042F90, .rodata, code_9450] + - [0x1042FC0, .rodata, code_9900] + - [0x1042FD0, .rodata, code_9BD0] + - [0x1043010, .rodata, code_AA60] + - [0x10430C0, .rodata, code_B650] + - [0x10430D0, .rodata, code_B850] + - [0x10430F0, .rodata, code_BD20] + - [0x1043110, .rodata, code_C0E0] + - [0x1043130, .rodata, code_C4B0] + - [0x1043170, .rodata, code_D9B0] + - [0x1043180, .rodata, code_E680] + - [0x10431B0, .rodata, code_EF50] + - [0x1043350, .rodata, code_FD60] + - [0x10433B0, .rodata, code_10CD0] + - [0x10433C0, .rodata, pitch] + - [0x10433F0, .rodata, code_11040] + - [0x1043400, .rodata, done/climb] + - [0x1043410, .rodata, code_11660] + - [0x10435D0, .rodata, code_11870] + - [0x10435E0, .rodata, roll] + - [0x1043600, .rodata, yaw] + - [0x1043660, .rodata, code_12360] + - [0x1043690, .rodata, code_126C0] + - [0x10436C0, .rodata, code_12F30] + - [0x10436E0, .rodata, code_13FC0] + - [0x10436F0, .rodata, code_14420] + - [0x1043770, .rodata, code_16010] + - [0x1043BD0, .rodata, code_16C60] + - [0x1043C70, .rodata, bs/ant] + - [0x1043CA0, .rodata, bs/bBarge] + - [0x1043CE0, .rodata, bs/bbuster] + - [0x1043D20, .rodata, bs/beeFly] + - [0x1043D50, .rodata, bs/beeMain] + - [0x1043DC0, .rodata, bs/bEggAss] + - [0x1043DE0, .rodata, bs/bEggHead] + - [0x1043E00, .rodata, bs/bFlap] + - [0x1043E70, .rodata, bs/bFlip] + - [0x1043EC0, .rodata, bs/bFly] + - [0x1043F20, .rodata, bs/bLongLeg] + - [0x1043FB0, .rodata, bs/bPeck] + - [0x1043FE0, .rodata, bs/bShock] + - [0x1044000, .rodata, bs/bSwim] + - [0x1044070, .rodata, bs/bTrot] + - [0x10440E0, .rodata, bs/bWhirl] + - [0x1044110, .rodata, bs/carry] + - [0x1044130, .rodata, bs/claw] + - [0x1044170, .rodata, bs/climb] + - [0x1044180, .rodata, bs/croc] + - [0x10441E0, .rodata, bs/crouch] + - [0x1044210, .rodata, bs/die] + - [0x1044220, .rodata, code_27550] + - [0x1044230, .rodata, bs/dronegoto] + - [0x1044240, .rodata, code_27F40] + - [0x1044250, .rodata, code_28220] + - [0x1044260, .rodata, bs/dronexform] + - [0x1044310, .rodata, bs/jig] + - [0x1044330, .rodata, bs/jump] + - [0x1044380, .rodata, bs/ow] + - [0x1044390, .rodata, bs/pumpkin] + - [0x1044410, .rodata, bs/rebound] + - [0x1044420, .rodata, bs/rest] + - [0x1044430, .rodata, bs/slide] + - [0x1044440, .rodata, bs/stand] + - [0x1044470, .rodata, bs/swim] + - [0x10444C0, .rodata, bs/surf] + - [0x10444D0, .rodata, done/bs/talk] + - [0x10444E0, .rodata, bs/timeout] + - [0x10444F0, .rodata, bs/throw] + - [0x1044500, .rodata, bs/turn] + - [0x1044520, .rodata, bs/twirl] + - [0x1044540, .rodata, bs/walk] + - [0x10445D0, .rodata, bs/walrus] + - [0x1044630, .rodata, bs/washy] + - [0x1044690, .rodata, code_32DB0] + - [0x10446E0, .rodata, code_33F90] + - [0x1044700, .rodata, code_34310] + - [0x1044710, .rodata, code_34790] + - [0x1044740, .rodata, code_356B0] + - [0x1044890, .rodata, code_37E50] + - [0x10448B0, .rodata, code_38150] + - [0x10448C0, .rodata, code_382E0] + - [0x10448D0, .rodata, code_38460] + - [0x10448E0, .rodata, code_38AD0] + - [0x10448F0, .rodata, code_38F40] + - [0x1044900, .rodata, code_39190] + - [0x1044920, .rodata, code_396B0] + - [0x1044930, .rodata, code_39A10] + - [0x1044950, .rodata, code_39EF0] + - [0x1044990, .rodata, code_3AE10] + - [0x10449A0, .rodata, code_3BB80] + - [0x10449F0, .rodata, ch/gameSelect] + - [0x1044B70, .rodata, code_3ECE0] + - [0x1044B80, .rodata, ch/bigbutt] + - [0x1044C60, .rodata, code_400F0] + - [0x1044CC0, .rodata, ch/jiggy] + - [0x1044D40, .rodata, ch/jigsawdance] + - [0x1044DB0, .rodata, code_41460] + - [0x1044DE0, .rodata, code_41FB0] + - [0x1044E20, .rodata, ch/musicnote] + - [0x1044E30, .rodata, code_42CB0] + - [0x1044E40, .rodata, ch/trainers] + - [0x1044E50, .rodata, code_43800] + - [0x1044E60, .rodata, code_440B0] + - [0x1044EB0, .rodata, code_45310] + - [0x1044F30, .rodata, ch/jinjo] + - [0x1044FA0, .rodata, ch/beehive] + - [0x1044FB0, .rodata, code_47BD0] + - [0x1045010, .rodata, code_49A70] + - [0x1045030, .rodata, ch/gloop] + - [0x1045040, .rodata, code_4A6F0] + - [0x10450F0, .rodata, code_4C020] + - [0x1045710, .rodata, ch/badShad] + - [0x1045720, .rodata, code_50490] + - [0x1045730, .rodata, code_509D0] + - [0x1045770, .rodata, code_517A0] + - [0x1045780, .rodata, code_51950] + - [0x1045790, .rodata, ch/mole] + - [0x1045830, .rodata, code_53C10] + - [0x10458A0, .rodata, code_54D50] + - [0x10458C0, .rodata, code_55180] + - [0x10458D0, .rodata, code_55390] + - [0x10458E0, .rodata, code_55BC0] + - [0x10458F0, .rodata, code_55E70] + - [0x1045900, .rodata, code_560F0] + - [0x1045970, .rodata, code_57C70] + - [0x1045990, .rodata, code_581D0] + - [0x10459A0, .rodata, code_584D0] + - [0x1045A00, .rodata, code_599E0] + - [0x1045A10, .rodata, code_59A80] + - [0x1045A20, .rodata, code_59D40] + - [0x1045A70, .rodata, ch/code_5AB30] + - [0x1045AA0, .rodata, code_5B6A0] + - [0x1045AD0, .rodata, code_5C240] + - [0x1045AE0, .rodata, code_5C870] + - [0x1045B50, .rodata, code_5FD90] + - [0x1045B60, .rodata, code_66FB0] + - [0x1045B70, .rodata, code_67650] + - [0x1045B80, .rodata, code_679A0] + - [0x1045BA0, .rodata, code_6A4B0] + - [0x1045BB0, .rodata, code_6B030] + - [0x1045BC0, .rodata, code_6C3E0] + - [0x1045BE0, .rodata, code_6CEC0] + - [0x1045BF0, .rodata, code_6D030] + - [0x1045C00, .rodata, code_6D270] + - [0x1045C10, .rodata, code_6DA30] + - [0x1045C90, .rodata, code_70F20] + - [0x1045CF0, .rodata, code_71820] + - [0x1045D10, .rodata, code_72060] + - [0x1045D30, .rodata, code_73640] + - [0x1045D60, .rodata, code_74420] + - [0x1045D70, .rodata, code_763D0] + - [0x1045D80, .rodata, code_76D90] + - [0x1045DD0, .rodata, code_78100] + - [0x1045E00, .rodata, code_78100] + - [0x1045E30, .rodata, fxcommon3score] + - [0x1045E50, .rodata, code_79C80] + - [0x1045E60, .rodata, code_7A760] + - [0x1045E80, .rodata, code_7AF80] + - [0x1045F40, .rodata, code_82000] + - [0x1046100, .rodata, code_83340] + - [0x1046110, .rodata, gc/section] + - [0x1046E10, .rodata, gc/sky] + - [0x1046E20, .rodata, gc/transition] + - [0x1046E80, .rodata, code_85800] + - [0x1046EA0, .rodata, code_87E30] + - [0x1046F10, .rodata, gc/pauseMenu] + - [0x1047250, .rodata, gc/zoombox] + - [0x1047320, .rodata, code_91E10] + - [0x1047360, .rodata, code_935F0] + - [0x1047380, .rodata, gc/parade] + - [0x1047700, .rodata, code_94A20] + - [0x1047710, .rodata, code_956B0] + - [0x1047720, .rodata, code_9A9D0] + - [0x1047750, .rodata, code_9B180] + - [0x1047770, .rodata, code_9C170] + - [0x10477C0, .rodata, code_9E370] + - [0x1047840, .rodata, code_A4D00] + - [0x1047870, .rodata, code_A5BC0] + - [0x1047890, .rodata, code_AD110] + - [0x10478B0, .rodata, code_AE5D0] + - [0x10478C0, .rodata, code_AEDA0] + - [0x1047910, .rodata, code_B1400] + - [0x1047920, .rodata, code_B3A80] + - [0x1047930, .rodata, string] + - [0x1047950, .rodata, code_B6C60] + - [0x1047960, .rodata, code_B6CE0] + - [0x1047990, .rodata, code_B9090] + - [0x10479C0, .rodata, code_B9770] + - [0x1047A50, .rodata, code_BD100] + - [0x1047A70, .rodata, code_BDCC0] + - [0x1047A90, .rodata, code_BE2C0] + - [0x1047AD0, .rodata, code_BEF20] + - [0x1047B10, .rodata, code_C0E60] + - [0x1047B20, .rodata, rand] + - [0x1047B40, .rodata, code_C3A40] + - [0x1047B50, .rodata, code_C4320] + - [0x1047B70, .rodata, code_C5AF0] + - [0x1047B90, .rodata, code_C5CC0] + - [0x1047BA0, .rodata, code_C5F00] + - [0x1047BD0, .rodata, code_C62B0] + - [0x1047C00, .rodata, code_C76D0] + - [0x1047C40, .rodata, code_C7CC0] + - [0x1047C80, .rodata, code_C8230] + - [0x1047C90, .rodata, code_C8360] + - [0x1047CA0, .rodata, code_C8490] + - [0x1047CC0, .rodata, code_C8760] + - [0x1047CD0, .rodata, code_C89C0] + - [0x1047D10, .rodata, code_C97F0] + - [0x1047D20, .rodata, code_C9F00] + - [0x1047D50, .rodata, code_CB050] + - [0x1047DC0, .rodata, code_CB610] + - [0x1047DE0, .rodata, code_CBD10] + - [0x1047E00, .rodata, code_CC1E0] + - [0x1047E20, .rodata, code_CD0A0] + - [0x1047E40, .rodata, code_CD3F0] + - [0x1047E50, .rodata, code_CD6E0] + - [0x1047E90, .rodata, code_CECD0] + - [0x1047EB0, .rodata, code_CF090] + - [0x1047EC0, .rodata, ch/clankerwhipcrack] + - [0x1047EE0, .rodata, ch/code_CFA60] + - [0x1047F30, .rodata, ch/clucker] + - [0x1047FD0, .rodata, code_D0CA0] + - [0x1048050, .rodata, code_D2180] + - [0x1048060, .rodata, ch/firefx] + - [0x10480A0, .rodata, ch/drips] + - [0x10480C0, .rodata, ch/icecube] + - [0x1048170, .rodata, ch/ghost] + - [0x10481E0, .rodata, ch/flotsam] + - [0x1048220, .rodata, code_D5D10] + - [0x1048230, .rodata, code_D6180] + - [0x1048240, .rodata, code_D6600] + - [0x1048280, .rodata, code_D7040] + - [0x10482F0, .rodata, code_D7D10] + - [0x1048390, .rodata, code_D89E0] + - [0x10483C0, .rodata, code_D89E0] + - [0x1048430, .rodata, ch/whipcrack] + - [0x1048450, .rodata, code_DA3A0] + - [0x1048460, .rodata, code_DA760] + - [0x1048480, .rodata, code_DB010] + - [0x1048560, .bss, code_AD0] + - [0x1048560, .bss, code_10E0] + - [0x1048560, .bss, code_1550] + - [0x1048560, .bss, code_1930] + - [0x1048560, .bss, code_2890] + - [0x1048560, .bss, code_3480] + - [0x1048560, .bss, code_39D0] + - [0x1048560, .bss, code_47C0] + - [0x1048560, .bss, code_6B30] + - [0x1048560, .bss, code_7060] + - [0x1048560, .bss, code_8DA0] + - [0x1048560, .bss, code_90E0] + - [0x1048560, .bss, code_9290] + - [0x1048560, .bss, code_9450] + - [0x1048560, .bss, code_9900] + - [0x1048560, .bss, code_9BD0] + - [0x1048560, .bss, code_A600] + - [0x1048560, .bss, code_A6E0] + - [0x1048560, .bss, code_AA60] + - [0x1048560, .bss, code_B650] + - [0x1048560, .bss, code_BB50] + - [0x1048560, .bss, code_BD20] + - [0x1048560, .bss, code_C0E0] + - [0x1048560, .bss, code_C3F0] + - [0x1048560, .bss, code_C4B0] + - [0x1048560, .bss, code_D800] + - [0x1048560, .bss, code_D9B0] + - [0x1048560, .bss, code_DF70] + - [0x1048560, .bss, code_E410] + - [0x1048560, .bss, code_E680] + - [0x1048560, .bss, code_E910] + - [0x1048560, .bss, code_EE40] + - [0x1048560, .bss, code_EF50] + - [0x1048560, .bss, code_FD60] + - [0x1048560, .bss, code_10CD0] + - [0x1048560, .bss, pitch] + - [0x1048560, .bss, code_11040] + - [0x1048560, .bss, done/climb] + - [0x1048560, .bss, code_11460] + - [0x1048560, .bss, code_11660] + - [0x1048560, .bss, code_117D0] + - [0x1048560, .bss, code_11870] + - [0x1048560, .bss, roll] + - [0x1048560, .bss, yaw] + - [0x1048560, .bss, code_12360] + - [0x1048560, .bss, code_126C0] + - [0x1048560, .bss, code_12F30] + - [0x1048560, .bss, bsList] + - [0x1048560, .bss, code_13780] + - [0x1048560, .bss, code_13900] + - [0x1048560, .bss, code_13A00] + - [0x1048560, .bss, code_13FC0] + - [0x1048560, .bss, code_14420] + - [0x1048560, .bss, code_15F20] + - [0x1048560, .bss, code_16010] + - [0x1048560, .bss, code_16C60] + - [0x1048560, .bss, code_171F0] + - [0x1048560, .bss, bs/ant] + - [0x1048560, .bss, bs/bBarge] + - [0x1048560, .bss, bs/bbuster] + - [0x1048560, .bss, bs/beeFly] + - [0x1048560, .bss, bs/beeMain] + - [0x1048560, .bss, bs/bEggAss] + - [0x1048560, .bss, bs/bEggHead] + - [0x1048560, .bss, bs/bFlap] + - [0x1048560, .bss, bs/bFlip] + - [0x1048560, .bss, bs/bFly] + - [0x1048560, .bss, bs/bLongLeg] + - [0x1048560, .bss, bs/bPeck] + - [0x1048560, .bss, bs/bShock] + - [0x1048560, .bss, bs/bSwim] + - [0x1048560, .bss, bs/bTrot] + - [0x1048560, .bss, bs/bWhirl] + - [0x1048560, .bss, bs/claw] + - [0x1048560, .bss, bs/climb] + - [0x1048560, .bss, bs/croc] + - [0x1048560, .bss, bs/crouch] + - [0x1048560, .bss, bs/die] + - [0x1048560, .bss, code_27550] + - [0x1048560, .bss, bs/dronegoto] + - [0x1048560, .bss, code_28220] + - [0x1048560, .bss, bs/dronexform] + - [0x1048560, .bss, bs/jig] + - [0x1048560, .bss, bs/jump] + - [0x1048560, .bss, bs/ow] + - [0x1048560, .bss, bs/pumpkin] + - [0x1048560, .bss, bs/rebound] + - [0x1048560, .bss, bs/sled] + - [0x1048560, .bss, bs/slide] + - [0x1048560, .bss, bs/splat] + - [0x1048560, .bss, bs/stand] + - [0x1048560, .bss, bs/swim] + - [0x1048560, .bss, bs/surf] + - [0x1048560, .bss, done/bs/talk] + - [0x1048560, .bss, bs/throw] + - [0x1048560, .bss, bs/turn] + - [0x1048560, .bss, bs/twirl] + - [0x1048560, .bss, bs/walk] + - [0x1048560, .bss, bs/walrus] + - [0x1048560, .bss, bs/washy] + - [0x1048560, .bss, code_32DB0] + - [0x1048560, .bss, code_33C30] + - [0x1048560, .bss, code_33D40] + - [0x1048560, .bss, code_34310] + - [0x1048560, .bss, code_34790] + - [0x1048560, .bss, code_35520] + - [0x1048560, .bss, code_356B0] + - [0x1048560, .bss, code_379B0] + - [0x1048560, .bss, code_37CD0] + - [0x1048560, .bss, code_37E50] + - [0x1048560, .bss, code_38150] + - [0x1048560, .bss, code_38460] + - [0x1048560, .bss, code_38630] + - [0x1048560, .bss, code_388E0] + - [0x1048560, .bss, code_38AD0] + - [0x1048560, .bss, code_38F40] + - [0x1048560, .bss, code_39190] + - [0x1048560, .bss, code_396B0] + - [0x1048560, .bss, code_39A10] + - [0x1048560, .bss, code_39EF0] + - [0x1048560, .bss, done/code_3B2C0] + - [0x1048560, .bss, code_3B5C0] + - [0x1048560, .bss, ch/gameSelect] + - [0x1048560, .bss, code_41460] + - [0x1048560, .bss, code_41FB0] + - [0x1048560, .bss, code_42CB0] + - [0x1048560, .bss, mapspecificflags] + - [0x1048560, .bss, code_4A6F0] + - [0x1048560, .bss, code_4C020] + - [0x1048560, .bss, ch/badShad] + - [0x1048560, .bss, ch/climbBase] + - [0x1048560, .bss, code_55390] + - [0x1048560, .bss, code_556C0] + - [0x1048560, .bss, code_55850] + - [0x1048560, .bss, code_55A90] + - [0x1048560, .bss, code_55BC0] + - [0x1048560, .bss, code_55E70] + - [0x1048560, .bss, code_560F0] + - [0x1048560, .bss, code_57C70] + - [0x1048560, .bss, code_581D0] + - [0x1048560, .bss, code_584D0] + - [0x1048560, .bss, code_59A80] + - [0x1048560, .bss, code_59D40] + - [0x1048560, .bss, code_5B6A0] + - [0x1048560, .bss, code_5BEB0] + - [0x1048560, .bss, code_5C240] + - [0x1048560, .bss, code_5C870] + - [0x1048560, .bss, code_5DBC0] + - [0x1048560, .bss, code_5FD90] + - [0x1048560, .bss, code_637D0] + - [0x1048560, .bss, code_654C0] + - [0x1048560, .bss, code_66D90] + - [0x1048560, .bss, gc/bound] + - [0x1048560, .bss, code_67650] + - [0x1048560, .bss, code_679A0] + - [0x1048560, .bss, code_69F60] + - [0x1048560, .bss, code_6AEF0] + - [0x1048560, .bss, code_6B030] + - [0x1048560, .bss, code_6C3E0] + - [0x1048560, .bss, code_6CD20] + - [0x1048560, .bss, code_6CEC0] + - [0x1048560, .bss, code_6D030] + - [0x1048560, .bss, code_6D270] + - [0x1048560, .bss, code_6DA30] + - [0x1048560, .bss, code_6DA30] + - [0x1048560, .bss, code_70C30] + - [0x1048560, .bss, code_72060] + - [0x1048560, .bss, code_72B10] + - [0x1048560, .bss, code_73640] + - [0x1048560, .bss, code_74420] + - [0x1048560, .bss, code_74910] + - [0x1048560, .bss, code_74ED0] + - [0x1048560, .bss, code_75480] + - [0x1048560, .bss, code_75930] + - [0x1048560, .bss, code_75E90] + - [0x1048560, .bss, code_76390] + - [0x1048560, .bss, code_76D90] + - [0x1048560, .bss, code_78100] + - [0x1048560, .bss, code_78E50] + - [0x1048560, .bss, code_79C80] + - [0x1048560, .bss, code_7A760] + - [0x1048560, .bss, code_7AF80] + - [0x1048560, .bss, code_82000] + - [0x1048560, .bss, code_83340] + - [0x1048560, .bss, gc/section] + - [0x1048560, .bss, gc/sky] + - [0x1048560, .bss, gc/transition] + - [0x1048560, .bss, code_851D0] + - [0x1048560, .bss, code_857B0] + - [0x1048560, .bss, code_85800] + - [0x1048560, .bss, code_87E30] + - [0x1048560, .bss, gc/pauseMenu] + - [0x1048560, .bss, code_8DC20] + - [0x1048560, .bss, gc/zoombox] + - [0x1048560, .bss, code_91E10] + - [0x1048560, .bss, gc/parade] + - [0x1048560, .bss, code_94620] + - [0x1048560, .bss, code_94780] + - [0x1048560, .bss, code_956B0] + - [0x1048560, .bss, code_98CB0] + - [0x1048560, .bss, code_99860] + - [0x1048560, .bss, code_999A0] + - [0x1048560, .bss, jiggyscore] + - [0x1048560, .bss, code_9A320] + - [0x1048560, .bss, code_9A580] + - [0x1048560, .bss, code_9A740] + - [0x1048560, .bss, code_9A9D0] + - [0x1048560, .bss, levelspecificflags] + - [0x1048560, .bss, code_9B180] + - [0x1048560, .bss, code_9B650] + - [0x1048560, .bss, code_9B990] + - [0x1048560, .bss, code_9C170] + - [0x1048560, .bss, timedfuncqueue] + - [0x1048560, .bss, code_9E370] + - [0x1048560, .bss, code_A4D00] + - [0x1048560, .bss, code_A5BC0] + - [0x1048560, .bss, code_ABC00] + - [0x1048560, .bss, code_AC520] + - [0x1048560, .bss, code_AD110] + - [0x1048560, .bss, code_AD5B0] + - [0x1048560, .bss, code_AE290] + - [0x1048560, .bss, code_AEDA0] + - [0x1048560, .bss, code_B1400] + - [0x1048560, .bss, code_B3A80] + - [0x1048560, .bss, code_B5040] + - [0x1048560, .bss, code_B5E00] + - [0x1048560, .bss, code_B62B0] + - [0x1048560, .bss, code_B6C60] + - [0x1048560, .bss, code_B6CE0] + - [0x1048560, .bss, code_B6EA0] + - [0x1048560, .bss, code_B8020] + - [0x1048560, .bss, code_B8860] + - [0x1048560, .bss, code_B9770] + - [0x1048560, .bss, code_BD100] + - [0x1048560, .bss, code_BDCC0] + - [0x1048560, .bss, code_BEF20] + - [0x1048560, .bss, code_C0E60] + - [0x1048560, .bss, code_C2C20] + - [0x1048560, .bss, code_C2F30] + - [0x1048560, .bss, rand] + - [0x1048560, .bss, code_C4320] + - [0x1048560, .bss, code_C4F40] + - [0x1048560, .bss, code_C5440] + - [0x1048560, .bss, code_C89C0] + - [0x1048560, .bss, code_C97F0] + - [0x1048560, .bss, code_C9F00] + - [0x1048560, .bss, code_CB8A0] + - [0x1048560, .bss, code_CBBF0] + - [0x1048560, .bss, code_CD0A0] + - [0x1048560, .bss, code_CD6E0] +- name: CC + dir: CC + type: code + start: 0x01048560 + vram: 0x803863F0 + subsegments: + - [0x1048560, c, code_0] + - [0x1048A90, c, code_530] #Done + - [0x1049150, c, code_BF0] #Done + - [0x1049680, c, ch/tooth] #Done + - [0x1049920, c, code_13C0] #DONE + - [0x1049F10, c, code_19B0] #Done + - [0x104A0F0, c, code_1B90] #Done + - [0x104A4D0, c, code_1F70] #DONE + - [0x104B690, c, ch/sawblade] #Done + - [0x104B960, c, code_3400] #Done + - [0x104BC10, .data, code_0] + - [0x104BC40, .data, code_530] + - [0x104BC70, .data, code_BF0] + - [0x104BCC0, .data, ch/tooth] + - [0x104BD50, .data, crc] + - [0x104BD60, .data, code_1B90] + - [0x104BD70, .data, code_1F70] + - [0x104BDA0, .data, ch/sawblade] + - [0x104BFB0, .data, code_3400] + - [0x104C020, .rodata, code_0] + - [0x104C070, .rodata, code_530] + - [0x104C080, .rodata, ch/tooth] + - [0x104C090, .rodata, code_1B90] + - [0x104C0A0, .rodata, code_1F70] +- name: GV + dir: GV + type: code + start: 0x0104C0E0 + vram: 0x803863F0 + subsegments: + - [0x104C0E0, c, code_0] #DONE + - [0x104C310, c, code_230] #DONE + - [0x104CE40, c, code_D60] #DONE + - [0x104D650, c, code_1570] #DONE + - [0x104DF60, c, code_1E80] #DONE + - [0x104E5B0, c, code_24D0] #DONE + - [0x104E810, c, code_2730] #DONE + - [0x104EC60, c, code_2B80] #DONE + - [0x104EFC0, c, code_2EE0] #DONE + - [0x104F1A0, c, code_30C0] #DONE + - [0x104F710, c, code_3630] #DONE + - [0x104FB80, c, code_3AA0] #DONE + - [0x104FBF0, c, code_3B10] #DONE + - [0x104FC90, c, code_3BB0] #DONE + - [0x104FE70, c, code_3D90] #DONE + - [0x1050490, c, code_43B0] #DONE + - [0x1050820, c, code_4740] #DONE + - [0x1051650, c, code_5570] #DONE + - [0x10522C0, c, code_61E0] #DONE + - [0x1052450, c, code_6370] #DONE + - [0x1053060, c, code_6F80] #DONE + - [0x1053140, c, code_7060] #DONE + - [0x1053610, c, code_7530] #DONE + - [0x1053E30, c, code_7D50] #DONE + - [0x1053E90, c, code_7DB0] #DONE + - [0x10540A0, c, code_7FC0] #DONE + - [0x10540D0, c, code_7FF0] #DONE + - [0x1055210, c, code_9130] #DONE + - [0x1055940, c, code_9860] #DONE + - [0x1055C50, c, code_9B70] #DONE + - [0x1055CF0, c, code_9C10] #DONE + - [0x1055E90, c, code_9DB0] #DONE + - [0x1056570, c, code_A490] #DONE + - [0x10568C0, .data, code_0] + - [0x1056910, .data, code_230] + - [0x1056970, .data, code_D60] + - [0x10569A0, .data, code_1570] + - [0x10569F0, .data, code_1E80] + - [0x1056A20, .data, code_24D0] + - [0x1056A50, .data, code_2730] + - [0x1056A80, .data, code_2B80] + - [0x1056AB0, .data, code_2EE0] + - [0x1056AF0, .data, code_30C0] + - [0x1056B90, .data, code_3630] + - [0x1056BF0, .data, code_3AA0] + - [0x1056C20, .data, code_3B10] + - [0x1056C30, .data, code_3BB0] + - [0x1056C90, .data, code_3D90] + - [0x1056CF0, .data, code_43B0] + - [0x1056D30, .data, code_4740] + - [0x1056E10, .data, code_5570] + - [0x1056E80, .data, code_61E0] + - [0x1056EE0, .data, code_6370] + - [0x1056F50, .data, code_6F80] + - [0x1056F80, .data, code_7060] + - [0x1056FD0, .data, code_7530] + - [0x1057030, .data, code_7DB0] + - [0x1057070, .data, code_7FC0] + - [0x10570D0, .data, code_7FF0] + - [0x10572B0, .data, code_9130] + - [0x1057310, .data, code_9860] + - [0x1057340, .data, code_9DB0] + - [0x10573E0, .rodata, code_230] + - [0x1057400, .rodata, code_D60] + - [0x1057410, .rodata, code_1570] + - [0x1057430, .rodata, code_1E80] + - [0x1057470, .rodata, code_2730] + - [0x1057480, .rodata, code_30C0] + - [0x1057490, .rodata, code_3BB0] + - [0x10574A0, .rodata, code_3D90] + - [0x10574B0, .rodata, code_43B0] + - [0x10574C0, .rodata, code_4740] + - [0x1057530, .rodata, code_5570] + - [0x1057580, .rodata, code_6370] + - [0x10575E0, .rodata, code_7060] + - [0x1057600, .rodata, code_7530] + - [0x1057630, .rodata, code_7FF0] + - [0x1057690, .rodata, code_9130] + - [0x10576B0, .rodata, code_9860] + - [0x10576F0, .rodata, code_9DB0] + - [0x1057700, .rodata, code_A490] +- name: MMM + dir: MMM + type: code + start: 0x01057710 + vram: 0x803863F0 + subsegments: + - [0x1057710, c, ch/loggo] #DONE + - [0x1057C80, c, ch/napper] #DONE + - [0x10584D0, c, code_DC0] #DONE + - [0x1058730, c, ch/motzhand] #DONE + - [0x1058DC0, c, code_16B0] #DONE + - [0x1059750, c, code_2040] #DONE + - [0x105A670, c, code_2F60] #DONE + - [0x105A830, c, code_3120] #DONE + - [0x105AB30, c, code_3420] #DONE + - [0x105B460, c, code_3D50] #DONE + - [0x105BEE0, c, code_47D0] #DONE + - [0x105C710, c, code_5000] #DONE + - [0x105CD00, .data, ch/loggo] + - [0x105CD40, .data, ch/napper] + - [0x105CD70, .data, code_DC0] + - [0x105CDB0, .data, ch/motzhand] + - [0x105CDF0, bin, data_56E0] #.data, code_16B0] + - [0x105CF00, .data, code_2040] + - [0x105D150, .data, code_2F60] + - [0x105D240, .data, code_3420] + - [0x105D510, .data, code_3D50] + - [0x105D620, bin, data_5F10] + - [0x105D630, .data, code_5000] + - [0x105D660, .rodata, ch/loggo] + - [0x105D690, .rodata, ch/napper] + - [0x105D6B0, .rodata, ch/motzhand] + - [0x105D6D0, .rodata, code_16B0] + - [0x105D720, .rodata, code_2040] + - [0x105D760, .rodata, code_3120] + - [0x105D770, .rodata, code_3420] + - [0x105D780, .rodata, code_3D50] + - [0x105D7A0, .rodata, code_47D0] + - [0x105D7D0, .rodata, code_5000] + - [0x105D7E0, .bss, code_2040] +- name: TTC + dir: TTC + type: code + start: 0x0105D7E0 + vram: 0x803863F0 + subsegments: + - [0x105D7E0, c, code_0] #DONE + - [0x105E880, c, code_10A0] #DONE + - [0x105F1B0, c, code_19D0] #DONE + - [0x105FEB0, c, code_26D0] #DONE + - [0x1060360, c, code_2B80] #DONE + - [0x1060820, c, code_3040] #DONE + - [0x10608B0, c, ch/lockup] #DONE + - [0x1060DB0, c, code_35D0] #DONE + - [0x1061610, c, code_3E30] #DONE + - [0x10633B0, c, ch/treasure] #DONE + - [0x10637A0, .data, code_0] + - [0x10638D0, .data, code_10A0] + - [0x1063930, .data, code_19D0] + - [0x10639D0, .data, code_26D0] + - [0x1063AF0, .data, code_2B80] + - [0x1063B40, .data, code_3040] + - [0x1063B50, .data, ch/lockup] + - [0x1063C10, .data, code_35D0] + - [0x1063D70, .data, code_3E30] + - [0x1064080, .data, ch/treasure] + - [0x10640D0, .rodata, code_0] + - [0x1064130, .rodata, code_10A0] + - [0x1064160, .rodata, code_19D0] + - [0x1064180, .rodata, code_26D0] + - [0x10641C0, .rodata, code_2B80] + - [0x10641E0, .rodata, ch/lockup] + - [0x1064210, .rodata, code_35D0] + - [0x1064240, .rodata, code_3E30] + - [0x1064A90, .rodata, ch/treasure] + - [0x1064AE0, .bss, code_3040] + - [0x1064AE0, .bss, code_35D0] + - [0x1064AE0, .bss, code_3E30] +- name: MM + dir: MM + type: code + start: 0x01064AE0 + vram: 0x803863F0 + subsegments: + - [0x1064AE0, c, ch/orangepad] + - [0x1065050, c, ch/hut] + - [0x1065390, c, ch/chimpystump] + - [0x10655C0, c, ch/conga] + - [0x10665B0, c, crc] + - [0x1066680, c, ch/orange] + - [0x10669F0, c, ch/lmonkey] #chimpy + - [0x1066FA0, c, code_24C0] + - [0x1067090, c, ch/grublin] + - [0x1067220, c, ch/jujuhitbox] + - [0x10676C0, c, ch/juju] + - [0x1067F80, .data, ch/orangepad] + - [0x1067FB0, .data, ch/hut] + - [0x1068010, .data, ch/chimpystump] + - [0x1068040, .data, ch/conga] + - [0x10680B0, .data, crc] + - [0x10680C0, .data, ch/orange] + - [0x1068100, .data, ch/lmonkey] + - [0x1068150, .data, ch/grublin] + - [0x10681D0, .data, ch/jujuhitbox] + - [0x1068200, .data, ch/juju] + - [0x1068230, .rodata, ch/orangepad] + - [0x1068240, .rodata, ch/hut] + - [0x1068250, .rodata, ch/conga] + - [0x10682D0, .rodata, ch/orange] + - [0x10682F0, .rodata, ch/lmonkey] + - [0x1068340, .rodata, ch/grublin] + - [0x1068350, .rodata, ch/jujuhitbox] + - [0x1068360, .rodata, ch/juju] +- name: BGS + dir: BGS + type: code + start: 0x01068370 + vram: 0x803863F0 + # after: core2-data + subsegments: + - [0x1068370, c, ch/flibbit] #DONE + - [0x1069960, c, done/ch/pinkegg] #DONE + - [0x1069C10, c, ch/croctus] #DONE + - [0x106A5E0, c, done/ch/code_2270] #DONE + - [0x106B3A0, c, code_3030] #DONE + - [0x106B790, c, code_3420] + - [0x106D0E0, c, ch/yumblie] #DONE + - [0x106D970, c, ch/mrvile] #DONE + - [0x106EAA0, c, done/ch/code_6730] #DONE + - [0x106F160, c, ch/yellowflibbit] #DONE + - [0x10709B0, c, done/ch/mudhut] #DONE + - [0x1070DD0, c, done/ch/code_8A60] #DONE + - [0x1071160, c, done/code_8DF0] #DONE + - [0x10713F0, c, ch/tanktup] + - [0x1071AC0, c, code_9750] #DONE + - [0x1071C30, c, done/ch/bigalligator] #DONE + - [0x1071C90, c, ch/leafboat] #DONE + - [0x1072610, .data, ch/flibbit] + - [0x1072640, .data, done/ch/pinkegg] + - [0x1072730, .data, ch/croctus] + - [0x10727B0, .data, done/ch/code_2270] + - [0x1072800, .data, code_3030] + - [0x10728E0, .data, code_3420] + - [0x10729C0, .data, ch/yumblie] + - [0x10729F0, .data, ch/mrvile] + - [0x1072A30, .data, done/ch/code_6730] + - [0x1072A60, .data, ch/yellowflibbit] + - [0x1072AA0, .data, crc] + - [0x1072AB0, .data, done/ch/mudhut] + - [0x1072B10, .data, done/ch/code_8A60] + - [0x1072BA0, .data, ch/tanktup] + - [0x1072BD0, .data, code_9750] + - [0x1072CF0, .data, done/ch/bigalligator] + - [0x1072D20, .data, ch/leafboat] + - [0x1072D50, .rodata, ch/flibbit] + - [0x1072E60, .rodata, ch/croctus] + - [0x1072EF0, .rodata, done/ch/code_2270] + - [0x1072F60, .rodata, code_3030] + - [0x1072F70, .rodata, code_3420] + - [0x1072F90, .rodata, ch/yumblie] + - [0x1072FC0, .rodata, ch/mrvile] + - [0x1073010, .rodata, done/ch/code_6730] + - [0x1073020, .rodata, ch/yellowflibbit] + - [0x1073110, .rodata, done/ch/mudhut] + - [0x1073120, .rodata, done/ch/code_8A60] + - [0x1073130, .rodata, ch/tanktup] + - [0x1073140, .rodata, code_9750] + - [0x1073150, .rodata, ch/leafboat] + - [0x10731B0, .bss, done/ch/code_6730] +- name: RBB + dir: RBB + type: code + start: 0x010731B0 + vram: 0x803863F0 + subsegments: + - [0x10731B0, c, code_0] + - [0x10737F0, c, code_640] + - [0x1073E50, c, code_CA0] + - [0x1074720, c, code_1570] + - [0x1075170, c, code_1FC0] + - [0x1075990, c, code_27E0] + - [0x1075C20, c, code_2A70] + - [0x1076040, c, code_2E90] + - [0x1076660, c, code_34B0] + - [0x1076850, c, code_36A0] + - [0x1076E60, c, code_3CB0] + - [0x10772A0, c, code_40F0] + - [0x1077980, c, code_47D0] + - [0x1077E20, c, code_4C70] + - [0x1078210, c, code_5060] + - [0x10784A0, c, code_52F0] + - [0x1078640, c, code_5490] + - [0x1078C60, c, code_5AB0] + - [0x1078DC0, c, code_5C10] + - [0x10790C0, c, code_5F10] + - [0x1079130, c, code_5F80] + - [0x107AC10, c, code_7A60] + - [0x107ACD0, c, code_7B20] + - [0x107B180, c, code_7FD0] + - [0x107B6D0, c, code_8520] + - [0x107C820, c, code_9670] + - [0x107C9F0, c, code_9840] + - [0x107CBA0, c, code_99F0] + - [0x107CE10, .data, code_0] + - [0x107CE90, .data, code_640] + - [0x107CFC0, .data, code_CA0] + - [0x107D030, .data, code_1570] + - [0x107D140, .data, code_1FC0] + - [0x107D170, .data, code_27E0] + - [0x107D1F0, .data, code_2A70] + - [0x107D2F0, .data, code_2E90] + - [0x107D470, .data, code_34B0] + - [0x107D4A0, .data, code_36A0] + - [0x107D4E0, .data, code_3CB0] + - [0x107D520, .data, code_40F0] + - [0x107D630, .data, code_47D0] + - [0x107D710, .data, code_4C70] + - [0x107D810, .data, code_5060] + - [0x107D840, .data, code_52F0] + - [0x107D870, .data, code_5490] + - [0x107D8A0, .data, code_5AB0] + - [0x107D8D0, .data, code_5C10] + - [0x107D900, .data, code_5F10] + - [0x107D930, .data, code_5F80] + - [0x107DAB0, .data, code_7A60] + - [0x107DAE0, .data, code_7B20] + - [0x107DB10, .data, code_7FD0] + - [0x107DB40, .data, code_8520] + - [0x107DBC0, .data, code_9670] + - [0x107DBF0, .data, code_9840] + - [0x107DC40, .rodata, code_640] + - [0x107DC50, .rodata, code_CA0] + - [0x107DC70, .rodata, code_1570] + - [0x107DCD0, .rodata, code_1FC0] + - [0x107DD30, .rodata, code_2A70] + - [0x107DD40, .rodata, code_34B0] + - [0x107DD50, .rodata, code_36A0] + - [0x107DD70, .rodata, code_3CB0] + - [0x107DD80, .rodata, code_4C70] + - [0x107DD90, .rodata, code_5060] + - [0x107DDB0, .rodata, code_5490] + - [0x107DE80, .rodata, code_5AB0] + - [0x107DE90, .rodata, code_5C10] + - [0x107DEA0, .rodata, code_5F80] + - [0x107DF30, .rodata, code_7B20] + - [0x107DF60, .rodata, code_7FD0] + - [0x107DFB0, .rodata, code_8520] + - [0x107E020, .rodata, code_9670] + - [0x107E030, .bss, code_5F80] + - [0x107E030, .bss, code_8520] + - [0x107E030, .bss, code_8520] + - [0x107E030, .bss, code_9670] + - [0x107E030, .bss, code_99F0] +- name: FP + dir: FP + type: code + start: 0x0107E030 + vram: 0x803863F0 + subsegments: + - [0x107E030, c, code_0] #DONE + - [0x107E500, c, code_4D0] #DONE + - [0x107E7C0, c, code_790] #DONE + - [0x107EA70, c, code_A40] #DONE + - [0x107F220, c, code_11F0] #DONE + - [0x107FA10, c, code_19E0] #DONE + - [0x1080020, c, code_1FF0] #DONE + - [0x1080380, c, code_2350] #DONE + - [0x1081E30, c, code_3E00] #DONE + - [0x1082430, c, code_4400] #DONE + - [0x1082600, c, code_45D0] #DONE + - [0x10827A0, c, code_4770] #DONE + - [0x1083CF0, c, code_5CC0] + - [0x1084B10, c, code_6AE0] #DONE + - [0x10859B0, c, code_7980] #DONE + - [0x1086360, c, code_8330] #DONE + - [0x1086810, c, code_87E0] #DONE + - [0x1086D30, c, code_8D00] #DONE + - [0x1086E50, c, code_8E20] #DONE + - [0x1087B40, c, ch/wozzasjig] #DONE + - [0x1087ED0, c, code_9EA0] #DONE + - [0x10881F0, c, code_A1C0] #DONE + - [0x1088270, c, code_A240] #DONE + - [0x1088530, c, code_A500] #DONE + - [0x10888B0, c, code_A880] #DONE + - [0x1088C00, c, code_ABD0] #DONE + - [0x1089500, c, code_B4D0] #DONE + - [0x1089630, .data, code_0] + - [0x1089680, .data, code_4D0] + - [0x10896D0, .data, code_790] + - [0x1089790, .data, code_A40] + - [0x10897C0, .data, code_11F0] + - [0x1089840, .data, code_19E0] + - [0x1089880, .data, code_1FF0] + - [0x10898C0, .data, code_2350] + - [0x1089A30, .data, code_3E00] + - [0x1089AF0, bin, data_BAC0] + - [0x1089D00, .data, code_6AE0] + - [0x1089FD0, .data, code_7980] + - [0x108A040, bin, data_C010] + - [0x108A0B0, .data, code_87E0] + - [0x108A0E0, .data, code_8D00] + - [0x108A160, bin, data_C130] + - [0x108A300, .data, code_A1C0] + - [0x108A330, .data, code_A240] + - [0x108A370, bin, data_C340] + - [0x108A520, .data, code_ABD0] + - [0x108A7C0, .rodata, code_0] + - [0x108A7D0, .rodata, code_A40] + - [0x108A830, .rodata, code_11F0] + - [0x108A850, .rodata, code_19E0] + - [0x108A860, .rodata, code_1FF0] + - [0x108A870, .rodata, code_2350] + - [0x108A950, .rodata, code_3E00] + - [0x108A970, .rodata, code_4770] + - [0x108A9C0, .rodata, code_5CC0] + - [0x108AA40, .rodata, code_6AE0] + - [0x108AA80, .rodata, code_7980] + - [0x108AAB0, .rodata, code_87E0] + - [0x108AAC0, .rodata, code_8E20] + - [0x108AB10, .rodata, ch/wozzasjig] + - [0x108AB30, .rodata, code_A500] + - [0x108AB40, .rodata, code_A880] +- name: SM + dir: SM + type: code + start: 0x0108AB50 + vram: 0x803863F0 + subsegments: + - [0x108AB50, c, code_0] + - [0x108AC40, c, code_F0] + - [0x108B100, c, code_5B0] + - [0x108B740, c, code_BF0] + - [0x108B8B0, c, ch/attacktutorial] + - [0x108C070, c, ch/vegetables] + - [0x108D450, c, code_2900] + - [0x108D4E0, c, code_2990] + - [0x108EB10, c, code_3FC0] + - [0x108EBC0, c, code_4070] + - [0x108F020, c, code_44D0] + - [0x108F210, c, code_46C0] + - [0x108F220, .data, code_0] + - [0x108F240, .data, code_F0] + - [0x108F250, .data, code_5B0] + - [0x108F350, .data, code_BF0] + - [0x108F380, .data, ch/attacktutorial] + - [0x108F3B0, .data, ch/vegetables] + - [0x108F6C0, .data, code_2990] + - [0x108F750, .data, code_3FC0] + - [0x108F810, .data, code_4070] + - [0x108F840, .data, code_44D0] + - [0x108F870, .rodata, code_5B0] + - [0x108F890, .rodata, ch/attacktutorial] + - [0x108F930, .rodata, ch/vegetables] + - [0x108F960, .rodata, code_2990] + - [0x108FA70, .rodata, code_44D0] + - [0x108FA80, .bss, code_F0] +- name: cutscenes + dir: cutscenes + type: code + start: 0x0108FA80 + vram: 0x803863F0 + subsegments: + - [0x108FA80, c, code_0] + - [0x1095B70, c, code_60F0] #DONE + - [0x10961B0, c, code_6730] #DONE + - [0x1096470, c, code_69F0] #DONE + - [0x1096710, c, code_6C90] #DONE + - [0x10969E0, bin, data_6F60] + - [0x1097320, .data, code_60F0] + - [0x1097D90, .data, code_6730] + - [0x1097E30, .data, code_69F0] + - [0x1097F20, .data, code_6C90] + - [0x1097FC0, .rodata, code_0] + - [0x1098040, .rodata, code_6730] + - [0x1098050, .rodata, code_69F0] + - [0x1098060, .rodata, code_6C90] +- name: lair + dir: lair + type: code + start: 0x01098070 + vram: 0x803863F0 + subsegments: + - [0x1098070, c, code_0] #DONE + - [0x109C310, c, code_42A0] #DONE + - [0x109D6B0, c, code_5640] #DONE + - [0x109DF40, c, code_5ED0] #DONE + - [0x10A0760, c, code_86F0] #DONE + - [0x10A1CB0, c, code_9C40] #DONE + - [0x10A21E0, c, code_A170] #DONE + - [0x10A24A0, c, code_A430] #DONE + - [0x10A2510, c, code_A4A0] #DONE + - [0x10A2880, c, code_A810] #DONE + - [0x10A2DE0, c, code_AD70] #DONE + - [0x10A3C40, c, code_BBD0] #DONE + - [0x10A4230, c, code_C1C0] #DONE + - [0x10A4730, c, code_C6C0] #DONE + - [0x10A4930, bin, data_C8C0] #.data, code_0] + - [0x10A51A0, bin, data_D130] #.data, code_42A0] + - [0x10A5390, .data, code_5640] + - [0x10A53E0, bin, data_D370] #.data, code_5ED0] + - [0x10A6430, .data, code_86F0] + - [0x10A64E0, .data, code_9C40] + - [0x10A6560, .data, code_A170] + - [0x10A6600, .data, code_A430] + - [0x10A6630, .data, code_A4A0] + - [0x10A6700, .data, code_A810] + - [0x10A6730, .data, code_AD70] + - [0x10A6860, .data, code_BBD0] + - [0x10A6940, .data, code_C1C0] + - [0x10A69A0, .data, code_C6C0] + - [0x10A69D0, .rodata, code_0] + - [0x10A6C80, .rodata, code_42A0] + - [0x10A6D10, .rodata, code_5640] + - [0x10A6D40, .rodata, code_5ED0] + - [0x10A6E50, .rodata, code_86F0] + - [0x10A6EC0, .rodata, code_9C40] + - [0x10A6EF0, .rodata, code_A4A0] + - [0x10A6F30, .rodata, code_A810] + - [0x10A6F50, .rodata, code_AD70] + - [0x10A6F70, .rodata, code_BBD0] + - [0x10A6FB0, .rodata, code_C1C0] + - [0x10A6FC0, .rodata, code_C6C0] + - [0x10A6FD0, .bss, code_0] +- name: fight + dir: fight + type: code + start: 0x010A6FD0 + vram: 0x803863F0 + subsegments: + - [0x10A6FD0, c, code_0] #DONE + - [0x10A7150, c, chfinalboss] + - [0x10ACEA0, c, chbossjinjo] #DONE + - [0x10ADE60, c, chbossjinjobase] #DONE + - [0x10AE550, c, chstonejinjo] #DONE + - [0x10AEBB0, c, chjinjonatorbase] #DONE + - [0x10AF360, c, chspellbarrier] #DONE + - [0x10AF770, c, chspellfireball] #DONE + - [0x10B0820, c, code_9850] #DONE + - [0x10B0D10, c, chjinjonator] #DONE + - [0x10B1EA0, c, chbossshadow] #DONE + - [0x10B1F60, .data, chfinalboss] + - [0x10B23F0, .data, chbossjinjo] + - [0x10B2570, .data, chbossjinjobase] + - [0x10B25D0, .data, chstonejinjo] + - [0x10B2620, .data, chjinjonatorbase] + - [0x10B26B0, .data, chspellbarrier] + - [0x10B26E0, .data, chspellfireball] + - [0x10B29A0, .data, code_9850] + - [0x10B2B90, .data, chjinjonator] + - [0x10B2C70, .data, chbossshadow] + - [0x10B2CA0, .rodata, chfinalboss] + - [0x10B3060, .rodata, chbossjinjo] + - [0x10B3110, .rodata, chbossjinjobase] + - [0x10B3120, .rodata, chstonejinjo] + - [0x10B3160, .rodata, chjinjonatorbase] + - [0x10B3190, .rodata, chspellbarrier] + - [0x10B31A0, .rodata, chspellfireball] + - [0x10B31F0, .rodata, code_9850] + - [0x10B3200, .rodata, chjinjonator] + - [0x10B3310, .rodata, chbossshadow] + - [0x10B3320, .bss, code_0] + - [0x10B3320, .bss, chfinalboss] + - [0x10B3320, .bss, chspellfireball] + - [0x10B3320, .bss, chjinjonator] +- name: CCW + dir: CCW + type: code + start: 0x010B3320 + vram: 0x803863F0 + subsegments: + - [0x10B3320, c, code_0] #DONE + - [0x10B3480, c, code_160] #DONE + - [0x10B3C70, c, code_950] #DONE + - [0x10B47D0, c, code_14B0] #DONE + - [0x10B4E40, c, code_1B20] #DONE + - [0x10B54C0, c, code_21A0] #DONE + - [0x10B5590, c, code_2270] #DONE + - [0x10B5E20, c, code_2B00] #DONE + - [0x10B6370, c, code_3050] #DONE + - [0x10B6630, c, code_3310] #DONE + - [0x10B70C0, c, code_3DA0] #DONE + - [0x10B7850, c, code_4530] #DONE + - [0x10B7C80, c, code_4960] #DONE + - [0x10B8020, c, code_4D00] #DONE + - [0x10B83F0, c, code_50D0] #DONE + - [0x10B8860, c, code_5540] #DONE + - [0x10B8F10, c, code_5BF0] #DONE + - [0x10B9500, c, code_61E0] #DONE + - [0x10B9940, c, code_6620] #DONE + - [0x10B9DE0, c, code_6AC0] #DONE + - [0x10BA1E0, c, code_6EC0] #DONE + - [0x10BA440, c, code_7120] #DONE + - [0x10BA890, c, code_7570] #DONE + - [0x10BA9E0, c, code_76C0] #DONE + - [0x10BAEE0, c, code_7BC0] #DONE + - [0x10BAF10, c, code_7BF0] #DONE + - [0x10BB370, c, code_8050] #DONE + - [0x10BB990, c, code_8670] #DONE + - [0x10BBA80, .data, code_0] + - [0x10BBAD0, .data, code_160] + - [0x10BBB00, .data, code_950] + - [0x10BBB30, .data, code_14B0] + - [0x10BBB70, .data, code_1B20] + - [0x10BBBD0, .data, code_21A0] + - [0x10BBC00, .data, code_2270] + - [0x10BBC40, .data, code_2B00] + - [0x10BBDA0, .data, code_3050] + - [0x10BBDD0, .data, code_3310] + - [0x10BC090, .data, code_3DA0] + - [0x10BC0C0, .data, code_4530] + - [0x10BC160, .data, code_4960] + - [0x10BC1A0, .data, code_4D00] + - [0x10BC230, .data, code_50D0] + - [0x10BC280, .data, code_5540] + - [0x10BC2B0, .data, code_5BF0] + - [0x10BC390, .data, code_61E0] + - [0x10BC3C0, .data, code_6620] + - [0x10BC400, .data, code_6AC0] + - [0x10BC530, .data, code_6EC0] + - [0x10BC570, .data, code_7120] + - [0x10BC620, .data, code_7570] + - [0x10BC650, .data, code_76C0] + - [0x10BC7E0, .data, code_7BC0] + - [0x10BC820, .data, code_7BF0] + - [0x10BC860, .data, code_8050] + - [0x10BC930, .data, code_8670] + - [0x10BC960, .rodata, code_160] + - [0x10BC980, .rodata, code_950] + - [0x10BC9E0, .rodata, code_1B20] + - [0x10BCA10, .rodata, code_2270] + - [0x10BCA40, .rodata, code_2B00] + - [0x10BCA70, .rodata, code_3310] + - [0x10BCA90, .rodata, code_3DA0] + - [0x10BCAD0, .rodata, code_4530] + - [0x10BCB10, .rodata, code_4960] + - [0x10BCB20, .rodata, code_4D00] + - [0x10BCB50, .rodata, code_50D0] + - [0x10BCB90, .rodata, code_5540] + - [0x10BCBB0, .rodata, code_5BF0] + - [0x10BCBF0, .rodata, code_61E0] + - [0x10BCC10, .rodata, code_6620] + - [0x10BCC20, .rodata, code_6AC0] + - [0x10BCC40, .rodata, code_76C0] + - [0x10BCC50, .rodata, code_7BF0] + - [0x10BCC60, .rodata, code_8050] + - [0x10BCD00, .bss, code_3310] +- [0x010BCD00, bin, emptyLvl.us.v10.rzip] +- [0x010BCD10, bin, trailer] # 0x00 to end +- [0x010BCD20] # end of ROM diff --git a/first_diff.py b/first_diff.py new file mode 100755 index 00000000..5f849d19 --- /dev/null +++ b/first_diff.py @@ -0,0 +1,255 @@ +#!/usr/bin/env python3 + +import os.path +import argparse +from subprocess import check_call + +parser = argparse.ArgumentParser( + description="Find the first difference(s) between the built ROM and the base ROM." +) +parser.add_argument( + "-c", + "--count", + type=int, + default=5, + help="find up to this many instruction difference(s)", +) +parser.add_argument( + "-d", + "--diff", + dest="diff_args", + nargs="?", + action="store", + default=False, + const="prompt", + help="run diff.py on the result with the provided arguments" +) +parser.add_argument( + "-m", "--make", help="run ninja before finding difference(s)", action="store_true" +) +args = parser.parse_args() + +diff_count = args.count + +if args.make: + check_call(["make"]) + +baseimg = f"decompressed.us.v10.z64" +basemap = f"decompressed.map" + +myimg = f"build/us.v10/banjo.us.v10.z64" +mymap = f"build/us.v10/banjo.us.v10.map" + +if not os.path.isfile(baseimg): + print(f"{baseimg} must exist.") + exit(1) +if not os.path.isfile(myimg) or not os.path.isfile(mymap): + print(f"{myimg} and {mymap} must exist.") + exit(1) + +mybin = open(myimg, "rb").read() +basebin = open(baseimg, "rb").read() + +# if len(mybin) != len(basebin): +# print("Modified ROM has different size...") +# exit(1) + +if mybin == basebin: + print("No differences!") + exit(0) + + +def search_rom_address(target_addr): + ram_offset = None + prev_ram = 0 + prev_rom = 0 + prev_sym = "" + cur_file = "" + prev_file = cur_file + prev_line = "" + with open(mymap) as f: + for line in f: + if "load address" in line: + # Ignore .bss sections since we're looking for a ROM address + if ".bss" in line or ".bss" 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 + sym = line.split()[-1] + + if "0x" in sym: + ram_offset = None + continue + if "/" in sym: + cur_file = sym + continue + + if rom > target_addr: + return f"{prev_sym} (RAM 0x{prev_ram:X}, ROM 0x{prev_rom:X}, {prev_file})" + + prev_ram = ram + prev_rom = rom + prev_sym = sym + prev_file = cur_file + + return "at end of rom?" + + +def parse_map(map_fname): + ram_offset = None + cur_file = "" + syms = {} + prev_sym = None + prev_line = "" + with open(map_fname) as f: + for line in f: + if "load address" in line: + 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 + sym = line.split()[-1] + + if "0x" in sym: + ram_offset = None + continue + elif "/" in sym: + cur_file = sym + continue + + syms[sym] = (rom, cur_file, prev_sym, ram) + prev_sym = sym + + return syms + + +def map_diff(): + map1 = parse_map(mymap) + map2 = parse_map(basemap) + min_ram = None + found = None + for sym, addr in map1.items(): + if sym not in map2: + continue + if addr[0] != map2[sym][0]: + if min_ram is None or addr[0] < min_ram: + min_ram = addr[0] + found = (sym, addr[1], addr[2]) + if min_ram is None: + return False + else: + print( + f"Map appears to have shifted just before {found[0]} ({found[1]}) -- in {found[2]}?" + ) + if found[2] is not None and found[2] not in map2: + print( + f"(Base map file {basemap} out of date due to new or renamed symbols, so result may be imprecise.)" + ) + return True + + +def hexbytes(bs): + return ":".join("{:02X}".format(c) for c in bs) + + +found_instr_diff = [] +map_search_diff = [] +diffs = 0 +shift_cap = 1000 +for i in range(24, len(mybin), 4): + # (mybin[i:i+4] != basebin[i:i+4], but that's slightly slower in CPython...) + if diffs <= shift_cap and ( + mybin[i] != basebin[i] + or mybin[i + 1] != basebin[i + 1] + or mybin[i + 2] != basebin[i + 2] + or mybin[i + 3] != basebin[i + 3] + ): + if diffs == 0: + print(f"First difference at ROM addr 0x{i:X}, {search_rom_address(i)}") + print( + f"Bytes: {hexbytes(mybin[i : i + 4])} vs {hexbytes(basebin[i : i + 4])}" + ) + diffs += 1 + if ( + len(found_instr_diff) < diff_count + and mybin[i] >> 2 != basebin[i] >> 2 + and not search_rom_address(i) in map_search_diff + ): + found_instr_diff.append(i) + map_search_diff.append(search_rom_address(i)) + +if diffs == 0: + print("No differences but ROMs differ?") + exit() + +if len(found_instr_diff) > 0: + for i in found_instr_diff: + print(f"Instruction difference at ROM addr 0x{i:X}, {search_rom_address(i)}") + print( + f"Bytes: {hexbytes(mybin[i : i + 4])} vs {hexbytes(basebin[i : i + 4])}" + ) +print() + +definite_shift = diffs > shift_cap +if definite_shift: + print(f"Over {shift_cap} differing words, must be a shifted ROM.") +else: + print(f"{diffs} differing word(s).") + +if diffs > 100: + if not os.path.isfile(basemap): + print( + f"To find ROM shifts, copy a clean .map file to {basemap} and rerun this script." + ) + elif not map_diff(): + print(f"No ROM shift{' (!?)' if definite_shift else ''}") + +if args.diff_args: + if len(found_instr_diff) < 1: + print(f"No instruction difference to run diff.py on") + exit() + + diff_sym = search_rom_address(found_instr_diff[0]).split()[0] + if args.diff_args == "prompt": + diff_args = input("Call diff.py with which arguments? ") or "--" + else: + diff_args = args.diff_args + if diff_args[0] != "-": + diff_args = "-" + diff_args + check_call( + [ + "python3", + "diff.py", + diff_args, + diff_sym, + ] + ) diff --git a/include/2.0L/PR/ultraerror.h b/include/2.0L/PR/ultraerror.h index b05b24a6..6b0893df 100644 --- a/include/2.0L/PR/ultraerror.h +++ b/include/2.0L/PR/ultraerror.h @@ -77,7 +77,7 @@ extern "C" { #define ERR_OSCREATEPIMANAGER 35 #define ERR_OSVIGETCURRENTMODE 36 #define ERR_OSVIGETCURRENTFRAMEBUFFER 37 -#define ERR_OSVIGETNEXTFRAMEBUFFER 38 +#define ERR_osViGetNextFramebuffer 38 #define ERR_OSVISETXSCALE_VALUE 39 #define ERR_OSVISETXSCALE_VIMGR 40 #define ERR_OSVISETYSCALE_VALUE 41 diff --git a/include/n_synth.h b/include/n_synth.h index f8a33679..c6bb2d37 100644 --- a/include/n_synth.h +++ b/include/n_synth.h @@ -155,7 +155,7 @@ void _n_collectPVoices(); s32 _n_timeToSamples(s32 micros); ALMicroTime _n_samplesToTime(s32 samples); -int n_alEnvmixerResampleParam(N_PVoice *v, s32 paramId, void* param); +int n_alEnvmixerParam(N_PVoice *v, s32 paramId, void* param); //n_alLoadParam int n_alLoadParam(N_PVoice *v, s32 paramId, void* param); #endif diff --git a/include/seqp.h b/include/seqp.h index c9ab02ba..c481f9c8 100755 --- a/include/seqp.h +++ b/include/seqp.h @@ -10,28 +10,28 @@ #define MAX(a,b) (((a)>(b))?(a):(b)) #endif -ALVoiceState *__mapVoice(ALSeqPlayer *, u8, u8, u8); -void __unmapVoice(ALSeqPlayer *seqp, ALVoice *voice); -char __voiceNeedsNoteKill(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime killTime); /* sct 1/5/96 */ +ALVoiceState *__n_mapVoice(ALSeqPlayer *, u8, u8, u8); +void __n_unmapVoice(ALSeqPlayer *seqp, ALVoice *voice); +char __n_voiceNeedsNoteKill(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime killTime); /* sct 1/5/96 */ -ALVoiceState *__lookupVoice(ALSeqPlayer *, u8, u8); +ALVoiceState *__n_lookupVoice(ALSeqPlayer *, u8, u8); ALSound *__lookupSound(ALSeqPlayer *, u8, u8, u8); -ALSound *__lookupSoundQuick(ALSeqPlayer *, u8, u8, u8); +ALSound *__n_lookupSoundQuick(ALSeqPlayer *, u8, u8, u8); -s16 __vsVol(ALVoiceState *voice, ALSeqPlayer *seqp); -ALMicroTime __vsDelta(ALVoiceState *voice, ALMicroTime t); -ALPan __vsPan(ALVoiceState *voice, ALSeqPlayer *seqp); +s16 __n_vsVol(ALVoiceState *voice, ALSeqPlayer *seqp); +ALMicroTime __n_vsDelta(ALVoiceState *voice, ALMicroTime t); +ALPan __n_vsPan(ALVoiceState *voice, ALSeqPlayer *seqp); -void __initFromBank(ALSeqPlayer *seqp, ALBank *b); -void __initChanState(ALSeqPlayer *seqp); +void __n_initFromBank(ALSeqPlayer *seqp, ALBank *b); +void __n_initChanState(ALSeqPlayer *seqp); void __resetPerfChanState(ALSeqPlayer *seqp, s32 chan); -void __setInstChanState(ALSeqPlayer *seqp, ALInstrument *inst, s32 chan); +void __n_setInstChanState(ALSeqPlayer *seqp, ALInstrument *inst, s32 chan); void __seqpPrintVoices(ALSeqPlayer *); -void __seqpReleaseVoice(ALSeqPlayer *seqp, ALVoice *voice, +void __n_seqpReleaseVoice(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime deltaTime); -void __seqpStopOsc(ALSeqPlayer *seqp, ALVoiceState *vs); +void __n_seqpStopOsc(ALSeqPlayer *seqp, ALVoiceState *vs); void __postNextSeqEvent(ALSeqPlayer *seqp); /* sct 11/7/95 */ diff --git a/rzip_dummy_addrs.txt b/rzip_dummy_addrs.txt new file mode 100644 index 00000000..9baca249 --- /dev/null +++ b/rzip_dummy_addrs.txt @@ -0,0 +1,32 @@ +boot_core1_us_v10_rzip_ROM_START = 0xF19250; +boot_core1_us_v10_rzip_ROM_END = 0xF37F90; +boot_core2_us_v10_rzip_ROM_START = 0xF37F90; +boot_core2_us_v10_rzip_ROM_END = 0xFA3FD0; +boot_CC_us_v10_rzip_ROM_START = 0xFA3FD0; +boot_CC_us_v10_rzip_ROM_END = 0xFA5F50; +boot_MMM_us_v10_rzip_ROM_START = 0xFA5F50; +boot_MMM_us_v10_rzip_ROM_END = 0xFA9150; +boot_GV_us_v10_rzip_ROM_START = 0xFA9150; +boot_GV_us_v10_rzip_ROM_END = 0xFAE860; +boot_TTC_us_v10_rzip_ROM_START = 0xFAE860; +boot_TTC_us_v10_rzip_ROM_END = 0xFB24A0; +boot_MM_us_v10_rzip_ROM_START = 0xFB24A0; +boot_MM_us_v10_rzip_ROM_END = 0xFB44E0; +boot_BGS_us_v10_rzip_ROM_START = 0xFB44E0; +boot_BGS_us_v10_rzip_ROM_END = 0xFB9A30; +boot_RBB_us_v10_rzip_ROM_START = 0xFB9A30; +boot_RBB_us_v10_rzip_ROM_END = 0xFBEBE0; +boot_FP_us_v10_rzip_ROM_START = 0xFBEBE0; +boot_FP_us_v10_rzip_ROM_END = 0xFC4810; +boot_CCW_us_v10_rzip_ROM_START = 0xFD6190; +boot_CCW_us_v10_rzip_ROM_END = 0xFDAA10; +boot_SM_us_v10_rzip_ROM_START = 0xFC4810; +boot_SM_us_v10_rzip_ROM_END = 0xFC6F20; +boot_cutscenes_us_v10_rzip_ROM_START = 0xFC6F20; +boot_cutscenes_us_v10_rzip_ROM_END = 0xFC9150; +boot_lair_us_v10_rzip_ROM_START = 0xFC9150; +boot_lair_us_v10_rzip_ROM_END = 0xFD0420; +boot_fight_us_v10_rzip_ROM_START = 0xFD0420; +boot_fight_us_v10_rzip_ROM_END = 0xFD6190; +boot_emptyLvl_us_v10_rzip_ROM_START = 0xFDAA10; +boot_emptyLvl_us_v10_rzip_ROM_END = 0xFDAA30; diff --git a/src/BGS/ch/croctus.c b/src/BGS/ch/croctus.c index 1b94995f..28a338c8 100644 --- a/src/BGS/ch/croctus.c +++ b/src/BGS/ch/croctus.c @@ -218,7 +218,7 @@ void func_80387FD4(Actor *this){ } } -void bgs_func_803885DC(void){ +void BGS_func_803885DC(void){ s32 i; for(i = 0; i<5; i++) bgs_D_803907B8[i] = 0; diff --git a/src/BGS/ch/flibbit.c b/src/BGS/ch/flibbit.c index 472d5724..45bd61c4 100644 --- a/src/BGS/ch/flibbit.c +++ b/src/BGS/ch/flibbit.c @@ -33,7 +33,7 @@ ActorInfo D_80390690 = { f32 D_803906B4[3] = {0.0f, 0.0f, 0.0f}; /* .code */ -bool func_803863F0(Actor *this, f32 arg1[3], s32 arg2){ +bool BGS_func_803863F0(Actor *this, f32 arg1[3], s32 arg2){ ActorLocal_Flibbit *local = (ActorLocal_Flibbit *)&this->local; @@ -73,7 +73,7 @@ bool func_80386564(Actor *this){ sp30[1] = sp3C[1] + this->position_y; sp30[2] = sp3C[2] + this->position_z; if(func_80329210(this, sp30)) - return func_803863F0(this, sp30, 1); + return BGS_func_803863F0(this, sp30, 1); } } return 0; @@ -109,7 +109,7 @@ s32 func_803866A4(Actor *this) { sp3C[2] = (f32) local->unkE[2]; } if (func_80329210(this, sp3C) != 0) { - return func_803863F0(this, sp3C, 0); + return BGS_func_803863F0(this, sp3C, 0); } } return 0; @@ -143,7 +143,7 @@ bool func_8038686C(Actor *this) { sp68[1] += this->position[1]; sp68[2] += this->position[2]; if (func_80329210(this, sp68)) { - return func_803863F0(this, sp68, 0); + return BGS_func_803863F0(this, sp68, 0); } } return FALSE; @@ -242,7 +242,7 @@ void func_80386AEC(Actor *this, s32 next_state) { } -void func_80386E30(ActorMarker *this, ActorMarker *other){ +void BGS_func_80386E30(ActorMarker *this, ActorMarker *other){ Actor *thisActor = marker_getActor(this); if(thisActor->state < 6){ func_80386AEC(thisActor, 4); @@ -325,7 +325,7 @@ void chflibbit_update(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = TRUE; - marker_setCollisionScripts(this->marker, func_80386E30, func_80386E70, func_80386EB0); + marker_setCollisionScripts(this->marker, BGS_func_80386E30, func_80386E70, func_80386EB0); local->unk1C[0] = randf2(-2.0f, -1.0f); local->unk1C[1] = randf2(-2.0f, -1.0f); diff --git a/src/BGS/ch/mrvile.c b/src/BGS/ch/mrvile.c index 9161c877..ad5c5bcd 100644 --- a/src/BGS/ch/mrvile.c +++ b/src/BGS/ch/mrvile.c @@ -89,7 +89,7 @@ void func_8038BB40(ActorMarker * arg0){ } } -void func_8038BBA0(Actor *this, s32 arg1){ +void BGS_func_8038BBA0(Actor *this, s32 arg1){ ActorLocal_MrVile *local; local = (ActorLocal_MrVile *)&this->local; @@ -138,7 +138,7 @@ void func_8038BD84(Actor *this){ local->unk28[0] = 0.0f; local->unk28[1] = 0.0f; local->unk28[2] = 0.0f; - func_8038BBA0(this, 101); + BGS_func_8038BBA0(this, 101); } void func_8038BDD4(Actor *this) { @@ -200,26 +200,26 @@ void func_8038C0C8(Actor * this, s32 next_state){ local = (ActorLocal_MrVile *)&this->local; if(next_state == 1) - func_8038BBA0(this, 101); + BGS_func_8038BBA0(this, 101); if(next_state == 2) - func_8038BBA0(this, 101); + BGS_func_8038BBA0(this, 101); if(next_state == 3) - func_8038BBA0(this, 102); + BGS_func_8038BBA0(this, 102); if(next_state == 4) - func_8038BBA0(this, 102); + BGS_func_8038BBA0(this, 102); if(next_state == 5){ local->target_position[0] = local->target_position[1] = local->target_position[2] = 0.0f; - func_8038BBA0(this, 102); + BGS_func_8038BBA0(this, 102); } if(next_state == 6){ local->target_position[0] = local->target_position[1] = local->target_position[2] = 0.0f; local->unk24 = 300.0f; - func_8038BBA0(this, 102); + BGS_func_8038BBA0(this, 102); } this->state = next_state; @@ -269,7 +269,7 @@ bool func_8038C2A8(ActorMarker *marker) { } -bool func_8038C338(ActorMarker *marker){ +bool BGS_func_8038C338(ActorMarker *marker){ Actor *this; this = marker_getActor(marker); @@ -312,14 +312,14 @@ void func_8038C408(ActorMarker *marker){ func_8038C0C8(this, 5); } -void func_8038C434(ActorMarker *marker){ +void BGS_func_8038C434(ActorMarker *marker){ Actor *this; this = marker_getActor(marker); func_8038C0C8(this, 6); } -void func_8038C460(ActorMarker *arg0){ +void BGS_func_8038C460(ActorMarker *arg0){ func_8038C0C8(marker_getActor(arg0), 1); } @@ -394,22 +394,22 @@ void chvile_update(Actor *this) { func_80258A4C(this->position, this->yaw - 90.0f, local->target_position, &sp70, &sp6C, &sp68); if (local->unkC == 102) { if ((-0.8 < sp68) && (sp68 < 0.8) && (sp70 <= 150.0f) && var_v1) { - func_8038BBA0(this, 103); + BGS_func_8038BBA0(this, 103); } } if (local->unkC == 103) { if (sp70 <= 50.0f) { if (chvilegame_cpu_consume_piece(local->game_marker, local->target_position)) { - func_8038BBA0(this, 104); + BGS_func_8038BBA0(this, 104); } else { - func_8038BBA0(this, 102); + BGS_func_8038BBA0(this, 102); } } else if (func_80335794(this->unk148) >= 3) { - func_8038BBA0(this, 102); + BGS_func_8038BBA0(this, 102); } } if ((local->unkC == 104) && (func_80335794(this->unk148) >= 3)) { - func_8038BBA0(this, 102); + BGS_func_8038BBA0(this, 102); } } } @@ -417,7 +417,7 @@ void chvile_update(Actor *this) { player_getPosition(local->target_position); local->unk10 = 500.0f; if ((local->unkC == 102) && (ml_vec3f_distance(this->position, local->target_position) < 200.0f)) { - func_8038BBA0(this, 103); + BGS_func_8038BBA0(this, 103); } if ((local->unkC == 103) && (func_80335794(this->unk148) >= 2)) { func_8038C0C8(this, 1); diff --git a/src/BGS/ch/tanktup.c b/src/BGS/ch/tanktup.c index 6ebd2269..78a67d11 100644 --- a/src/BGS/ch/tanktup.c +++ b/src/BGS/ch/tanktup.c @@ -21,14 +21,14 @@ enum chtanktup_leg_e { TANKTUP_LEG_BACK_RIGHT, }; -ActorAnimationInfo D_80390C20[] = { +ActorAnimationInfo BGS_D_80390C20[] = { {0, 0.0f}, {0x101, 7.5f}, {0x102, 1.75f}, {0x107, 1.75f} }; -ActorInfo D_80390C40 = {MARKER_6C_TANKTUP, ACTOR_E8_TANKTUP, ASSET_3EE_TANKTUP, 0x01, D_80390C20, +ActorInfo D_80390C40 = {MARKER_6C_TANKTUP, ACTOR_E8_TANKTUP, ASSET_3EE_TANKTUP, 0x01, BGS_D_80390C20, func_8038F6A4, func_80326224, func_80325888, 0, 0x80, 0.0f, 0 }; diff --git a/src/BGS/ch/yellowflibbit.c b/src/BGS/ch/yellowflibbit.c index ba676084..f758037f 100644 --- a/src/BGS/ch/yellowflibbit.c +++ b/src/BGS/ch/yellowflibbit.c @@ -18,17 +18,17 @@ typedef struct { }ActorLocal_Yellow_Flibbit; Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx** vtx); -void func_8038E034(Actor *this); +void BGS_func_8038E034(Actor *this); /* .data */ -ActorInfo D_80390AE0 = { +ActorInfo BGS_D_80390AE0 = { MARKER_C5_FLIBBIT_YELLOW, ACTOR_137_FLIBBIT_YELLOW, ASSET_385_MODEL_FLIBBIT_YELLOW, 0, NULL, - func_8038E034, NULL, func_8038DE5C, + BGS_func_8038E034, NULL, func_8038DE5C, 0, 0, 1.0f, 0 }; s32 D_80390B04[3] = {0xFF, 0xB3, 0}; -f32 D_80390B10[3] = {0.0f, 0.0f, 0.0f}; +f32 BGS_D_80390B10[3] = {0.0f, 0.0f, 0.0f}; /* .code */ void func_8038D1E0(Actor *this) { @@ -325,7 +325,7 @@ Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { return this; } -void func_8038E034(Actor *this) { +void BGS_func_8038E034(Actor *this) { f32 spB4[3]; f32 spA8[3]; f32 spA4; @@ -365,7 +365,7 @@ void func_8038E034(Actor *this) { } if (!local->unk2) { local->unk2 = TRUE; - func_8038CED0(); + BGS_func_8038CED0(); } player_getPosition(spB4); spA8[0] = spB4[0] - this->position[0]; @@ -446,7 +446,7 @@ void func_8038E034(Actor *this) { sp60[0] = (f32) (local->unkA[0] - local->unk4[0]); sp60[1] = (f32) (local->unkA[1] - local->unk4[1]); sp60[2] = (f32) (local->unkA[2] - local->unk4[2]); - func_80258A4C(D_80390B10, this->yaw - 90.0f, sp60, &sp74, &sp70, &sp6C); + func_80258A4C(BGS_D_80390B10, this->yaw - 90.0f, sp60, &sp74, &sp70, &sp6C); this->yaw += sp6C * 220.0f * sp9C; } } diff --git a/src/BGS/code_3030.c b/src/BGS/code_3030.c index 006f2331..50b6cf5f 100644 --- a/src/BGS/code_3030.c +++ b/src/BGS/code_3030.c @@ -10,15 +10,15 @@ typedef struct{ }ActorLocal_BGS_3030; void func_80389668(Actor *this); -Actor *func_80389610(ActorMarker *marker, Gfx **, Mtx **, Vtx**); +Actor *BGS_func_80389610(ActorMarker *marker, Gfx **, Mtx **, Vtx**); /* .data */ -ActorInfo D_80390880 = { MARKER_19B_CHOIR_TURTLE_YELLOW, ACTOR_27B_CHOIR_TURTLE_YELLOW, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0}; -ActorInfo D_803908A4 = { MARKER_19C_CHOIR_TURTLE_CYAN, ACTOR_27C_CHOIR_TURTLE_CYAN, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0}; -ActorInfo D_803908C8 = { MARKER_19D_CHOIR_TURTLE_BLUE, ACTOR_27D_CHOIR_TURTLE_BLUE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0}; -ActorInfo D_803908EC = { MARKER_19E_CHOIR_TURTLE_RED, ACTOR_27E_CHOIR_TURTLE_RED, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0}; -ActorInfo D_80390910 = { MARKER_19F_CHOIR_TURTLE_PINK, ACTOR_27F_CHOIR_TURTLE_PINK, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0}; -ActorInfo D_80390934 = { MARKER_1A0_CHOIR_TURTLE_PURPLE, ACTOR_280_CHOIR_TURTLE_PURPLE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0}; +ActorInfo D_80390880 = { MARKER_19B_CHOIR_TURTLE_YELLOW, ACTOR_27B_CHOIR_TURTLE_YELLOW, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0}; +ActorInfo D_803908A4 = { MARKER_19C_CHOIR_TURTLE_CYAN, ACTOR_27C_CHOIR_TURTLE_CYAN, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0}; +ActorInfo D_803908C8 = { MARKER_19D_CHOIR_TURTLE_BLUE, ACTOR_27D_CHOIR_TURTLE_BLUE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0}; +ActorInfo D_803908EC = { MARKER_19E_CHOIR_TURTLE_RED, ACTOR_27E_CHOIR_TURTLE_RED, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0}; +ActorInfo D_80390910 = { MARKER_19F_CHOIR_TURTLE_PINK, ACTOR_27F_CHOIR_TURTLE_PINK, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0}; +ActorInfo D_80390934 = { MARKER_1A0_CHOIR_TURTLE_PURPLE, ACTOR_280_CHOIR_TURTLE_PURPLE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0}; /* .code */ void func_80389420(ActorMarker *marker) { @@ -60,7 +60,7 @@ void func_803895D0(ActorMarker *marker, ActorMarker *other_marker){ } } -Actor *func_80389610(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { +Actor *BGS_func_80389610(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { func_8033A45C(4, marker->unk14_20 - 0x19A); return func_80325888(marker, gfx, mtx, vtx); } diff --git a/src/BGS/code_3420.c b/src/BGS/code_3420.c index 31b711b7..5147e761 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -41,11 +41,11 @@ enum asset_e D_80390984[] = { 0, 0xC66, 0xC68, 0xC6A, 0xC92, 0xC93, 0xC94, enum asset_e D_803909A4[] = { 0, 0xC67, 0xC69, 0, 0xC95, 0xC96, 0xC97}; enum asset_e D_803909C0[] = { 0, 0xC6E, 0xC6F, 0, 0xC95, 0xC96, 0xC97}; enum asset_e D_803909DC[] = {0xC65, 0xC65, 0xC65, 0xC8F, 0, 0, 0}; -enum asset_e D_803909F8[] = {0xC64, 0, 0, 0xC8E, 0, 0, 0, 0}; +enum asset_e BGS_D_803909F8[] = {0xC64, 0, 0, 0xC8E, 0, 0, 0, 0}; enum asset_e D_80390A18[] = {0xC6D, 0xC70, 0xC71, 0xC8E, 0, 0, 0, 0}; /* .code */ -bool func_80389810(f32 arg0[3]) { +bool BGS_func_80389810(f32 arg0[3]) { if (func_8028ECAC() != BSGROUP_7_CROC_ATTACK) { return FALSE; } @@ -53,7 +53,7 @@ bool func_80389810(f32 arg0[3]) { return TRUE; } -void func_80389850(Actor *this, s32 arg1) { +void BGS_func_80389850(Actor *this, s32 arg1) { ActorLocal_BGS_3420 *local; Actor *vile; f32 sp94[3]; @@ -158,11 +158,11 @@ void func_80389C58(ActorMarker *marker) { this = marker_getActor(marker); local = (ActorLocal_BGS_3420 *)&this->local; - func_80389850(this, 0); + BGS_func_80389850(this, 0); func_80311480(D_80390984[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, func_80389BF8, NULL); } -void func_80389CD8(ActorMarker *marker, enum asset_e text_id, s32 arg2){ +void BGS_func_80389CD8(ActorMarker *marker, enum asset_e text_id, s32 arg2){ Actor *this; this = marker_getActor(marker); @@ -177,11 +177,11 @@ void func_80389D20(ActorMarker *marker) { this = marker_getActor(marker); local = (ActorLocal_BGS_3420 *)&this->local; - func_80389850(this, 0); + BGS_func_80389850(this, 0); if (local->unkC == local->unkD) { - func_80311480(D_803909A4[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, func_80389CD8, NULL); + func_80311480(D_803909A4[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, BGS_func_80389CD8, NULL); } else { - func_80311480(D_803909C0[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, func_80389CD8, NULL); + func_80311480(D_803909C0[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, BGS_func_80389CD8, NULL); } func_80347A14(0); } @@ -202,7 +202,7 @@ void func_80389E40(ActorMarker *marker) { this = marker_getActor(marker); local = (ActorLocal_BGS_3420 *)&this->local; - func_80389850(this, 1); + BGS_func_80389850(this, 1); func_80311480(0xC6B, 0xF, func_8038C284(local->vile_marker), this->marker, func_80389DF8, NULL); } @@ -227,7 +227,7 @@ void func_80389F08(ActorMarker *marker) { this = marker_getActor(marker); local = (ActorLocal_BGS_3420 *)&this->local; - func_80389850(this, 0); + BGS_func_80389850(this, 0); var_s2 = func_80326F58(0x49); vile = marker_getActor(local->vile_marker); if (var_s2 > 0) { @@ -278,7 +278,7 @@ void func_8038A068(Actor *this, s32 next_state) { } if (next_state == 4) { if (local->unkC == local->unkD) { - func_80311480(D_803909F8[local->unkC], 0xE | ((D_803909F8[local->unkC] == 0xC8E) ? 1 : 0) | 0xE, func_8038C284(local->vile_marker), this->marker, func_80389BC8, NULL); + func_80311480(BGS_D_803909F8[local->unkC], 0xE | ((BGS_D_803909F8[local->unkC] == 0xC8E) ? 1 : 0) | 0xE, func_8038C284(local->vile_marker), this->marker, func_80389BC8, NULL); } else { func_80311480(D_80390A18[local->unkC], 0xF , func_8038C284(local->vile_marker), this->marker, func_80389BC8, NULL); } @@ -290,7 +290,7 @@ void func_8038A068(Actor *this, s32 next_state) { local->unkD = local->unkC; } if (local->unkC == 7) { - func_8038C434(local->vile_marker); + BGS_func_8038C434(local->vile_marker); } else { local->current_type = YUMBLIE; local->player_score = 0; @@ -315,7 +315,7 @@ void func_8038A068(Actor *this, s32 next_state) { func_8038A044(); } } - func_8038C460(local->vile_marker); + BGS_func_8038C460(local->vile_marker); func_80347A14(1); } if (next_state == 6) { @@ -363,7 +363,7 @@ void chvilegame_player_consume_piece(Actor *this) { begin = (struct vilegame_piece *)vector_getBegin(local->game_pieces); end = (struct vilegame_piece *) vector_getEnd(local->game_pieces); - if ((end != begin) && func_80389810(sp44)){ + if ((end != begin) && BGS_func_80389810(sp44)){ sp44[1] = 0.0f; for(i_ptr = begin; i_ptr < end; i_ptr++){ if ((ml_vec3f_distance(i_ptr->position, sp44) < 65.25) && chyumblie_is_edible(i_ptr->marker)) { @@ -640,7 +640,7 @@ void chvilegame_update(Actor *this) { } } } - if ((this->state == 7) && (func_8038C338(local->vile_marker) != 0)) { + if ((this->state == 7) && (BGS_func_8038C338(local->vile_marker) != 0)) { func_8038A068(this, 1); } } diff --git a/src/BGS/code_9750.c b/src/BGS/code_9750.c index 014a5b64..15a0701d 100644 --- a/src/BGS/code_9750.c +++ b/src/BGS/code_9750.c @@ -22,25 +22,25 @@ ActorInfo D_80390C88 = {MARKER_6D_TANKTUP_LEG, ACTOR_E9_TANKTUP_LEG_FL, ASSET_3E }; u8 pad_80390CCC[4] = {0}; -ActorAnimationInfo D_80390CB0[3] = { +ActorAnimationInfo BGS_D_80390CB0[3] = { {0, 0.0f}, {0x104, 8000000.0f}, {0x104, 0.75f} }; -ActorInfo D_80390CC8 = {MARKER_6D_TANKTUP_LEG, ACTOR_EA_TANKTUP_LEG_BL, ASSET_3F0_MODEL_TANKTUP_LEG_BL, 0x01, D_80390CB0, +ActorInfo D_80390CC8 = {MARKER_6D_TANKTUP_LEG, ACTOR_EA_TANKTUP_LEG_BL, ASSET_3F0_MODEL_TANKTUP_LEG_BL, 0x01, BGS_D_80390CB0, func_8038FBF8, func_80326224, func_80325888, 0, 0x166, 0.0f, 0 }; u8 pad_80390CEC[4] = {0}; -ActorAnimationInfo D_80390CF0[3] = { +ActorAnimationInfo BGS_D_80390CF0[3] = { {0, 0.0f}, {0x105, 8000000.0f}, {0x105, 0.75f} }; -ActorInfo D_80390D08 = {MARKER_6D_TANKTUP_LEG, ACTOR_EB_TANKTUP_LEG_FR, ASSET_3F1_MODEL_TANKTUP_LEG_FR, 0x01, D_80390CF0, +ActorInfo D_80390D08 = {MARKER_6D_TANKTUP_LEG, ACTOR_EB_TANKTUP_LEG_FR, ASSET_3F1_MODEL_TANKTUP_LEG_FR, 0x01, BGS_D_80390CF0, func_8038FBF8, func_80326224, func_80325888, 0, 0x166, 0.0f, 0 }; @@ -67,7 +67,7 @@ void func_8038FB40(ActorMarker *this, s32 arg1){ FUNC_8030E624(SFX_A_BANJO_LANDING_05, 0.8f, 32750); } -void func_8038FB84(ActorMarker *this, ActorMarker *other_marker){ +void BGS_func_8038FB84(ActorMarker *this, ActorMarker *other_marker){ Actor *thisActor; thisActor = marker_getActor(this); @@ -81,7 +81,7 @@ void func_8038FBF8(Actor *this){ if(!this->initialized){ this->initialized = 1; this->marker->propPtr->unk8_3 = 1; - marker_setCollisionScripts(this->marker, NULL, NULL, func_8038FB84); + marker_setCollisionScripts(this->marker, NULL, NULL, BGS_func_8038FB84); } if(this->state == 2){ if(animctrl_isAt(this->animctrl, 0.65f)){ diff --git a/src/BGS/done/ch/code_2270.c b/src/BGS/done/ch/code_2270.c index 8bcc1d33..6de14272 100644 --- a/src/BGS/done/ch/code_2270.c +++ b/src/BGS/done/ch/code_2270.c @@ -3,7 +3,7 @@ #include "variables.h" void func_80324E88(f32); -void func_803888E4(Actor *this, s32 arg1); +void BGS_func_803888E4(Actor *this, s32 arg1); typedef struct{ u32 unk0; @@ -33,11 +33,11 @@ s16 D_8039085C[] = {0, 0xC77, 0xC79, 0xC7B}; //success texts u8 D_80390864[] = {3, 3, 5, 7}; //chchoirgame_sequence_length f32 D_80390868[3] = {0.0f, 100.0f, -1020.0f}; //chchoirgame_jiggy_position -void func_80388660(ActorMarker *this){ - func_803888E4(marker_getActor(this), 6); +void BGS_func_80388660(ActorMarker *this){ + BGS_func_803888E4(marker_getActor(this), 6); } -void func_8038868C(void){ +void BGS_func_8038868C(void){ jiggySpawn(JIGGY_27_BGS_TIPTUP, D_80390868); } @@ -61,14 +61,14 @@ void func_803886F4(ActorMarker *this){ thisActor = marker_getActor(this); item_set(ITEM_6_HOURGLASS, 1); item_set(ITEM_0_HOURGLASS_TIMER, 30*60-1); - func_803888E4(thisActor, 5); + BGS_func_803888E4(thisActor, 5); } void func_8038873C(void){ func_8025A6EC(COMUSIC_2B_DING_B, 28000); } -void func_80388760(void){ +void BGS_func_80388760(void){ func_8025A6EC(COMUSIC_2C_BUZZER, 28000); } @@ -79,20 +79,20 @@ void func_80388784(ActorMarker *this, s32 arg1, s32 arg2){ switch(arg1){ case 0xc72: case 0xc74: - func_803888E4(thisActor, 3); + BGS_func_803888E4(thisActor, 3); break; case 0xc78: case 0xc7a: case 0xc7c: - func_803888E4(thisActor, 4); + BGS_func_803888E4(thisActor, 4); break; case 0xc77: case 0xc79: func_80324E38(0.0f, 0); - func_803888E4(thisActor, 3); + BGS_func_803888E4(thisActor, 3); break; case 0xc7b: - timedFunc_set_0(0.0f, func_8038868C); + timedFunc_set_0(0.0f, BGS_func_8038868C); func_80324E88(2.5f); func_80324E38(2.5f, 0); break; @@ -117,11 +117,11 @@ void func_80388848(ActorMarker *this){ func_803204E4(5,1); } else{ - func_80388660(thisActor->marker); + BGS_func_80388660(thisActor->marker); } } -void func_803888E4(Actor *this, s32 arg1){ +void BGS_func_803888E4(Actor *this, s32 arg1){ ActorLocal_BGS_2270 *unqPtr; f32 sp54; @@ -242,7 +242,7 @@ void func_80388E94(ActorMarker *this, s32 arg1){ } else{ func_8028F55C(1, thisActor->marker); - timedFunc_set_0(0.5f, func_80388760); + timedFunc_set_0(0.5f, BGS_func_80388760); if(!mapSpecificFlags_get(1) && !func_803203FC(2) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL)) mapSpecificFlags_set(1,TRUE); } @@ -296,7 +296,7 @@ void func_80389080(Actor *this){ unqPtr->unkA = 3; this->position_y = this->position_y - 300.0f; } - func_803888E4(this, 1); + BGS_func_803888E4(this, 1); if(jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !func_803203FC(2) && !func_803203FC(1)) marker_despawn(this->marker); } @@ -315,12 +315,12 @@ void func_80389080(Actor *this){ if(func_803203FC(2)){ if(func_803203FC(3)){ func_80324E38(0.0f,0); - func_803888E4(this, 3); + BGS_func_803888E4(this, 3); } } else{ if(ml_vec3f_distance(this->position, &sp44) < 300.0f && player_getTransformation() == TRANSFORM_1_BANJO && !jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP)){ - func_803888E4(this, 2); + BGS_func_803888E4(this, 2); } } } @@ -334,7 +334,7 @@ void func_80389080(Actor *this){ } //L80389370 else{ if(ml_vec3f_distance(this->position, &sp44) >= 300.0f) - func_803888E4(this, 1); + BGS_func_803888E4(this, 1); } }//L803893A0 if(this->state == 6){ diff --git a/src/BGS/done/ch/code_6730.c b/src/BGS/done/ch/code_6730.c index edcc2a39..d8fb7b74 100644 --- a/src/BGS/done/ch/code_6730.c +++ b/src/BGS/done/ch/code_6730.c @@ -9,7 +9,7 @@ void func_8025A58C(u32, u32); void func_80324E88(f32); -ActorInfo D_80390AB0 = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00, 0x00, NULL, +ActorInfo BGS_D_80390AB0 = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00, 0x00, NULL, func_8038CEE8, NULL, func_80325340, 0, 0, 0.0f, 0 }; @@ -20,7 +20,7 @@ f32 D_80390AD4[3] = {1985.0f, 200.0f, -1386.0f}; u8 D_80391240[4]; /* .code */ -void func_8038CB20(void){ +void BGS_func_8038CB20(void){ jiggySpawn(JIGGY_24_BGS_FLIBBITS, D_80390AD4); } @@ -97,7 +97,7 @@ void func_8038CC08(Actor * arg0, u32 arg1){ if(arg1 == 5){ func_80324E38(0.0f, 3); timed_setCameraToNode(0.0f, 0x27); - timedFunc_set_0(0.2f, func_8038CB20); + timedFunc_set_0(0.2f, BGS_func_8038CB20); func_80324E88(3.0f); func_80324E38(3.0f, 0); arg1 = 6; @@ -121,7 +121,7 @@ void func_8038CEB8(void){ D_80391240[2]++; } -void func_8038CED0(void){ +void BGS_func_8038CED0(void){ D_80391240[3]++; } diff --git a/src/BGS/done/code_8DF0.c b/src/BGS/done/code_8DF0.c index e448f2c8..4541edc9 100644 --- a/src/BGS/done/code_8DF0.c +++ b/src/BGS/done/code_8DF0.c @@ -16,8 +16,8 @@ extern ActorInfo D_80390C88; extern ActorInfo D_80390CC8; extern ActorInfo D_80390D08; extern ActorInfo D_80390D48; -extern ActorInfo D_80390AB0; -extern ActorInfo D_80390AE0; +extern ActorInfo BGS_D_80390AB0; +extern ActorInfo BGS_D_80390AE0; extern ActorInfo D_80390960; extern ActorInfo D_80390A40; extern ActorInfo D_80390A70; @@ -33,7 +33,7 @@ extern ActorInfo D_80390D70; extern ActorInfo D_80390BD8; extern ActorInfo D_80390BFC; -void bgs_func_8038F1E0(void){//bgs_updateSpawnableActors +void BGS_func_8038F1E0(void){//bgs_updateSpawnableActors spawnableActorList_add(&D_80390804, actor_new, 0x00000088);//croctus spawnableActorList_add(&D_80390690, actor_new, 0x020108A1); //flibbit spawnableActorList_add(&D_803906F8, actor_new, 0x400); //pink_egg_largest @@ -47,8 +47,8 @@ void bgs_func_8038F1E0(void){//bgs_updateSpawnableActors spawnableActorList_add(&D_80390CC8, actor_new, 0x400042c);//tanktup_leg spawnableActorList_add(&D_80390D08, actor_new, 0x400042c);//tanktup_leg spawnableActorList_add(&D_80390D48, actor_new, 0x400042c);//tanktup_leg - spawnableActorList_add(&D_80390AB0, actor_new, 0x81); - spawnableActorList_add(&D_80390AE0, actor_new, 0x20108a1); //yellow_flibbit + spawnableActorList_add(&BGS_D_80390AB0, actor_new, 0x81); + spawnableActorList_add(&BGS_D_80390AE0, actor_new, 0x20108a1); //yellow_flibbit spawnableActorList_add(&D_80390960, actor_new, 0); spawnableActorList_add(&D_80390A40, actor_new, 0x880); //yumblie spawnableActorList_add(&D_80390A70, actor_new, 0x9a2); //mr. vile diff --git a/src/CC/ch/sawblade.c b/src/CC/ch/sawblade.c index d4be6565..05a43c98 100644 --- a/src/CC/ch/sawblade.c +++ b/src/CC/ch/sawblade.c @@ -119,7 +119,7 @@ void func_80389520(ActorMarker *marker, ActorMarker *otherMarker){ FUNC_8030E624(SFX_65_METALLIC_SCRATCH, 1.0f, 30000); } -void func_8038954C(ActorMarker *marker, ActorMarker *otherMarker){ +void CC_func_8038954C(ActorMarker *marker, ActorMarker *otherMarker){ Actor *actor = marker_getActor(marker); ActorLocal_CC_3130 *local = (ActorLocal_CC_3130 *) &actor->local; @@ -138,7 +138,7 @@ void chSawblade_update(Actor *this){ this->unk16C_4 = TRUE; this->roll = this->yaw; this->yaw = 0.0f; - marker_setCollisionScripts(this->marker, func_80389520, NULL, func_8038954C); + marker_setCollisionScripts(this->marker, func_80389520, NULL, CC_func_8038954C); local->unk0 = &D_80389C30[(this->modelCacheIndex < 0x43) ? this->modelCacheIndex - 0x3D : this->modelCacheIndex - 0x28A]; local->unk4 = 0; func_80256C60(this->position, 100); diff --git a/src/CC/code_0.c b/src/CC/code_0.c index 6c8d43f9..b5020f58 100644 --- a/src/CC/code_0.c +++ b/src/CC/code_0.c @@ -20,7 +20,7 @@ ActorInfo D_80389AA0 = { }; /* .code */ -void func_803863F0(Actor *this, s32 next_state){ +void CC_func_803863F0(Actor *this, s32 next_state){ ActorLocal_CC_0 * local = (ActorLocal_CC_0 *)this->local; if(this->state == 4){ func_80388ED4(0); @@ -55,7 +55,7 @@ void func_803864D4(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; marker->propPtr->unk8_3 = 1; - func_803863F0(this, 1); + CC_func_803863F0(this, 1); }//L80386530 func_80388B4C(&sp4C); @@ -65,27 +65,27 @@ void func_803864D4(Actor *this){ sp30[0] = sp4C[0] - sp40[0]; sp30[1] = 0.0f; sp30[2] = sp4C[2] - sp40[2]; - if(!func_80388CA0()){ + if(!CC_func_80388CA0()){ local->unk4 = 2.0f; } else if(60.0f < gu_sqrtf(sp30[0]*sp30[0] + sp30[1]*sp30[1] + sp30[2]*sp30[2])){ local->unk4 = 0.05f; } else{ - func_803863F0(this, 2); + CC_func_803863F0(this, 2); } }//L80386634 if(func_8025773C(&local->unk0, sp3C)){ - func_803863F0(this, 4); + CC_func_803863F0(this, 4); } if((this->state == 2) && (1.0 <= local->unk8)){ - func_803863F0(this, 3); + CC_func_803863F0(this, 3); }//L803866B4 if((this->state == 4) && (1.0 <= local->unk8)){ - func_803863F0(this, 1); + CC_func_803863F0(this, 1); }//L80386714 if(this->state == 1){ diff --git a/src/CC/code_13C0.c b/src/CC/code_13C0.c index 1d994465..82e398c2 100644 --- a/src/CC/code_13C0.c +++ b/src/CC/code_13C0.c @@ -66,7 +66,7 @@ void func_80387940(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { func_803878F0(arg0, arg1, 1); } -void func_80387960(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { +void CC_func_80387960(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { func_803878F0(arg0, arg1, 2); } @@ -82,19 +82,19 @@ void func_803879C0(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { func_803878F0(arg0, arg1, 5); } -void func_803879E0(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { +void CC_func_803879E0(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { func_803878F0(arg0, arg1, 6); } -void func_80387A00(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { +void CC_func_80387A00(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { func_803878F0(arg0, arg1, 7); } -void func_80387A20(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { +void CC_func_80387A20(Struct_CC_13C0_1 *arg0, Struct68s *arg1) { func_803878F0(arg0, arg1, 8); } -void func_80387A40(Struct_CC_13C0_1* arg0, Struct68s* arg1, f32 arg2) { +void CC_func_80387A40(Struct_CC_13C0_1* arg0, Struct68s* arg1, f32 arg2) { s32 temp_v0; f32 sp50[3]; f32 sp44[3]; @@ -160,7 +160,7 @@ void func_80387CC0(void){ } -void func_80387D4C(void){ +void CC_func_80387D4C(void){ u32 sp1C; u32 tmp_v0; osPiReadIo(0x504, &sp1C); diff --git a/src/CC/code_19B0.c b/src/CC/code_19B0.c index b33a26d9..84a25d52 100644 --- a/src/CC/code_19B0.c +++ b/src/CC/code_19B0.c @@ -25,7 +25,7 @@ extern ActorInfo D_80389E68; extern ActorInfo D_80389E8C; /* .code */ -void func_80387DA0(void) +void CC_func_80387DA0(void) { spawnableActorList_add(&D_80389AA0, actor_new, 0X4080); spawnableActorList_add(&D_80389E44, actor_new, 0X10080); diff --git a/src/CC/code_1B90.c b/src/CC/code_1B90.c index 38c7629c..504a50ea 100644 --- a/src/CC/code_1B90.c +++ b/src/CC/code_1B90.c @@ -20,7 +20,7 @@ void func_80387F80(void){ func_8034E71C(func_8034C5AC(0x131), 0x190, 0.0f); } -void func_80387FB0(void){ +void CC_func_80387FB0(void){ item_set(ITEM_0_HOURGLASS_TIMER, 48*60 - 1); item_set(ITEM_6_HOURGLASS, 1); D_80389F90.unk1 = 1; @@ -41,7 +41,7 @@ s32 func_80388010(void){ void func_8038803C(s32 arg0){ if(arg0 == D_80389F90.unk0){ if(arg0 == 1){ - func_80387FB0(); + CC_func_80387FB0(); } D_80389F90.unk0++; if(D_80389F90.unk0 >= 9){ diff --git a/src/CC/code_1F70.c b/src/CC/code_1F70.c index e628d557..08d2523a 100644 --- a/src/CC/code_1F70.c +++ b/src/CC/code_1F70.c @@ -112,7 +112,7 @@ void func_80388664(void) { jiggySpawn(JIGGY_17_CC_CLANKER_RAISED, D_80389C00); } -void func_8038868C(void) { +void CC_func_8038868C(void) { func_80324E38(0, 3); timed_setCameraToNode(0, 0); timed_setCameraToNode(5.5f, 1); @@ -128,7 +128,7 @@ void func_8038868C(void) { } -void func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){ +void CC_func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){ BKVertexList *tmp_v0; s32 s1; f32 spA4[3]; @@ -237,11 +237,11 @@ void func_80388C50(s32 arg0, s32 arg1){ func_8031CD20(arg0, 0xb, 1); } -void func_80388C78(s32 arg0, s32 arg1){ +void CC_func_80388C78(s32 arg0, s32 arg1){ func_8031CD20(arg0, 0xb, 2); } -int func_80388CA0(void){ +int CC_func_80388CA0(void){ return D_80389FA0.unk21 == 3; } @@ -317,7 +317,7 @@ void func_80388ED4(s32 arg0){ D_80389FA0.unk8 = 1.0f; } -void func_80388F4C(void){ +void CC_func_80388F4C(void){ f32 sp6C[3]; f32 sp68 = time_getDelta(); f32 sp64; @@ -327,7 +327,7 @@ void func_80388F4C(void){ BKCollisionTri *tmp_v0; f32 pad[3]; - func_80387D4C(); + CC_func_80387D4C(); if(D_80389FA0.unk21 != 0 && func_80334904() == 2){ player_getPosition(sp6C); D_80389FA0.unk20 = (ml_vec3f_distance(sp6C, D_80389FA0.unkC) < 200.0f); diff --git a/src/CC/code_530.c b/src/CC/code_530.c index 3fc3ba48..132db1cd 100644 --- a/src/CC/code_530.c +++ b/src/CC/code_530.c @@ -30,7 +30,7 @@ ActorInfo D_80389AD0 = { f32 D_80389AF4[3] = {6200.0f, -2600.0f, 0.0f}; /* .code */ -void func_80386920(Actor *this, s32 next_state){ +void CC_func_80386920(Actor *this, s32 next_state){ ActorLocal_CC_530 *local = (ActorLocal_CC_530 *)&this->local; f32 sp28[3]; s16 sp20[3]; @@ -57,7 +57,7 @@ void func_80386920(Actor *this, s32 next_state){ } if(next_state == 4){ - func_8038868C(); + CC_func_8038868C(); func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF); } @@ -76,7 +76,7 @@ void func_80386AD0(ActorMarker *arg0, s32 arg1) { void func_80386AF8(Actor *arg0) { ActorLocal_CC_530 *local = (ActorLocal_CC_530 *)&arg0->local; - func_80386920(arg0, 0); + CC_func_80386920(arg0, 0); func_8030DA44(local->unk0); } @@ -107,10 +107,10 @@ void func_80386B28(Actor *this){ this->position_y = -2620.0f; this->position_z = -20.0f; if(jiggyscore_isSpawned(JIGGY_17_CC_CLANKER_RAISED)){ - func_80386920(this, 5); + CC_func_80386920(this, 5); } else{ - func_80386920(this, 1); + CC_func_80386920(this, 1); } } else{//L80386C40 @@ -159,10 +159,10 @@ void func_80386B28(Actor *this){ local->unk4[2] = sp58[2]; if(this->state == 0x1 && local->unk2 == 1){ if(--local->unk3 == 0){ - func_80386920(this, 4); + CC_func_80386920(this, 4); } else{ - func_80386920(this, 2); + CC_func_80386920(this, 2); } }//L80386E4C @@ -172,7 +172,7 @@ void func_80386B28(Actor *this){ } this->pitch = (f32)local->unk10 + 30.0f*local->unk14; if(1.0f <= local->unk14){ - func_80386920(this, 3); + CC_func_80386920(this, 3); } }//L80386EC0 @@ -182,7 +182,7 @@ void func_80386B28(Actor *this){ } this->pitch = (f32)local->unk10 + 30.0f*(1.0f - local->unk14); if(1.0f <= local->unk14){ - func_80386920(this, 1); + CC_func_80386920(this, 1); } }//L80386F44 @@ -192,7 +192,7 @@ void func_80386B28(Actor *this){ } this->pitch = (f32)local->unk10 + 180.0f*(local->unk14/5.0f); if(5.0f <= local->unk14){ - func_80386920(this, 5); + CC_func_80386920(this, 5); func_80388EA4(); } }//L80386FC0 diff --git a/src/CC/code_BF0.c b/src/CC/code_BF0.c index 730ea07d..172c5a8f 100644 --- a/src/CC/code_BF0.c +++ b/src/CC/code_BF0.c @@ -29,7 +29,7 @@ extern ActorInfo D_80389B24 = { u8 D_80389F80; /* .code */ -void func_80386FE0(Actor *this, s32 next_state){ +void CC_func_80386FE0(Actor *this, s32 next_state){ ActorLocal_CC_BF0 *local = (ActorLocal_CC_BF0 *)&this->local; s32 prev_state = this->state; this->state = next_state; @@ -54,7 +54,7 @@ void func_80386FE0(Actor *this, s32 next_state){ } } -void func_803870E0(void) { +void CC_func_803870E0(void) { D_80389F80 = 0; } @@ -82,9 +82,9 @@ void func_803870F8(Actor *this){ this->roll = 0.0f; local->unk0 = (marker->modelId == 0x309) ? 1 : 2; local->egg_count = 0; - func_80386FE0(this, 1); + CC_func_80386FE0(this, 1); if(levelSpecificFlags_get((local->unk0 == 1)? LEVEL_FLAG_0_CC_TOKEN_TOOTH_OPEN: LEVEL_FLAG_1_CC_JIGGY_TOOTH_OPEN)){ - func_80386FE0(this, 3); + CC_func_80386FE0(this, 3); } }//L803871D8 player_getPosition(&sp70); @@ -119,7 +119,7 @@ void func_803870F8(Actor *this){ D_80389F80 = 0; local->egg_count++; if(local->egg_count == 3){ - func_80386FE0(this, 2); + CC_func_80386FE0(this, 2); }else{ func_8025A6EC(COMUSIC_2B_DING_B, 28000); } @@ -131,7 +131,7 @@ void func_803870F8(Actor *this){ ((flagCnt == 0)? 0xd30 : 0xd31) : ((flagCnt == 0)? 0xd2e : 0xd2f), 4, NULL, NULL, NULL, NULL); } - func_80386FE0(this, 3); + CC_func_80386FE0(this, 3); }//L80387474 if(this->state == 3){ diff --git a/src/CCW/code_0.c b/src/CCW/code_0.c index 0bbb51d2..7e4c3540 100644 --- a/src/CCW/code_0.c +++ b/src/CCW/code_0.c @@ -8,7 +8,7 @@ ActorInfo D_8038EB50 = { 0x1AC, 0x298, 0x444, 0x0, NULL, func_803864B8, NULL, fu ActorInfo D_8038EB74 = { 0x1AC, 0x29A, 0x445, 0x0, NULL, func_803864B8, NULL, func_80325888, 0, 0, 0.0f, 0}; /* .code */ -void func_803863F0(Actor *this, s32 next_state){ +void CCW_func_803863F0(Actor *this, s32 next_state){ if(next_state == 2){ FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 1.0f, 32000, this->position, 500, 3000); levelSpecificFlags_set(0x10, TRUE); @@ -20,7 +20,7 @@ void func_803863F0(Actor *this, s32 next_state){ void func_80386468(ActorMarker* marker, ActorMarker *arg1) { Actor* actor = marker_getActor(marker); if (actor->state == 1 && map_get() == MAP_44_CCW_SUMMER) { - func_803863F0(actor, 2); + CCW_func_803863F0(actor, 2); } } @@ -29,7 +29,7 @@ void func_803864B8(Actor *this){ this->unk16C_4 = TRUE; this->marker->propPtr->unk8_3 = TRUE; marker_setCollisionScripts(this->marker, NULL, NULL, func_80386468); - func_803863F0(this, 1); + CCW_func_803863F0(this, 1); if(levelSpecificFlags_get(0x10)){ marker_despawn(this->marker); } diff --git a/src/CCW/code_14B0.c b/src/CCW/code_14B0.c index ee8708f0..459ca826 100644 --- a/src/CCW/code_14B0.c +++ b/src/CCW/code_14B0.c @@ -21,7 +21,7 @@ typedef struct { f32 unk18[3]; }ActorLocal_CCW_14B0; -void func_80387A40(Actor *this); +void CCW_func_80387A40(Actor *this); /* .data */ Struct_CCW_14B0_0 D_8038EC00[] = { @@ -30,7 +30,7 @@ Struct_CCW_14B0_0 D_8038EC00[] = { 0 }; -ActorInfo D_8038EC14 = { 0x1AF, 0x29C, 0x446, 0x0, NULL, func_80387A40, NULL, func_80325888, 0, 0, 1.0f, 0}; +ActorInfo D_8038EC14 = { 0x1AF, 0x29C, 0x446, 0x0, NULL, CCW_func_80387A40, NULL, func_80325888, 0, 0, 1.0f, 0}; /* .code */ void func_803878A0(Actor *this, s32 next_state) { @@ -53,12 +53,12 @@ void func_803878A0(Actor *this, s32 next_state) { this->state = next_state; } -void func_80387A20(Actor *this){ +void CCW_func_80387A20(Actor *this){ ActorLocal_CCW_14B0 *local = (ActorLocal_CCW_14B0 *)&this->local; func_8030DA44(local->unk0); } -void func_80387A40(Actor *this) { +void CCW_func_80387A40(Actor *this) { ActorLocal_CCW_14B0 *local; f32 sp68; f32 sp5C[3]; @@ -71,7 +71,7 @@ void func_80387A40(Actor *this) { sp68 = time_getDelta(); if (!this->unk16C_4) { this->unk16C_4 = TRUE; - this->marker->unk30 = func_80387A20; + this->marker->unk30 = CCW_func_80387A20; local->unk4 = &D_8038EC00[0]; while((local->unk4->unk0 != 0) && (map_get() != local->unk4->unk0)) { local->unk4++; diff --git a/src/CCW/code_160.c b/src/CCW/code_160.c index b67c5cef..39876ffa 100644 --- a/src/CCW/code_160.c +++ b/src/CCW/code_160.c @@ -16,7 +16,7 @@ void func_8038687C(Actor *this); ActorInfo D_8038EBA0 = { 0x1AD, 0x299, 0x443, 0x0, NULL, func_8038687C, NULL, func_80325888, 0, 0, 0.0f, 0}; /* .code */ -void func_80386550(ActorMarker *marker){ +void CCW_func_80386550(ActorMarker *marker){ Actor *this; ActorLocal_CCW_160 *local; @@ -69,7 +69,7 @@ void func_803865F4(Actor *this, s32 next_state) { func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000); func_80324E38(0.0f, 3); timed_setCameraToNode(2.0f, 4); - timedFunc_set_1(2.0f, (GenMethod_1)func_80386550, (s32) this->marker); + timedFunc_set_1(2.0f, (GenMethod_1)CCW_func_80386550, (s32) this->marker); func_80324E88(4.0f); func_80324E38(4.0f, 0); } diff --git a/src/CCW/code_1B20.c b/src/CCW/code_1B20.c index 20004f83..6983baa4 100644 --- a/src/CCW/code_1B20.c +++ b/src/CCW/code_1B20.c @@ -17,7 +17,7 @@ typedef struct{ }ActorLocal_CCW_1B20; void func_80387F64(Actor *this, s32 next_state); -Actor *func_803882F4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); +Actor *CCW_func_803882F4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_80388478(Actor *this); /* .data */ @@ -28,7 +28,7 @@ Struct_CCW_1B20_0 D_8038EC40[4] ={ {0x183, 1, 1, 0x000, 0x000, 0x00, 0} }; -ActorInfo D_8038EC70 = { 0x1B0, 0x29D, 0x447, 0x0, NULL, func_80388478, NULL, func_803882F4, 0, 0, 1.0f, 0}; +ActorInfo D_8038EC70 = { 0x1B0, 0x29D, 0x447, 0x0, NULL, func_80388478, NULL, CCW_func_803882F4, 0, 0, 1.0f, 0}; f32 D_8038EC94[3] = {200.0f, 2120.0f, -5570.0f}; /* .code */ @@ -90,7 +90,7 @@ bool func_80388260(ActorMarker *marker, s32 arg1){ return marker->unk40_31 != 1; } -void func_80388278(ActorMarker *marker, ActorMarker *other_marker) { +void CCW_func_80388278(ActorMarker *marker, ActorMarker *other_marker) { func_8025A6EC(COMUSIC_2B_DING_B, 28000); } @@ -102,7 +102,7 @@ void func_803882A4(ActorMarker* marker, ActorMarker *other_marker) { } } -Actor *func_803882F4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { +Actor *CCW_func_803882F4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { Actor *this; s32 sp18; @@ -144,7 +144,7 @@ void func_80388478(Actor *this) { if (!this->unk16C_4) { this->unk16C_4 = TRUE; func_803300C0(this->marker, func_80388260); - marker_setCollisionScripts(this->marker, NULL, func_80388278, func_803882A4); + marker_setCollisionScripts(this->marker, NULL, CCW_func_80388278, func_803882A4); actor_collisionOn(this); if (!jiggyscore_isSpawned(JIGGY_4D_CCW_FLOWER)) { func_80320004(0xE5, FALSE); diff --git a/src/CCW/code_2270.c b/src/CCW/code_2270.c index f8fbbaaf..cce4ed07 100644 --- a/src/CCW/code_2270.c +++ b/src/CCW/code_2270.c @@ -15,7 +15,7 @@ typedef struct{ void *unk8; }ActorLocal_CCW_2270; -void func_8038868C(Actor *this, s32 next_state); +void CCW_func_8038868C(Actor *this, s32 next_state); Actor *func_803889AC(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_80388AA0(Actor *this); @@ -34,11 +34,11 @@ ActorInfo D_8038ECE8 = { }; /* .code */ -void func_80388660(ActorMarker* marker, s32 arg1) { - func_8038868C(marker_getActor(marker), arg1); +void CCW_func_80388660(ActorMarker* marker, s32 arg1) { + CCW_func_8038868C(marker_getActor(marker), arg1); } -void func_8038868C(Actor *this, s32 next_state) { +void CCW_func_8038868C(Actor *this, s32 next_state) { ActorLocal_CCW_2270 *local; local = (ActorLocal_CCW_2270*)&this->local; @@ -60,7 +60,7 @@ void func_8038868C(Actor *this, s32 next_state) { timed_playSfx(0.8f, SFX_4B_GULPING, 0.8f, 28000); timed_playSfx(1.4f, SFX_4B_GULPING, 0.8f, 28000); timed_playSfx(2.0f, SFX_4B_GULPING, 0.8f, 28000); - timedFunc_set_2(3.2f, (TFQM2) func_80388660, (s32) this->marker, 3); + timedFunc_set_2(3.2f, (TFQM2) CCW_func_80388660, (s32) this->marker, 3); } if (next_state == 3) { func_803883F4(); @@ -95,7 +95,7 @@ void func_8038894C(ActorMarker* marker, ActorMarker *other_marker) { Actor* actor = marker_getActor(marker); if (actor->state == 1) { actor_collisionOff(actor); - timedFunc_set_2(0.5f, (TFQM2)func_80388660, (s32)actor->marker, 2); + timedFunc_set_2(0.5f, (TFQM2)CCW_func_80388660, (s32)actor->marker, 2); } } @@ -150,9 +150,9 @@ void func_80388AA0(Actor *this) { } if( (map_get() == MAP_44_CCW_SUMMER) && func_8031FF1C(0xE3) && !func_8031FF1C(0xE4)) { - func_8038868C(this, 1); + CCW_func_8038868C(this, 1); } else if( (map_get() == MAP_45_CCW_AUTUMN) && func_8031FF1C(0xE4) && !func_8031FF1C(0xE5) ) { - func_8038868C(this, 1); + CCW_func_8038868C(this, 1); } else{ marker_despawn(this->marker); } @@ -177,9 +177,9 @@ void func_80388AA0(Actor *this) { if(this->state == 3){ if (!func_80388438()) { if (map_get() == MAP_44_CCW_SUMMER) { - func_8038868C(this, 4); + CCW_func_8038868C(this, 4); } else { - func_8038868C(this, 5); + CCW_func_8038868C(this, 5); } } } @@ -203,14 +203,14 @@ void func_80388AA0(Actor *this) { if (this->state == 5){ if(func_80335794(this->unk148) > 0) { - func_8038868C(this, 6); + CCW_func_8038868C(this, 6); } } if (this->state == 6) { func_80326224(this); if (0.99 < (f64) this->unk48) { - func_8038868C(this, 7); + CCW_func_8038868C(this, 7); } } } diff --git a/src/CCW/code_3050.c b/src/CCW/code_3050.c index 06a33938..d0974c3b 100644 --- a/src/CCW/code_3050.c +++ b/src/CCW/code_3050.c @@ -2,11 +2,11 @@ #include "functions.h" #include "variables.h" -Actor *func_8038954C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); +Actor *CCW_func_8038954C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_803895F4(Actor *this); /* .data */ -ActorInfo D_8038EE70 = { 0x1B3, 0x2A0, 0x483, 0x0, NULL, func_803895F4, NULL, func_8038954C, 0, 0, 0.0f, 0}; +ActorInfo D_8038EE70 = { 0x1B3, 0x2A0, 0x483, 0x0, NULL, func_803895F4, NULL, CCW_func_8038954C, 0, 0, 0.0f, 0}; /* .code */ void func_80389440(Actor *this, s32 next_state) { @@ -33,7 +33,7 @@ void func_8038950C(ActorMarker* marker, ActorMarker* other_marker) { } } -Actor *func_8038954C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { +Actor *CCW_func_8038954C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { Actor *this; this = marker_getActor(marker); diff --git a/src/CCW/code_3310.c b/src/CCW/code_3310.c index f978f6f7..3cbe807f 100644 --- a/src/CCW/code_3310.c +++ b/src/CCW/code_3310.c @@ -41,7 +41,7 @@ typedef struct { }ActorLocal_CCW_3310; Actor *func_80389B24(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); -void func_80389BFC(Actor *this); +void CCW_func_80389BFC(Actor *this); /* .data */ Struct_CCW_3310_1 D_8038EEA0[] = { @@ -96,7 +96,7 @@ Struct_CCW_3310_0 D_8038F080[] = { 0 }; -ActorInfo D_8038F130 = { MARKER_1B4_EEYRIE_BABY, ACTOR_2A1_EEYRIE_BABY, ASSET_484_MODEL_EAGLE_BABY, 0x0, NULL, func_80389BFC, NULL, func_80389B24, 0, 0, 0.0f, 0}; +ActorInfo D_8038F130 = { MARKER_1B4_EEYRIE_BABY, ACTOR_2A1_EEYRIE_BABY, ASSET_484_MODEL_EAGLE_BABY, 0x0, NULL, CCW_func_80389BFC, NULL, func_80389B24, 0, 0, 0.0f, 0}; /* .bss */ u8 pad_8038FDD0[0x10]; @@ -204,7 +204,7 @@ void func_80389BD8(f32 dst[3]){ dst[2] = D_8038FDE0[2]; } -void func_80389BFC(Actor *this) { +void CCW_func_80389BFC(Actor *this) { Struct_CCW_3310_1 *iPtr; ActorLocal_CCW_3310 *local; f32 sp5C; diff --git a/src/CCW/code_5BF0.c b/src/CCW/code_5BF0.c index e6941bd7..c2562f45 100644 --- a/src/CCW/code_5BF0.c +++ b/src/CCW/code_5BF0.c @@ -33,7 +33,7 @@ void func_8038C0E8(ActorMarker* marker) { func_8030E878(SFX_81_UUU, sp20, (s32)randf2(10000.0f, 31000.0f), sp24->position, 500.0f, 2500.0f); } -void func_8038C16C(Actor *this, s32 next_state) { +void CCW_func_8038C16C(Actor *this, s32 next_state) { Actor *other; if (next_state == 1) { @@ -102,9 +102,9 @@ void func_8038C41C(Actor *this) { && !jiggyscore_isSpawned(JIGGY_4A_CCW_NABNUT) && (this->marker->unk14_20 == 0x1C6 || this->marker->unk14_20 == 0x1CA) ){ - func_8038C16C(this, 1); + CCW_func_8038C16C(this, 1); } else { - func_8038C16C(this, 2); + CCW_func_8038C16C(this, 2); } } diff --git a/src/CCW/code_61E0.c b/src/CCW/code_61E0.c index 6f3ea795..22a7dd98 100644 --- a/src/CCW/code_61E0.c +++ b/src/CCW/code_61E0.c @@ -16,24 +16,24 @@ void func_8038C7A8(Actor *this); ActorInfo D_8038F460 = { 0x1BC, 0x2A9, 0x48E, 0x0, NULL, func_8038C7A8, NULL, func_80325888, 0, 0, 0.8f, 0}; /* .code */ -void func_8038C5D0(ActorMarker* marker) { +void CCW_func_8038C5D0(ActorMarker* marker) { Actor* actor = marker_getActor(marker); func_8030E878(SFX_3F2_UNKNOWN, randf2(0.95f, 1.05f), 26000, actor->position, 500.0f, 1000.0f); } -void func_8038C638(ActorMarker* marker) { +void CCW_func_8038C638(ActorMarker* marker) { Actor* actor = marker_getActor(marker); func_8030E878(SFX_5_BANJO_LANDING_01, randf2(0.95f, 1.05f), 22000, actor->position, 500.0f, 1000.0f); } -void func_8038C6A0(Actor *this, s32 next_state) { +void CCW_func_8038C6A0(Actor *this, s32 next_state) { ActorLocal_CCW_61E0 *local; local = (ActorLocal_CCW_61E0 *)&this->local; if (next_state == 1) { func_80335924(this->unk148, 0x25B, 0.0f, 1.0f); - func_80335800(this->unk148, 0.5f, func_8038C5D0, this->marker); - func_80335800(this->unk148, 0.7f, func_8038C638, this->marker); + func_80335800(this->unk148, 0.5f, CCW_func_8038C5D0, this->marker); + func_80335800(this->unk148, 0.7f, CCW_func_8038C638, this->marker); } if (next_state == 3) { local->unk0[0] = this->position[0]; @@ -68,7 +68,7 @@ void func_8038C7A8(Actor *this) { sp4C = (func_8028E86C() == this->marker); if (this->state == 0) { - func_8038C6A0(this, sp4C ? 2 : 1); + CCW_func_8038C6A0(this, sp4C ? 2 : 1); } if (this->state == 1) { @@ -76,16 +76,16 @@ void func_8038C7A8(Actor *this) { if (ml_vec3f_distance(this->position, sp38) < 50.0f) { func_8028F030(0x2A9); FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 500, 2500); - func_8038C6A0(this, 5); + CCW_func_8038C6A0(this, 5); } } if (this->state == 2) { if (this->unk138_21) { func_8028F010(0x2A9); - func_8038C6A0(this, 3); + CCW_func_8038C6A0(this, 3); } else if (!sp4C) { func_8028F050(0x2A9); - func_8038C6A0(this, 5); + CCW_func_8038C6A0(this, 5); } } if (this->state == 3) { @@ -94,7 +94,7 @@ void func_8038C7A8(Actor *this) { func_80255FE4(this->position, local->unk0, local->unkC, local->unk18); this->position[1] += 50.0f * sinf(local->unk18 * BAD_PI); if (local->unk18 == 1.0) { - func_8038C6A0(this, 4); + CCW_func_8038C6A0(this, 4); } } } diff --git a/src/CCW/code_6620.c b/src/CCW/code_6620.c index 16fc476b..8e63be4e 100644 --- a/src/CCW/code_6620.c +++ b/src/CCW/code_6620.c @@ -15,7 +15,7 @@ typedef struct{ f32 unk4[3]; }ActorLocal_CCW_6620; -Actor *func_8038CBF0(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx); +Actor *CCW_func_8038CBF0(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_8038CC4C(Actor *this); /* .data */ @@ -29,7 +29,7 @@ Struct_CCW_6620_0 D_8038F490[] ={ ActorInfo D_8038F4A8 = { 0x1BD, 0x2AA, 0x48F, 0x0, NULL, - func_8038CC4C, NULL, func_8038CBF0, + func_8038CC4C, NULL, CCW_func_8038CBF0, 0, 0, 2.2f, 0 }; @@ -67,7 +67,7 @@ void func_8038CB40(Actor *this, s32 next_state) { } -Actor *func_8038CBF0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { +Actor *CCW_func_8038CBF0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { Actor *this; ActorLocal_CCW_6620 *local; diff --git a/src/CCW/code_7120.c b/src/CCW/code_7120.c index 9a140294..55e9791e 100644 --- a/src/CCW/code_7120.c +++ b/src/CCW/code_7120.c @@ -17,7 +17,7 @@ ActorInfo D_8038F640 = { }; /* .code */ -void func_8038D510(Actor *this) { +void CCW_func_8038D510(Actor *this) { static s32 D_8038F664[3] = {0xDE, 0xA7, 0x71}; static struct42s D_8038F670 = { {{ 0.0f, 50.0f, 0.0f}, { 70.0f, 100.0f, 70.0f}}, @@ -70,7 +70,7 @@ void func_8038D6D8(Actor *this, s32 next_state) { if (next_state == 2) { this->marker->propPtr->unk8_3 = FALSE; func_802BB3DC(0, 60.0f, 0.7f); - func_8038D510(this); + CCW_func_8038D510(this); func_8038D5DC(this); FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.3f, 15000); FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.5f, 15000); diff --git a/src/CCW/code_76C0.c b/src/CCW/code_76C0.c index 0f2e80a9..028b0f6e 100644 --- a/src/CCW/code_76C0.c +++ b/src/CCW/code_76C0.c @@ -61,7 +61,7 @@ extern ActorInfo D_8038F81C; extern ActorInfo D_8038F840; extern ActorInfo D_8038F864; -void func_8038DB0C(Actor *this); +void CCW_func_8038DB0C(Actor *this); void func_8038DAB0(Actor *this); /* .data */ @@ -72,9 +72,9 @@ ActorInfo D_8038F78C = { 0x238, 0x262, 0x4FB, 0x1, NULL, func_802D3D54, func_803 ActorInfo D_8038F7B0 = { 0x243, 0x2E6, 0x533, 0x1, NULL, func_802D3D54, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_8038F7D4 = { 0x263, 0x2E7, 0x518, 0x1, NULL, func_8038DAB0, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_8038F7F8 = { 0x21E, 0x233, 0x3B3, 0x1, NULL, func_802D3D74, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; -ActorInfo D_8038F81C = { 0x26B, 0x2DE, 0x531, 0x1, NULL, func_8038DB0C, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; -ActorInfo D_8038F840 = { 0x26C, 0x2DD, 0x53E, 0x1, NULL, func_8038DB0C, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; -ActorInfo D_8038F864 = { 0x26D, 0x2DC, 0x53F, 0x1, NULL, func_8038DB0C, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +ActorInfo D_8038F81C = { 0x26B, 0x2DE, 0x531, 0x1, NULL, CCW_func_8038DB0C, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +ActorInfo D_8038F840 = { 0x26C, 0x2DD, 0x53E, 0x1, NULL, CCW_func_8038DB0C, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +ActorInfo D_8038F864 = { 0x26D, 0x2DC, 0x53F, 0x1, NULL, CCW_func_8038DB0C, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_8038F888 = { 0x1CC, 0x318, 0x0, 0x0, NULL, func_80325F84, NULL, func_80325340, 0, 0, 0.0f, 0}; @@ -89,7 +89,7 @@ void func_8038DAB0(Actor *this){ } } -void func_8038DB0C(Actor *this){ +void CCW_func_8038DB0C(Actor *this){ if(!this->initialized){ func_802D3D74(this); this->initialized = TRUE; @@ -99,7 +99,7 @@ void func_8038DB0C(Actor *this){ } } -void func_8038DB6C(void) +void CCW_func_8038DB6C(void) { spawnableActorList_add(&D_8038EB50, actor_new, 0X80); spawnableActorList_add(&D_8038EB74, actor_new, 0X80); diff --git a/src/CCW/code_7BF0.c b/src/CCW/code_7BF0.c index b23ec383..4a3340c1 100644 --- a/src/CCW/code_7BF0.c +++ b/src/CCW/code_7BF0.c @@ -25,7 +25,7 @@ void func_8038DFE0(Actor* actor) { actor->unk38_31 = randi2(0, 0); } -void func_8038E034(Actor* actor) { +void CCW_func_8038E034(Actor* actor) { func_80328B8C(actor, 2, 0.001f, 1); } @@ -101,7 +101,7 @@ void func_8038E0C8(Actor *this) { && (this->unk38_31 == 0) && (player_getTransformation() == TRANSFORM_1_BANJO) ) { - func_8038E034(this); + CCW_func_8038E034(this); } break; diff --git a/src/CCW/code_950.c b/src/CCW/code_950.c index 30c2b89d..cc629a87 100644 --- a/src/CCW/code_950.c +++ b/src/CCW/code_950.c @@ -83,7 +83,7 @@ void func_80387124(ActorMarker* marker, ActorMarker *other_marker) { chwasp_setState(marker_getActor(marker), 3); } -void func_80387150(ActorMarker* marker, ActorMarker *other_marker) { +void CCW_func_80387150(ActorMarker* marker, ActorMarker *other_marker) { chwasp_setState(marker_getActor(marker), 4); } @@ -120,7 +120,7 @@ void chwasp_update(Actor *this) { func_8030DD14(local->unk0, 2); func_8030DBB4(local->unk0, 0.9f); sfxsource_setSampleRate(local->unk0, 0); - marker_setCollisionScripts(this->marker, func_80387124, NULL, func_80387150); + marker_setCollisionScripts(this->marker, func_80387124, NULL, CCW_func_80387150); chwasp_setState(this, 1); return; } diff --git a/src/FP/code_0.c b/src/FP/code_0.c index cdd28a6c..7d41cddd 100644 --- a/src/FP/code_0.c +++ b/src/FP/code_0.c @@ -5,22 +5,22 @@ void func_803867BC(Actor *this); /* .data */ -ActorAnimationInfo D_803919F0[] ={ +ActorAnimationInfo FP_D_803919F0[] ={ {ASSET_1A1_ANIM_SLED, 1.0f}, {ASSET_1A1_ANIM_SLED, 1.0f}, {ASSET_1A1_ANIM_SLED, 1.0f}, {ASSET_1A1_ANIM_SLED, 1.0f} }; -ActorInfo D_80391A10 = { +ActorInfo FP_D_80391A10 = { MARKER_3B_SCARF_SLED, ACTOR_181_SCARF_SLED, ASSET_352_MODEL_SLED, - 0, D_803919F0, + 0, FP_D_803919F0, NULL, func_803867BC, func_80325888, 1000, 0, 0.0f, 0 }; /* .code */ -void func_803863F0(Actor *this, s32 next_state){ +void FP_func_803863F0(Actor *this, s32 next_state){ func_80328A84(this, next_state); if(next_state == 2){ @@ -47,7 +47,7 @@ void func_803864F4(ActorMarker *this_marker, ActorMarker *other_marker){ if(player_getTransformation() != TRANSFORM_1_BANJO) return; if(func_8028F68C(BS_INTR_27_BANJO_SLED, this->marker)) - func_803863F0(this, 2); + FP_func_803863F0(this, 2); } void func_8038655C(Actor *this){ @@ -128,7 +128,7 @@ void func_803867BC(Actor *this){ this->marker->propPtr->unk8_3 = TRUE; this->unk10_12 = 0; ml_vec3f_clear(this->velocity); - func_803863F0(this, 1); + FP_func_803863F0(this, 1); } if(!this->unk16C_4){ diff --git a/src/FP/code_19E0.c b/src/FP/code_19E0.c index 391c1208..521ba8ce 100644 --- a/src/FP/code_19E0.c +++ b/src/FP/code_19E0.c @@ -143,7 +143,7 @@ void func_803881AC(Actor *this){ if( 1.0f == this->velocity_x && func_80387EE4(this)){ func_8025A6EC(COMUSIC_2B_DING_B, 28000); - func_8038BA88(this->unkF4_8); + FP_func_8038BA88(this->unkF4_8); } if(func_80388000(this)){ diff --git a/src/FP/code_2350.c b/src/FP/code_2350.c index dc8ea9e5..20ea323b 100644 --- a/src/FP/code_2350.c +++ b/src/FP/code_2350.c @@ -25,7 +25,7 @@ typedef struct { Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2); void func_80388EE8(ParticleEmitter *pCtrl); -void func_80388F4C(Actor *this); +void FP_func_80388F4C(Actor *this); void func_803896FC(Actor *this); /* .data */ @@ -47,7 +47,7 @@ ActorAnimationInfo D_80391C80[] = { ActorInfo D_80391CE8 = { 0x97, ACTOR_C8_BOGGY_2, ASSET_38A_MODEL_BOGGY_1, 0x1, D_80391C80, - func_80388F4C, func_803896FC, func_80388740, + FP_func_80388F4C, func_803896FC, func_80388740, 0, 0, 1.4f, 0 }; f32 D_80391D0C[3] = {1842.0f, 658.0f, 5758.0f}; @@ -67,7 +67,7 @@ struct42s D_80391D58 = { }; f32 D_80391D88[3] = { 1592.0f, 673.0f, 5895.0f}; -f32 D_80391D94[3] = {0.0f, 0.0f, 0.0f}; +f32 FP_D_80391D94[3] = {0.0f, 0.0f, 0.0f}; s32 D_80391DA0[3] = {0x5F5, 0x292, 0x1539}; s32 D_80391DAC[3] = {-0x11F8, 0x637, -0x1816}; Struct_FP_2350 D_80391DB8[7]={ @@ -117,7 +117,7 @@ Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ return this; } -void func_803888E4(Actor *this){ +void FP_func_803888E4(Actor *this){ func_80328B8C(this, 0xC, 0.0001f, 1); if(!jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){ if(mapSpecificFlags_get(5)){ @@ -200,7 +200,7 @@ void func_80388C88(Actor *this){ local->unk18 = 1; } -bool func_80388CA0(Actor *this){ +bool FP_func_80388CA0(Actor *this){ ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local; u32 sp20; @@ -241,7 +241,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){ default://L80388E78 switch(arg2){ case 1: - func_803888E4(this); + FP_func_803888E4(this); mapSpecificFlags_set(6, TRUE); break; case 0: @@ -263,10 +263,10 @@ void func_80388EE8(ParticleEmitter *pCtrl){ func_802F0D54(pCtrl); } -void func_80388F4C(Actor *this){} +void FP_func_80388F4C(Actor *this){} void func_80388F54(ActorMarker *marker){ - Actor *other = func_80328230(ACTOR_C8_BOGGY_2, D_80391D88, D_80391D94); + Actor *other = func_80328230(ACTOR_C8_BOGGY_2, D_80391D88, FP_D_80391D94); func_80343DEC(other); } @@ -463,11 +463,11 @@ void func_803896FC(Actor *this){ switch(this->state){ case 1:// L803899B8 - if(func_80388CA0(this)){ + if(FP_func_80388CA0(this)){ func_80388B18(this, local->unk19); }//L803899DC else if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_C_WALRUS_SLED){ - func_803888E4(this); + FP_func_803888E4(this); } else if( func_80329530(this, 0x1C2) && func_8028ECAC() == 0 diff --git a/src/FP/code_3E00.c b/src/FP/code_3E00.c index c5ab107f..b27fff19 100644 --- a/src/FP/code_3E00.c +++ b/src/FP/code_3E00.c @@ -27,7 +27,7 @@ ActorInfo D_80391E08 = { MARKER_1FA_POLAR_BEAR_CUB_BLUE, ACTOR_1EA_POLAR_BEAR_CU 2500, 0, 1.2f, 0 }; -ActorInfo D_80391E2C = { MARKER_1FB_POLAR_BEAR_CUB_GREEN, ACTOR_1EB_POLAR_BEAR_CUB_GREEN, ASSET_44D_MODEL_POLAR_BEAR_CUB_GREEN, +ActorInfo FP_D_80391E2C = { MARKER_1FB_POLAR_BEAR_CUB_GREEN, ACTOR_1EB_POLAR_BEAR_CUB_GREEN, ASSET_44D_MODEL_POLAR_BEAR_CUB_GREEN, 0x1, D_80391DF0, func_8038A384, func_80326224, func_80325888, 2500, 0, 1.2f, 0 @@ -39,7 +39,7 @@ ActorInfo D_80391E50 = { MARKER_1FC_POLAR_BEAR_CUB_RED, ACTOR_1EC_POLAR_BEAR_CUB 2500, 0, 1.2f, 0 }; -f32 D_80391E74[3] = {-5.0f, 180.0f, 1.0f}; +f32 FP_D_80391E74[3] = {-5.0f, 180.0f, 1.0f}; Struct_FP_3E00 D_80391E80[] ={ {0x11, MARKER_1FD_BLUE_PRESENT_COLLECTABLE, ACTOR_1ED_BLUE_PRESENT_COLLECTABLE, 0x1EE}, {0x12, MARKER_1FE_GREEN_PRESENT_COLLECTABLE, ACTOR_1EF_GREEN_PRESENT_COLLECTABLE, 0x1F0}, @@ -72,7 +72,7 @@ void func_8038A274(Actor *this){ void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){ if(text_id == 0xc19){ func_802BAFE4(0x25); - jiggySpawn(JIGGY_2E_FP_PRESENTS, D_80391E74); + jiggySpawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74); func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000); func_8025A6EC(COMUSIC_5B_FP_IGLOO_HAPPY, 25000); func_8025A58C(0, 4000); diff --git a/src/FP/code_45D0.c b/src/FP/code_45D0.c index 35143d5d..eb08b9b0 100644 --- a/src/FP/code_45D0.c +++ b/src/FP/code_45D0.c @@ -14,7 +14,7 @@ typedef struct { extern Struct_FP_45D0_0 D_80392F50; /* .code */ -void func_8038A9C0(void){ +void FP_func_8038A9C0(void){ if( map_get() != MAP_27_FP_FREEZEEZY_PEAK || jiggyscore_isCollected(JIGGY_2D_FP_SNOWMAN_BUTTONS) || jiggyscore_isSpawned(JIGGY_2D_FP_SNOWMAN_BUTTONS) diff --git a/src/FP/code_4770.c b/src/FP/code_4770.c index 7562b48f..6c33c45e 100644 --- a/src/FP/code_4770.c +++ b/src/FP/code_4770.c @@ -44,7 +44,7 @@ extern Struct_FP_4770 D_80393280[0x27]; /* .code */ -void func_8038AB60(s32 arg0){ +void FP_func_8038AB60(s32 arg0){ int i; func_8028F8F8(0xe, arg0 ^ 1); @@ -176,7 +176,7 @@ void func_8038B074(s32 indx){ } } -void func_8038B0B8(void){ +void FP_func_8038B0B8(void){ int i; for(i = 0; i < 5; i++){ func_8038B074(i); @@ -210,7 +210,7 @@ void func_8038B1C4(void){ void func_8038B1D0(enum jiggy_e jiggy_id){ timed_setCameraToNode(0.0f, 3); timedFunc_set_0(0.0f, func_8038AEA0); - timedFunc_set_0(0.0f, func_8038B0B8); + timedFunc_set_0(0.0f, FP_func_8038B0B8); timedFunc_set_1(0.1f, (GenMethod_1) func_8038B130, jiggy_id); timedFunc_set_0(5.0f, func_8038B190); timedFunc_set_0(5.0f, func_8038B1C4); @@ -221,7 +221,7 @@ void func_8038B1D0(enum jiggy_e jiggy_id){ void func_8038B268(void){ func_80324E88(0.0f); timedFunc_set_0(0.0f, func_8038AEA0); - timedFunc_set_0(0.0f, func_8038B0B8); + timedFunc_set_0(0.0f, FP_func_8038B0B8); func_8028FA14(map_get(), 0x11); func_8028F66C(BS_INTR_2A); } @@ -264,7 +264,7 @@ void func_8038B39C(void){ } func_8028F918(1); func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 28000); - func_8038AB60(0); + FP_func_8038AB60(0); func_8038ABDC(); timed_setCameraToNode(0.0f, 1); } @@ -278,7 +278,7 @@ void func_8038B410(void){ sp2C->unk38_31 = 1; func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000); - func_8038AB60(0); + FP_func_8038AB60(0); func_8038ABDC(); if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){ timed_setCameraToNode(0.0f, 1); @@ -355,7 +355,7 @@ void func_8038B544(void){ void func_8038B7A4(void){ int i; - func_8038AB60(0); + FP_func_8038AB60(0); if(map_get() != MAP_27_FP_FREEZEEZY_PEAK || jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)){ D_803935A8.unk0 = 0; @@ -442,11 +442,11 @@ void func_8038B9C8(void){ D_803935A8.unk18 = 0; D_803935A8.unk19 = 0; D_803935A8.unk1A = 0; - func_8038AB60(1); + FP_func_8038AB60(1); D_803935A8.unk0 = 2; } -void func_8038BA88(s32 arg0){ +void FP_func_8038BA88(s32 arg0){ D_803935A8.unk8 = --arg0; func_8038AC20(arg0, 3); @@ -517,7 +517,7 @@ void func_8038BC0C(s32 arg0){ if(D_803935A8.unk1A) break; D_803935A8.unk1A = TRUE; - func_8038AB60(0); + FP_func_8038AB60(0); if(!func_8028F22C()){ func_8028F918(2); func_80311480(0xc10, 0x20, NULL, NULL, func_8038B2C8, NULL); diff --git a/src/FP/code_4D0.c b/src/FP/code_4D0.c index ae60c4ec..db53b4f4 100644 --- a/src/FP/code_4D0.c +++ b/src/FP/code_4D0.c @@ -6,16 +6,16 @@ Actor *func_803868C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_80386AA4(Actor *this); /* .data */ -ActorAnimationInfo D_80391A40 []= { +ActorAnimationInfo FP_D_80391A40 []= { { ASSET_1A1_ANIM_SLED, 1.0f}, { ASSET_1A1_ANIM_SLED, 1.0f}, { ASSET_1A1_ANIM_SLED, 1.0f}, { ASSET_1A1_ANIM_SLED, 1.0f} }; -ActorInfo D_80391A60 = { +ActorInfo FP_D_80391A60 = { MARKER_3C_RACE_SLED, ACTOR_182_RACE_SLED, ASSET_352_MODEL_SLED, - 0x0, D_80391A40, + 0x0, FP_D_80391A40, func_80386AA4, NULL, func_803868C0, 1000, 0, 0.0f, 0 }; @@ -29,7 +29,7 @@ Actor *func_803868C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ return this; } -void func_80386920(Actor *this, s32 next_state){ +void FP_func_80386920(Actor *this, s32 next_state){ if(this->state != 1 || next_state != 1){ func_80328A84(this, next_state); switch(next_state){ @@ -60,7 +60,7 @@ void func_803869FC(ActorMarker *this_marker, ActorMarker *other_marker){ && player_getTransformation() == TRANSFORM_4_WALRUS && func_8028F68C(BS_INTR_27_WALRUS_SLED, this->marker) ){ - func_80386920(this, 3); //start_race + FP_func_80386920(this, 3); //start_race } } } @@ -70,23 +70,23 @@ void func_80386AA4(Actor *this){ if(!this->initialized){ this->initialized = TRUE; marker_setCollisionScripts(this->marker, func_803869FC, NULL, NULL); - func_80386920(this, 1); + FP_func_80386920(this, 1); } sp24 = mapSpecificFlags_get(4); if(sp24 == 0){ - func_80386920(this, 1); + FP_func_80386920(this, 1); } switch (this->state){ case 1://L80386B38 if(sp24){ - func_80386920(this, 2); + FP_func_80386920(this, 2); } break; case 3://L80386B50 if(func_8028ECAC() != BSGROUP_C_WALRUS_SLED){ - func_80386920(this, 2); + FP_func_80386920(this, 2); } break; } diff --git a/src/FP/code_6AE0.c b/src/FP/code_6AE0.c index 6ad35a89..e9237432 100644 --- a/src/FP/code_6AE0.c +++ b/src/FP/code_6AE0.c @@ -5,7 +5,7 @@ extern void func_80324CD8(f32); extern Actor *func_8032813C(enum actor_e, f32[3], s32); -Actor *func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); +Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_8038D6C8(Actor *this); /* .data */ @@ -19,7 +19,7 @@ ActorAnimationInfo D_803920C0[] ={ ActorInfo D_803920E8 = { 0x204, 0x336, 0x442, 0x1, D_803920C0, - func_8038D6C8, func_80326224, func_8038CED0, + func_8038D6C8, func_80326224, FP_func_8038CED0, 0, 0, 0.0f, 0 }; @@ -115,7 +115,7 @@ enum actor_e D_8039236C[4] = { f32 D_8039237C[3] = {-3940.0f, 69.0f, 3570.0f}; /* .code */ -Actor *func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ +Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ Actor *this = marker_getActor(marker); if( func_8038BFA0() || func_8031FF1C(BKPROG_13) ){ if(0.0f == this->velocity[1]) diff --git a/src/FP/code_790.c b/src/FP/code_790.c index 8d06a42d..5c914be8 100644 --- a/src/FP/code_790.c +++ b/src/FP/code_790.c @@ -3,20 +3,20 @@ #include "variables.h" Actor *func_80386B80(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); -void func_80386CF8(Actor *this); +void FP_func_80386CF8(Actor *this); /* .data */ -ActorAnimationInfo D_80391A90[] ={ +ActorAnimationInfo FP_D_80391A90[] ={ {0, 0.0}, {ASSET_143_ANIM_SNOWMAN_BUTTON, 800000.0f}, {ASSET_143_ANIM_SNOWMAN_BUTTON, 0.5f}, {ASSET_143_ANIM_SNOWMAN_BUTTON, 800000.0f} }; -ActorInfo D_80391AB0 = { +ActorInfo FP_D_80391AB0 = { MARKER_B9_FP_SNOWMAN_BUTTON, ACTOR_116_FP_SNOWMAN_BUTTON, ASSET_421_MODEL_FP_SNOWMAN_BUTTON, - 0x1, D_80391A90, - func_80386CF8, func_80326224, func_80386B80, + 0x1, FP_D_80391A90, + FP_func_80386CF8, func_80326224, func_80386B80, 0, 0x800, 0.0f, 0 }; @@ -45,7 +45,7 @@ Actor *func_80386B80(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ } -void func_80386BEC(Actor *this){ +void FP_func_80386BEC(Actor *this){ f32 plyr_pos[3]; ParticleEmitter *pCtrl = partEmitList_pushNew(12); @@ -67,11 +67,11 @@ void func_80386CB8(ActorMarker *this_marker, ActorMarker *other_marker){ Actor *this = marker_getActor(this_marker); if(this->state == 1) - func_80386BEC(this); + FP_func_80386BEC(this); } -void func_80386CF8(Actor *this){ +void FP_func_80386CF8(Actor *this){ marker_setCollisionScripts(this->marker, NULL, NULL, func_80386CB8); this->marker->propPtr->unk8_3 = TRUE; actor_collisionOn(this); diff --git a/src/FP/code_8E20.c b/src/FP/code_8E20.c index f7bd12f1..6a125b5d 100644 --- a/src/FP/code_8E20.c +++ b/src/FP/code_8E20.c @@ -11,14 +11,14 @@ typedef struct { } ActorLocal_Wozza; Actor *func_8038F210(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); -void func_8038F7AC(Actor *this); +void FP_func_8038F7AC(Actor *this); /* .data */ extern ActorAnimationInfo D_80392520[]; extern ActorInfo D_80392588 = { MARKER_20B_WOZZA, ACTOR_1F3_WOZZA, ASSET_494_MODEL_WOZZA, 0x1, D_80392520, - func_8038F7AC, func_80326224, func_8038F210, + FP_func_8038F7AC, func_80326224, func_8038F210, 0, 0, 1.6f, 0 }; @@ -132,7 +132,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){ } -bool func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){ +bool FP_func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){ s32 dTheta; func_80328C64(this, func_803297C8(this, arg1)); @@ -144,7 +144,7 @@ bool func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){ return FALSE; } -void func_8038F758(ActorMarker *marker){ +void FP_func_8038F758(ActorMarker *marker){ Actor *this = marker_getActor(reinterpret_cast(ActorMarker *, marker)); Actor *jiggy = spawn_child_actor(ACTOR_1F4_WOZZAS_JIGGY, &this); s32 pad; @@ -155,7 +155,7 @@ void func_8038F758(ActorMarker *marker){ } -void func_8038F7AC(Actor *this){ +void FP_func_8038F7AC(Actor *this){ ActorLocal_Wozza * local = (ActorLocal_Wozza *)&this->local; if(func_803203FC(0xC4)){ @@ -190,7 +190,7 @@ void func_8038F7AC(Actor *this){ this->position[0] = local->unkC[0];\ this->position[1] = local->unkC[1];\ this->position[2] = local->unkC[2]; - __spawnqueue_add_1(func_8038F758, this->marker); + __spawnqueue_add_1(FP_func_8038F758, this->marker); local->unk30 = FALSE; } }//L8038F910 @@ -244,7 +244,7 @@ void func_8038F7AC(Actor *this){ break; case 5: //L8038FB50 - func_8038F6C4(this, local->unk18, 1.0f); + FP_func_8038F6C4(this, local->unk18, 1.0f); if(0.97 < animctrl_getAnimTimer(this->animctrl)){ func_80328B8C(this, 6, 0.02f, 1); actor_loopAnimation(this); @@ -252,7 +252,7 @@ void func_8038F7AC(Actor *this){ break; case 6: //L8038FBA8 - func_8038F6C4(this, local->unk18, 1.0f); + FP_func_8038F6C4(this, local->unk18, 1.0f); if( func_80329530(this, 1700) ) break; if( func_8028ECAC() == BSGROUP_A_FLYING ) break; @@ -266,7 +266,7 @@ void func_8038F7AC(Actor *this){ break; case 7: //L8038FC30 - if(!func_8038F6C4(this, local->unkC, 4.5f)) + if(!FP_func_8038F6C4(this, local->unkC, 4.5f)) break; if(func_80329530(this, 1000) || func_8028ECAC() == BSGROUP_A_FLYING){ @@ -294,7 +294,7 @@ void func_8038F7AC(Actor *this){ }//L8038FD40 if(mapSpecificFlags_get(8)){ - if(func_8038F6C4(this, D_803925AC, 9.0f)){ + if(FP_func_8038F6C4(this, D_803925AC, 9.0f)){ func_80328B8C(this, 9, 0.02f, 1); actor_playAnimationOnce(this); } @@ -315,7 +315,7 @@ void func_8038F7AC(Actor *this){ break; case 9: //L8038FE14 - func_8038F6C4(this, D_803925AC, 9.0f); + FP_func_8038F6C4(this, D_803925AC, 9.0f); if(0.97 < animctrl_getAnimTimer(this->animctrl)){ func_80328B8C(this, 10, 0.02f, 1); actor_loopAnimation(this); diff --git a/src/FP/code_A40.c b/src/FP/code_A40.c index 2d8b81ab..803260b3 100644 --- a/src/FP/code_A40.c +++ b/src/FP/code_A40.c @@ -2,21 +2,21 @@ #include "functions.h" #include "variables.h" -Actor *func_80386E30(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); +Actor *FP_func_80386E30(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void chXmasTree_update(Actor *this); /* .data */ ActorInfo D_80391B50 = { MARKER_BA_XMAS_TREE, ACTOR_15F_XMAS_TREE, ASSET_488_MODEL_XMAS_TREE, 0x1, NULL, - chXmasTree_update, func_80326224, func_80386E30, + chXmasTree_update, func_80326224, FP_func_80386E30, 0, 0, 0.0f, 0 }; s32 chXmasTree_switch_spawn_position[3] = {-0x1220, 0x6A, 0x1945}; /* .code */ -Actor *func_80386E30(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ +Actor *FP_func_80386E30(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ Actor *this = marker_getActor(marker); func_8033A45C(5, this->unk38_31); func_8033A45C(6, func_8031FF1C(0x13) && !func_8033A0F0(5)); @@ -34,7 +34,7 @@ void func_80386EAC(Actor *this){ } } -void func_80386EF4(Actor *this, int arg1){ +void FP_func_80386EF4(Actor *this, int arg1){ this->unk38_31 = arg1; mapSpecificFlags_set(0, this->unk38_31); @@ -49,14 +49,14 @@ void func_80386F3C(void){ void func_80386F84(Actor * this){ func_80328A84(this, 2); - func_80386EF4(this, 0); + FP_func_80386EF4(this, 0); } void func_80386FB4(void){ func_8032811C(ACTOR_338_XMAS_TREE_SWITCH, chXmasTree_switch_spawn_position, 350); } -void func_80386FE0(void *marker){ +void FP_func_80386FE0(void *marker){ Actor *this = marker_getActor(reinterpret_cast(ActorMarker *, marker)); Actor *child = spawn_child_actor(0x339, &this); s32 pad; @@ -99,7 +99,7 @@ void chXmasTree_update(Actor *this){ sfxsource_setSampleRate(this->unk44_31, 28000); } func_802C3BF8(func_80386FB4); - __spawnqueue_add_1(func_80386FE0, this->marker); + __spawnqueue_add_1(FP_func_80386FE0, this->marker); if(func_8031FF1C(0x13)){ func_80386F84(this); mapSpecificFlags_set(2, FALSE); @@ -108,13 +108,13 @@ void chXmasTree_update(Actor *this){ this->unk124_9 = 1; if(jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE) || levelSpecificFlags_get(0x29)){ - func_80386EF4(this, 1); + FP_func_80386EF4(this, 1); return; } switch(this->state){ case 1: // L80387268 - func_80386EF4(this, 0); + FP_func_80386EF4(this, 0); if(func_8031FF1C(0x13)){ func_80386F84(this); } @@ -133,14 +133,14 @@ void chXmasTree_update(Actor *this){ case 3: // L803872F0 if(0.0 <= this->unk60){ if( 1.8 < this->unk60){ - func_80386EF4(this, 0); + FP_func_80386EF4(this, 0); } else if(this->unk60 < 0.2){//L80387340 - func_80386EF4(this, 1); + FP_func_80386EF4(this, 1); } else{ if(randf() < 0.2){ - func_80386EF4(this, this->unk38_31 ^ 1); + FP_func_80386EF4(this, this->unk38_31 ^ 1); func_8038709C(this); } }//L803873AC @@ -149,7 +149,7 @@ void chXmasTree_update(Actor *this){ else{//L803873BC if(func_802BB270()){ func_80328A84(this, 4); - func_80386EF4(this, 1); + FP_func_80386EF4(this, 1); item_set(ITEM_0_HOURGLASS_TIMER, 3600 - 1); item_set(ITEM_6_HOURGLASS, TRUE); @@ -160,7 +160,7 @@ void chXmasTree_update(Actor *this){ case 4: // L80387400 if(mapSpecificFlags_get(3)){ func_80328A84(this, 6); - func_80386EF4(this, 1); + FP_func_80386EF4(this, 1); item_set(ITEM_6_HOURGLASS, FALSE); tmp_a0 = this->unk44_31; if(tmp_a0){ @@ -189,14 +189,14 @@ void chXmasTree_update(Actor *this){ case 5: // L803874EC if(0.0 <= this->unk60){ if( 1.8 < this->unk60){ - func_80386EF4(this, 1); + FP_func_80386EF4(this, 1); } else if(this->unk60 < 0.2){ - func_80386EF4(this, 0); + FP_func_80386EF4(this, 0); } else{ if(randf() < 0.2){ - func_80386EF4(this, this->unk38_31 ^ 1); + FP_func_80386EF4(this, this->unk38_31 ^ 1); func_8038709C(this); } } diff --git a/src/FP/code_A880.c b/src/FP/code_A880.c index c6fc5351..b31e19cf 100644 --- a/src/FP/code_A880.c +++ b/src/FP/code_A880.c @@ -7,12 +7,12 @@ extern s32 func_8024DB50(f32[3], f32); void func_80390EB0(Actor *this); /* .data */ -extern ActorInfo D_80392840 = { MARKER_245_XMAS_TREE_EGG_TOLL, ACTOR_353_XMAS_TREE_EGG_TOLL, ASSET_402_MODEL_EGG_TOLL, +extern ActorInfo FP_D_80392840 = { MARKER_245_XMAS_TREE_EGG_TOLL, ACTOR_353_XMAS_TREE_EGG_TOLL, ASSET_402_MODEL_EGG_TOLL, 0x0, NULL, func_80390EB0, func_80326224, func_80325340, 2000, 0, 0.0f, 0 }; -struct40s D_80392864; +extern struct40s FP_D_80392864; s32 D_80392894[3]; struct40s D_803928A0; s32 D_803928D0[3]; @@ -33,7 +33,7 @@ void func_80390C70(f32 position[3]){ 0.0f, 40.0f, 0.0f, 0.0f, 90.0f, 0.0f ); - func_802EFC28(pCtrl, &D_80392864); + func_802EFC28(pCtrl, &FP_D_80392864); } void func_80390D58(f32 position[3]){ diff --git a/src/FP/code_ABD0.c b/src/FP/code_ABD0.c index 3ace32af..454cdd64 100644 --- a/src/FP/code_ABD0.c +++ b/src/FP/code_ABD0.c @@ -7,16 +7,16 @@ extern ActorInfo D_80367FE0; -extern ActorInfo D_80391A10; -extern ActorInfo D_80391A60; -extern ActorInfo D_80391AB0; +extern ActorInfo FP_D_80391A10; +extern ActorInfo FP_D_80391A60; +extern ActorInfo FP_D_80391AB0; extern ActorInfo D_80391B50; extern ActorInfo D_80391BB0; extern ActorInfo D_80391C18; extern ActorInfo D_80391C58; extern ActorInfo D_80391CE8; extern ActorInfo D_80391E08; -extern ActorInfo D_80391E2C; +extern ActorInfo FP_D_80391E2C; extern ActorInfo D_80391E50; extern ActorInfo D_80391F88; extern ActorInfo D_80391FAC; @@ -35,25 +35,25 @@ extern ActorInfo D_80392690; extern ActorInfo D_803926C0; extern ActorInfo D_80392700; extern ActorInfo D_80392730; -extern ActorInfo D_80392840; +extern ActorInfo FP_D_80392840; void func_80391040(Actor *this); void func_80391180(Actor *this); -void func_80391254(Actor *this); +void FP_func_80391254(Actor *this); void func_803912EC(Actor *this); void func_8039180C(Actor *this); void func_80391894(Actor *this); /* .data */ -ActorInfo D_803928E0 = { 0x247, 0x355, 0x4E5, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0}; +ActorInfo FP_D_803928E0 = { 0x247, 0x355, 0x4E5, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0}; ActorInfo D_80392904 = { 0x248, 0x356, 0x4E6, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0}; ActorInfo D_80392928 = { 0x249, 0x357, 0x4E7, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0}; ActorInfo D_8039294C = { 0x24A, 0x358, 0x4E8, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0}; ActorInfo D_80392970 = { 0x21F, 0x22B, 0x4C4, 0x1, NULL, func_80391180, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_80392994 = { 0x220, 0x22C, 0x4C5, 0x1, NULL, func_80391180, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; -ActorInfo D_803929B8 = { 0x221, 0x22D, 0x4C6, 0x1, NULL, func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; -ActorInfo D_803929DC = { 0x222, 0x22E, 0x4C6, 0x1, NULL, func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; -ActorInfo D_80392A00 = { 0x223, 0x22F, 0x4C6, 0x1, NULL, func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +ActorInfo D_803929B8 = { 0x221, 0x22D, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +ActorInfo D_803929DC = { 0x222, 0x22E, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +ActorInfo D_80392A00 = { 0x223, 0x22F, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_80392A24 = { 0x24B, 0x35D, 0x4E9, 0x1, NULL, func_803912EC, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_80392A48 = { 0x24C, 0x35E, 0x4EC, 0x1, NULL, func_803912EC, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_80392A6C = { 0x24D, 0x35F, 0x4EA, 0x1, NULL, func_803912EC, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; @@ -131,7 +131,7 @@ void func_80391180(Actor *this){ } } -void func_80391254(Actor *this){ +void FP_func_80391254(Actor *this){ func_802D3D74(this); if(!this->unk16C_4){ this->unk16C_4 = TRUE; @@ -152,15 +152,15 @@ void func_803912EC(Actor *this){ } -void func_80391324(void) +void FP_func_80391324(void) { - spawnableActorList_add(&D_80391AB0, actor_new, 0X600); + spawnableActorList_add(&FP_D_80391AB0, actor_new, 0X600); spawnableActorList_add(&D_80391BB0, actor_new, 0X2A); spawnableActorList_add(&D_80391C18, actor_new, 0X180084); spawnableActorList_add(&D_80391C58, actor_new, 0X180084); spawnableActorList_add(&D_80391CE8, actor_new, 0X2002E); spawnableActorList_add(&D_80391E08, actor_new, 0X100); - spawnableActorList_add(&D_80391E2C, actor_new, 0X100); + spawnableActorList_add(&FP_D_80391E2C, actor_new, 0X100); spawnableActorList_add(&D_80391E50, actor_new, 0X100); spawnableActorList_add(&D_80391F88, actor_new, 0X2100C); spawnableActorList_add(&D_80391FAC, actor_new, 0X2100C); @@ -174,17 +174,17 @@ void func_80391324(void) spawnableActorList_add(&D_803924B0, actor_new, 8); spawnableActorList_add(&D_803924D4, actor_new, 8); spawnableActorList_add(&D_803924F8, actor_new, 8); - spawnableActorList_add(&D_80391A10, actor_new, 0); - spawnableActorList_add(&D_80391A60, actor_new, 0X20); + spawnableActorList_add(&FP_D_80391A10, actor_new, 0); + spawnableActorList_add(&FP_D_80391A60, actor_new, 0X20); spawnableActorList_add(&D_80392588, actor_new, 0X80108); spawnableActorList_add(&D_80392628, actor_new, 0X44); spawnableActorList_add(&D_80392690, actor_new, 0XA8); spawnableActorList_add(&D_803926C0, actor_new, 0X8000400); spawnableActorList_add(&D_80392700, actor_new, 0X108); - spawnableActorList_add(&D_80392840, actor_new, 0); + spawnableActorList_add(&FP_D_80392840, actor_new, 0); spawnableActorList_add(&D_80392730, actor_new, 0X20000); spawnableActorList_add(&D_80367FE0, actor_new, 0); - spawnableActorList_add(&D_803928E0, actor_new, 0X40); + spawnableActorList_add(&FP_D_803928E0, actor_new, 0X40); spawnableActorList_add(&D_80392904, actor_new, 0X40); spawnableActorList_add(&D_80392928, actor_new, 0X40); spawnableActorList_add(&D_8039294C, actor_new, 0X40); diff --git a/src/GV/code_0.c b/src/GV/code_0.c index 66c78f7c..e6c5369c 100644 --- a/src/GV/code_0.c +++ b/src/GV/code_0.c @@ -5,7 +5,7 @@ void chtoots_update(Actor *this); /* .data */ -ActorAnimationInfo D_80390BD0[] = { +ActorAnimationInfo GV_D_80390BD0[] = { {0x000, 0.0f}, {ASSET_162_ANIM_TOOTS_IDLE, 5.0f}, {ASSET_162_ANIM_TOOTS_IDLE, 2.5f}, @@ -13,7 +13,7 @@ ActorAnimationInfo D_80390BD0[] = { }; ActorInfo D_80390BF0 = { MARKER_1F4_TOOTS, ACTOR_1E4_TOOTS, ASSET_434_MODEL_TOOTS, - 0x1, D_80390BD0, + 0x1, GV_D_80390BD0, chtoots_update, func_80326224, func_80325888, 2000, 0, 0.5f, 0 }; @@ -23,12 +23,12 @@ s32 D_80391A30; s32 D_80391A34; /* .code */ -void func_803863F0(Actor *this){ +void GV_func_803863F0(Actor *this){ func_80328B8C(this, 1, 0.0001f, 1); D_80391A30 = FALSE; } -void func_80386420(Actor *this){ +void GV_func_80386420(Actor *this){ func_80328B8C(this, 2, 0.0001f, 1); this->unk38_31 = 0x23; } @@ -50,7 +50,7 @@ void chtoots_update(Actor *this){ func_80386464(this); } else if(D_80391A30 == TRUE){ - func_80386420(this); + GV_func_80386420(this); } break; case 2://L80386540 @@ -64,12 +64,12 @@ void chtoots_update(Actor *this){ } } else{ - func_803863F0(this); + GV_func_803863F0(this); } break; case 3://L803865C8 if(!D_80391A34) - func_803863F0(this); + GV_func_803863F0(this); break; }//L803865DC } diff --git a/src/GV/code_1570.c b/src/GV/code_1570.c index 53cbb769..3cae2150 100644 --- a/src/GV/code_1570.c +++ b/src/GV/code_1570.c @@ -13,7 +13,7 @@ void chgobi2_update(Actor *this); Actor *chgobi2_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); /* .data */ -ActorInfo D_80390CB0 = { MARKER_BF_GOBI_2, ACTOR_131_GOBI_2, ASSET_3E0_MODEL_GOBI, +ActorInfo GV_D_80390CB0 = { MARKER_BF_GOBI_2, ACTOR_131_GOBI_2, ASSET_3E0_MODEL_GOBI, 0x0, NULL, NULL, chgobi2_update, chgobi2_draw, 0, 0x533, 0.0f, 0 @@ -26,7 +26,7 @@ f32 D_80390CEC[3] = {1145.0f, 443.0f, 9197.0f}; extern u8 D_80391A50; /* .code */ -void func_80387960(void){ +void GV_func_80387960(void){ func_8028F490(D_80390CD4); } @@ -43,7 +43,7 @@ void func_803879D4(ActorMarker *this_marker){ chgobi2_setState(this, 4); } -void func_80387A00(ActorMarker *this_marker){ +void GV_func_80387A00(ActorMarker *this_marker){ Actor *this = marker_getActor(reinterpret_cast(ActorMarker *, this_marker)); chgobi2_setState(this, 7); } @@ -57,7 +57,7 @@ void func_80387A2C(ActorMarker *caller, enum asset_e text_id, s32 arg2){ timed_setCameraToNode(3.0f, 0xd); timedFunc_set_0(3.5f, __chgobi2_spawnJIggy); func_80324E88(6.0f); - timedFunc_set_1(6.0f, (GenMethod_1) func_80387A00, reinterpret_cast(s32, caller)); + timedFunc_set_1(6.0f, (GenMethod_1) GV_func_80387A00, reinterpret_cast(s32, caller)); func_80324E38(6.0f, 0); } @@ -76,7 +76,7 @@ void chgobi2_setState(Actor *this, s32 next_state){ } if(next_state == 3){ - timedFunc_set_0(0.05f, func_80387960); + timedFunc_set_0(0.05f, GV_func_80387960); timed_playSfx(0.05f, SFX_84_GOBI_CRYING, 1.1f, 32000); func_80324E38(0.051f, 1); timedFunc_set_1(0.06f, (GenMethod_1)func_803879D4, reinterpret_cast(s32, this->marker)); diff --git a/src/GV/code_230.c b/src/GV/code_230.c index 8fadb690..2a90d7a6 100644 --- a/src/GV/code_230.c +++ b/src/GV/code_230.c @@ -17,9 +17,9 @@ void chancientone_update(Actor *this); Actor *chancientone_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); /* .data */ -s16 D_80390C20[4] = {5, 6, 7, 8}; +s16 GV_D_80390C20[4] = {5, 6, 7, 8}; ActorMarker *D_80390C28[5] = {NULL}; -ActorAnimationInfo D_80390C3C[] = { +ActorAnimationInfo GV_D_80390C3C[] = { {0, 0.0f}, {0, 0.0f}, {ASSET_ED_ANIM_ANCIENT_ONE, 2.0f}, @@ -27,7 +27,7 @@ ActorAnimationInfo D_80390C3C[] = { }; ActorInfo D_80390C5C = { MARKER_F4_ANCIENT_ONE, ACTOR_147_ANCIENT_ONE, ASSET_3E8_MODEL_ANCIENT_ONE, - 0x1, D_80390C3C, + 0x1, GV_D_80390C3C, chancientone_update, func_80326224, chancientone_draw, 0, 0x100, 0.0f, 0 }; @@ -48,19 +48,19 @@ void func_80386620(Actor *this){ return; } - D_80390C20[0] = 5; - D_80390C20[1] = 6; - D_80390C20[2] = 7; - D_80390C20[3] = 8; + GV_D_80390C20[0] = 5; + GV_D_80390C20[1] = 6; + GV_D_80390C20[2] = 7; + GV_D_80390C20[3] = 8; phi_s3 = (randf() * 1.0737418e9f); phi_s2 = 1; phi_s1 = 0; while(phi_s2 != 0x40000000){ if ((phi_s3 & phi_s2) != 0) { - temp_a1 = D_80390C20[phi_s1]; - D_80390C20[phi_s1] = D_80390C20[phi_s1 + 1]; - D_80390C20[phi_s1 + 1] = temp_a1; + temp_a1 = GV_D_80390C20[phi_s1]; + GV_D_80390C20[phi_s1] = GV_D_80390C20[phi_s1 + 1]; + GV_D_80390C20[phi_s1 + 1] = temp_a1; temp_a0 = D_80390C28[phi_s1 + 1]; D_80390C28[phi_s1 + 1] = D_80390C28[phi_s1 + 2]; D_80390C28[phi_s1 + 2] = temp_a0; @@ -166,7 +166,7 @@ void chancientone_update(Actor *this){ actor_playAnimationOnce(this); if(this->unkF4_8 < 5){ D_80390C28[this->unkF4_8]->propPtr->unk8_4 = TRUE; - func_802BAFE4(D_80390C20[this->unkF4_8 - 1]); + func_802BAFE4(GV_D_80390C20[this->unkF4_8 - 1]); func_80244BB0(2, 0x86, 0x7ff8, 0.3f); timedFunc_set_0(0.45f, func_8038678C); @@ -259,7 +259,7 @@ Actor *chancientone_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **v } -void func_80387118(void){ +void GV_func_80387118(void){ int i; for(i = 0; i < 5; i++){ D_80390C28[i] = NULL; diff --git a/src/GV/code_2730.c b/src/GV/code_2730.c index 7b7f862c..085b7d73 100644 --- a/src/GV/code_2730.c +++ b/src/GV/code_2730.c @@ -24,7 +24,8 @@ ActorInfo D_80390D60 = { 0xBE, 0x130, 0x3E4, f32 D_80390D84[3] = {5644.0f, 2930.0f, -3258.0f}; /*.bss */ -u8 D_80391A60; +u8 GV_pad1[0x10]; +u8 GV_D_80391A60; /* .code */ void func_80388B20(Actor *this, s32 next_state){ @@ -32,11 +33,11 @@ void func_80388B20(Actor *this, s32 next_state){ this->state = next_state; local->unk14 = 0.0f; - D_80391A60 = FALSE; + GV_D_80391A60 = FALSE; if(this->state == 2){ this->marker->propPtr->unk8_3 = FALSE; local->unk14 = 2.6f; - D_80391A60 = TRUE; + GV_D_80391A60 = TRUE; func_8028F428(2, this->marker); FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.3f, 9000); FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.5f, 9000); @@ -79,7 +80,7 @@ Actor *func_80388C64(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ } s32 func_80388D78(void){ - return D_80391A60; + return GV_D_80391A60; } void func_80388D84(Actor *this){ @@ -103,7 +104,7 @@ void func_80388DC8(Actor *this){ marker_setCollisionScripts(this->marker, NULL, NULL, func_80388C24); local->unkC = particleEmitter_new(20); local->unk10 = particleEmitter_new(30); - D_80391A60 = FALSE; + GV_D_80391A60 = FALSE; sp28 = func_80326D68(this->position, ACTOR_12E_GOBI_1, -1, &sp2C); if(sp28){ this->position_x = sp28->position_x; diff --git a/src/GV/code_2B80.c b/src/GV/code_2B80.c index f5215359..e9368314 100644 --- a/src/GV/code_2B80.c +++ b/src/GV/code_2B80.c @@ -15,7 +15,7 @@ ActorInfo D_80390D90 = { }; /* .code */ -void func_80388F70(Actor *this, s32 next_state){ +void GV_func_80388F70(Actor *this, s32 next_state){ this->state = next_state; if(this->state == 1){ func_80335924(this->unk148, ASSET_FE_ANIM_TRUCKER_SHORT, 0.1f, 2.5f); @@ -62,10 +62,10 @@ void func_80389144(Actor *this){ actor_collisionOff(this); mapSpecificFlags_set(0xC, FALSE); if(jiggyscore_isSpawned(JIGGY_45_GV_GOBI_2) && !func_803203FC(1)){ - func_80388F70(this, 3); + GV_func_80388F70(this, 3); } else{//L803891CC - func_80388F70(this, 1); + GV_func_80388F70(this, 1); } }//L803891D8 if( this->state == 1 @@ -87,5 +87,5 @@ void func_80389144(Actor *this){ } if(sp28) - func_80388F70(this, sp28); + GV_func_80388F70(this, sp28); } diff --git a/src/GV/code_2EE0.c b/src/GV/code_2EE0.c index ca5facad..e69486b9 100644 --- a/src/GV/code_2EE0.c +++ b/src/GV/code_2EE0.c @@ -11,7 +11,7 @@ extern ActorAnimationInfo D_80390DC0[]={ {ASSET_F1_ANIM_MAGIC_CARPET, 2.0f} }; -extern ActorInfo D_80390DD0 = { MARKER_AF_MAGIC_CARPET_SHADOW, ACTOR_122_MAGIC_CARPET_SHADOW, ASSET_3E7_MODEL_MAGIC_CARPET_SHADOW, +extern ActorInfo GV_D_80390DD0 = { MARKER_AF_MAGIC_CARPET_SHADOW, ACTOR_122_MAGIC_CARPET_SHADOW, ASSET_3E7_MODEL_MAGIC_CARPET_SHADOW, 0x1, D_80390DC0, func_8038938C, func_80326224, func_803892D0, 2500, 0, 0.0f, 0 diff --git a/src/GV/code_30C0.c b/src/GV/code_30C0.c index fac21b22..04dd0e37 100644 --- a/src/GV/code_30C0.c +++ b/src/GV/code_30C0.c @@ -9,7 +9,7 @@ void func_80389634(Actor *this); void func_803898B8(Actor *this); /* .data */ -ActorAnimationInfo D_80390E00[] = { +ActorAnimationInfo GV_D_80390E00[] = { {0x00, 0.0f}, {0xCD, 8000000.0f}, {0xCD, 2.5f}, @@ -18,14 +18,14 @@ ActorAnimationInfo D_80390E00[] = { {0xCD, 4.5f}, }; -ActorInfo D_80390E30 = { 0xA8, 0x11A, 0x33D, - 0x1, D_80390E00, +ActorInfo GV_D_80390E30 = { 0xA8, 0x11A, 0x33D, + 0x1, GV_D_80390E00, func_80389634, func_80326224, func_80325888, 2500, 0, 0.0f, 0 }; ActorInfo D_80390E54 = { 0x23B, 0x244, 0x33D, - 0x1, D_80390E00, + 0x1, GV_D_80390E00, func_803898B8, func_80326224, func_80325888, 0, 0, 0.0f, 0 }; @@ -33,7 +33,7 @@ s32 D_80390E78[4] = {0xff, 0xd0, 0x5d, 0xb4}; s32 D_80390E88[4] = {0, 0, 0, 0}; /* .code */ -void func_803894B0(Actor *this){ +void GV_func_803894B0(Actor *this){ this->marker->propPtr->unk8_3 = TRUE; actor_collisionOff(this); func_80328B8C(this, 1, 0.01f, 1); @@ -68,7 +68,7 @@ void func_80389634(Actor *this){ switch(this->state){ case 1: //L80389680 if(!this->initialized){ - func_803894B0(this); + GV_func_803894B0(this); } if(func_80329530(this, 500) && func_8038957C(this)){ func_80328B8C(this, 2, 0.01f, 1); @@ -120,7 +120,7 @@ void func_80389634(Actor *this){ void func_803898B8(Actor *this){ if(!this->initialized){ - func_803894B0(this); + GV_func_803894B0(this); if(func_8031FF1C(BKPROG_A4_UNKOWN)) func_80328B8C(this, 3, 0.5f, 1); this->unk1C[0] = 0.0f; diff --git a/src/GV/code_3AA0.c b/src/GV/code_3AA0.c index 3a312bc8..2ced6b0e 100644 --- a/src/GV/code_3AA0.c +++ b/src/GV/code_3AA0.c @@ -2,22 +2,22 @@ #include "functions.h" #include "variables.h" -void func_80389E90(Actor *this); -void func_80389EA8(Actor *this); +void GV_func_80389E90(Actor *this); +void GV_func_80389EA8(Actor *this); /* .data */ ActorInfo D_80390F00 = { MARKER_AB_RUBEES_EGG_POT, ACTOR_11D_RUBEES_EGG_POT, ASSET_3E1_MODEL_RUBEES_EGG_POT, 0x1, NULL, - func_80389E90, func_80389EA8, func_80325888, + GV_func_80389E90, GV_func_80389EA8, func_80325888, 2500, 0, 0.9f, 0 }; /* .code */ -void func_80389E90(Actor *this){ +void GV_func_80389E90(Actor *this){ this->marker->propPtr->unk8_3 = FALSE; } -void func_80389EA8(Actor *this){ +void GV_func_80389EA8(Actor *this){ this->marker->propPtr->unk8_3 = FALSE; this->unk4C = 100 + 40*func_8038E178(); func_80343DEC(this); diff --git a/src/GV/code_3BB0.c b/src/GV/code_3BB0.c index dbf05953..5be0d749 100644 --- a/src/GV/code_3BB0.c +++ b/src/GV/code_3BB0.c @@ -4,12 +4,12 @@ extern int func_8024DB50(f32[3], f32); -void func_8038A084(Actor *this); +void GV_func_8038A084(Actor *this); /* .data */ ActorInfo D_80390F40 = { 0x24F, 0x37C, 0x0, 0, NULL, - func_8038A084, func_80326224, func_80325340, + GV_func_8038A084, func_80326224, func_80325340, 2000, 0, 0.0f, 0 }; @@ -45,7 +45,7 @@ void func_80389FA0(f32 position[3]){ func_802EFC28(pCtrl, &D_80390F64); } -void func_8038A084(Actor *this){ +void GV_func_8038A084(Actor *this){ if(this->unkF4_8 == 6 && !this->unk16C_4){ this->unk16C_4 = TRUE; if( jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID) && this->yaw == 1.0f){ diff --git a/src/GV/code_43B0.c b/src/GV/code_43B0.c index 347e03a3..ce995817 100644 --- a/src/GV/code_43B0.c +++ b/src/GV/code_43B0.c @@ -7,7 +7,7 @@ void func_80329904(ActorMarker *, s32, void *); void func_8038A948(Actor *this); -void func_8038A9C0(Actor *this); +void GV_func_8038A9C0(Actor *this); Actor *func_8038A7A0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); /* .data */ @@ -18,7 +18,7 @@ ActorAnimationInfo D_80391000[] = { ActorInfo D_80391010 = { MARKER_A7_MAGIC_CARPET_1, ACTOR_119_MAGIC_CARPET_1, ASSET_3DC_MODEL_MAGIC_CARPET, 0x1, D_80391000, - func_8038A948, func_8038A9C0, func_8038A7A0, + func_8038A948, GV_func_8038A9C0, func_8038A7A0, 2500, 0, 0.0f, 0 }; @@ -73,7 +73,7 @@ void func_8038A948(Actor *this){ } } -void func_8038A9C0(Actor *this){ +void GV_func_8038A9C0(Actor *this){ Actor * sp24; if(!this->initialized){ this->initialized = TRUE; diff --git a/src/GV/code_4740.c b/src/GV/code_4740.c index 249b3be6..370d7c02 100644 --- a/src/GV/code_4740.c +++ b/src/GV/code_4740.c @@ -34,7 +34,7 @@ struct43s D_803910D4 = { }; /* .bss */ -f32 D_80391A70[3]; +f32 GV_D_80391A70[3]; /* .code */ void func_8038AB30(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){ @@ -233,15 +233,15 @@ void func_8038B124(Actor *this){ func_8038ABD8(this->position, 8); } else{ - D_80391A70[0] = 2*this->unk28; - D_80391A70[1] = 0.0f; - D_80391A70[2] = 0.0f; - ml_vec3f_yaw_rotate_copy(D_80391A70, D_80391A70, this->yaw - 90.0); + GV_D_80391A70[0] = 2*this->unk28; + GV_D_80391A70[1] = 0.0f; + GV_D_80391A70[2] = 0.0f; + ml_vec3f_yaw_rotate_copy(GV_D_80391A70, GV_D_80391A70, this->yaw - 90.0); - D_80391A70[0] = D_80391A70[0] + this->position[0]; - D_80391A70[1] = D_80391A70[1] + this->position[1]; - D_80391A70[2] = D_80391A70[2] + this->position[2]; - func_8038ABD8(D_80391A70, 1); + GV_D_80391A70[0] = GV_D_80391A70[0] + this->position[0]; + GV_D_80391A70[1] = GV_D_80391A70[1] + this->position[1]; + GV_D_80391A70[2] = GV_D_80391A70[2] + this->position[2]; + func_8038ABD8(GV_D_80391A70, 1); } break; @@ -261,10 +261,10 @@ void func_8038B124(Actor *this){ case 5: //L8038B67C if(this->marker->unk14_21 && actor_animationIsAt(this, 0.79f)){ - func_8034A174(this->marker->unk44, 5, D_80391A70); - func_8038ACEC(D_80391A70, 2); - func_8034A174(this->marker->unk44, 6, D_80391A70); - func_8038ACEC(D_80391A70, 3); + func_8034A174(this->marker->unk44, 5, GV_D_80391A70); + func_8038ACEC(GV_D_80391A70, 2); + func_8034A174(this->marker->unk44, 6, GV_D_80391A70); + func_8038ACEC(GV_D_80391A70, 3); func_802BB3DC(0, 18.0f, 0.92f); func_8030E878(SFX_3_DULL_CANNON_SHOT, 1.0f, 32000, this->position, 2250.0f, 4500.0f); }//L8038B734 @@ -304,12 +304,12 @@ void func_8038B124(Actor *this){ case 9: //L8038B870 func_80328A84(this, 0xA); func_8038ACEC(this->position, 2); - func_8034A174(this->marker->unk44, 5, D_80391A70); - func_8038ACEC(D_80391A70, 2); - func_8038ADFC(D_80391A70, 3); - func_8034A174(this->marker->unk44, 6, D_80391A70); - func_8038ACEC(D_80391A70, 3); - func_8038ADFC(D_80391A70, 2); + func_8034A174(this->marker->unk44, 5, GV_D_80391A70); + func_8038ACEC(GV_D_80391A70, 2); + func_8038ADFC(GV_D_80391A70, 3); + func_8034A174(this->marker->unk44, 6, GV_D_80391A70); + func_8038ACEC(GV_D_80391A70, 3); + func_8038ADFC(GV_D_80391A70, 2); break; case 10: //L8038B900 diff --git a/src/GV/code_5570.c b/src/GV/code_5570.c index 4d37e7af..64d53f82 100644 --- a/src/GV/code_5570.c +++ b/src/GV/code_5570.c @@ -9,7 +9,7 @@ typedef struct { s32 unk0; }ActorLocal_Grabba; -void func_8038BEA0(Actor *this); +void GV_func_8038BEA0(Actor *this); /* .data */ ActorAnimationInfo D_80391120[] ={ @@ -24,7 +24,7 @@ ActorAnimationInfo D_80391120[] ={ ActorInfo D_80391158 = { MARKER_A6_GRABBA, ACTOR_118_GRABBA, ASSET_371_MODEL_GRABBA, 0x1, D_80391120, - func_8038BEA0, func_80326224, func_80325888, + GV_func_8038BEA0, func_80326224, func_80325888, 0, 0, 0.0f, 0 }; @@ -153,7 +153,7 @@ void func_8038BD8C(f32 position[3], s32 cnt){ particleEmitter_emitN(pCtrl, cnt); } -void func_8038BEA0(Actor *this){ +void GV_func_8038BEA0(Actor *this){ ActorLocal_Grabba *local = (ActorLocal_Grabba *)&this->local; f32 sp38[3]; @@ -318,6 +318,6 @@ void func_8038BEA0(Actor *this){ }//L8038C5AC } -s32 func_8038C5BC(void){ +s32 GV_func_8038C5BC(void){ return D_80391A80; } diff --git a/src/GV/code_61E0.c b/src/GV/code_61E0.c index 147a65a5..7d618111 100644 --- a/src/GV/code_61E0.c +++ b/src/GV/code_61E0.c @@ -2,8 +2,8 @@ #include "functions.h" #include "variables.h" -void func_8038C658(Actor *this); -Actor *func_8038C5D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); +void GV_func_8038C658(Actor *this); +Actor *GV_func_8038C5D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); /* .data */ ActorAnimationInfo D_80391190[] = { @@ -17,32 +17,33 @@ ActorAnimationInfo D_80391190[] = { ActorInfo D_803911C0 = { 0xAC, 0x11E, 0x3E5, 0, D_80391190, - func_8038C658, func_80326224, func_8038C5D0, + GV_func_8038C658, func_80326224, GV_func_8038C5D0, 0, 0, 0.0f, 0 }; /* .bss */ -s32 D_80391A90; +u8 GV_pad2[0x10]; +s32 GV_D_80391A90; /* .code */ -Actor *func_8038C5D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ +Actor *GV_func_8038C5D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ Actor *this = marker_getActor(this_marker); if( this->state == 2 || this->state == 3 || this->state == 4 || this->state == 5 ){ - if(!D_80391A90) + if(!GV_D_80391A90) return func_80325888(this_marker, gfx, mtx, vtx); } return this; } -void func_8038C658(Actor *this){ +void GV_func_8038C658(Actor *this){ s32 sp24; if(!this->initialized){ actor_collisionOff(this); - D_80391A90 = FALSE; + GV_D_80391A90 = FALSE; this->initialized = TRUE; this->position_y += 4.0f; } @@ -51,13 +52,13 @@ void func_8038C658(Actor *this){ this->unk16C_4 = TRUE; func_80328B8C(this, this->state, 0.01f, 1); } - sp24 = func_8038C5BC(); - if(D_80391A90) + sp24 = GV_func_8038C5BC(); + if(GV_D_80391A90) marker_despawn(this->marker); if(this->state != sp24) func_80328A84(this, sp24); } void func_8038C748(void){ - D_80391A90 = TRUE; + GV_D_80391A90 = TRUE; } diff --git a/src/GV/code_7530.c b/src/GV/code_7530.c index 46e7d9fd..9d657e76 100644 --- a/src/GV/code_7530.c +++ b/src/GV/code_7530.c @@ -29,7 +29,7 @@ ActorInfo D_80391318 = { 0xAA, 0x11C, 0x3DE, extern struct { s32 unk0; s32 unk4; -}D_80391AB0; +}GV_D_80391AB0; extern s32 D_80391AB8; /* .code */ @@ -69,25 +69,25 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ } -void func_8038DB0C(Actor *this){ +void GV_func_8038DB0C(Actor *this){ func_80328B8C(this, 1, 0.99f, 0); animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED); } void func_8038DB4C(s32 arg0){ - D_80391AB0.unk0 = arg0; + GV_D_80391AB0.unk0 = arg0; } void func_8038DB58(s32 arg0){ - D_80391AB0.unk4 = arg0; + GV_D_80391AB0.unk4 = arg0; } s32 func_8038DB64(void){ - return D_80391AB0.unk4; + return GV_D_80391AB0.unk4; } void func_8038DB70(void){ - D_80391AB0.unk4++; + GV_D_80391AB0.unk4++; } @@ -141,7 +141,7 @@ void func_8038DBDC(Actor *this){ } } else if(actor_animationIsAt(this, 0.99f)){//L8038DD94 - func_8038DB0C(this); + GV_func_8038DB0C(this); func_8038DB88(this); } else{ //L8038DDC0 @@ -211,7 +211,7 @@ void func_8038DBDC(Actor *this){ break; case 6: //8038E080 if(actor_animationIsAt(this, 0.89f)){ - func_8038DB0C(this); + GV_func_8038DB0C(this); func_8038DB88(this); } else{ diff --git a/src/GV/code_7D50.c b/src/GV/code_7D50.c index eb901ff9..0e94027b 100644 --- a/src/GV/code_7D50.c +++ b/src/GV/code_7D50.c @@ -6,16 +6,16 @@ struct { s32 unk0; u8 pad4[4]; s32 unk8; -}D_80391AB0; +}GV_D_80391AB0; /* .code */ void func_8038E140(void){ - D_80391AB0.unk0++; + GV_D_80391AB0.unk0++; func_8025A6EC(COMUSIC_2B_DING_B, 26000); } s32 func_8038E178(void){ - return D_80391AB0.unk0; + return GV_D_80391AB0.unk0; } s32 func_8038E184(void){ @@ -23,5 +23,5 @@ s32 func_8038E184(void){ } void func_8038E18C(void){ - D_80391AB0.unk8 = TRUE; + GV_D_80391AB0.unk8 = TRUE; } diff --git a/src/GV/code_7FC0.c b/src/GV/code_7FC0.c index 4c3c2294..fa19ec6f 100644 --- a/src/GV/code_7FC0.c +++ b/src/GV/code_7FC0.c @@ -5,18 +5,18 @@ void func_8038E3B0(Actor *this); /* .data */ -ActorAnimationInfo D_80391380[] = { +ActorAnimationInfo GV_D_80391380[] = { {0, 0.0f}, {0, 0.0f} }; -ActorInfo D_80391390 = { 0xFA, 0x1F8, 0x423, - 0x1, D_80391380, +ActorInfo GV_D_80391390 = { 0xFA, 0x1F8, 0x423, + 0x1, GV_D_80391380, func_8038E3B0, func_80326224, func_80325888, 0, 0x100, 0.0f, 0 }; ActorInfo D_803913B4 = { 0xFB, 0x1F9, 0x424, - 0x1, D_80391380, + 0x1, GV_D_80391380, func_8038E3B0, func_80326224, func_80325888, 0, 0x100, 0.0f, 0 }; diff --git a/src/GV/code_7FF0.c b/src/GV/code_7FF0.c index 74082cc3..0f173cee 100644 --- a/src/GV/code_7FF0.c +++ b/src/GV/code_7FF0.c @@ -16,11 +16,11 @@ extern ActorInfo D_80390C5C; extern ActorInfo D_80390C80; extern ActorInfo D_80390D30; extern ActorInfo D_80390D60; -extern ActorInfo D_80390CB0; +extern ActorInfo GV_D_80390CB0; extern ActorInfo D_80390D00; extern ActorInfo D_80390D90; -extern ActorInfo D_80390DD0; -extern ActorInfo D_80390E30; +extern ActorInfo GV_D_80390DD0; +extern ActorInfo GV_D_80390E30; extern ActorInfo D_80390E54; extern ActorInfo D_80390ED0; extern ActorInfo D_80390F00; @@ -36,7 +36,7 @@ extern ActorInfo D_80391260; extern ActorInfo D_80391318; extern ActorInfo D_80391358; extern ActorInfo D_803912B8; -extern ActorInfo D_80391390; +extern ActorInfo GV_D_80391390; extern ActorInfo D_803913B4; extern ActorInfo D_80390F40; extern ActorInfo D_80391494; @@ -44,8 +44,8 @@ extern ActorInfo D_803915C0; extern ActorInfo D_80391620; extern ActorInfo D_803914B8; extern ActorInfo D_803914DC; -extern ActorInfo D_80391500; -extern ActorInfo D_80391524; +extern ActorInfo GV_D_80391500; +extern ActorInfo GV_D_80391524; extern ActorInfo D_8039156C; extern ActorInfo D_80391428; extern ActorInfo D_8039144C; @@ -116,13 +116,13 @@ ActorInfo D_803914DC = { MARKER_ED_GV_SUN_DOOR, ACTOR_140_GV_SUN_DOOR, ASSET_3FF 0, 0, 0.0f, 0 }; -ActorInfo D_80391500 = { MARKER_F0_GV_KAZOOIE_DOOR, ACTOR_143_GV_KAZOOIE_DOOR, ASSET_3D9_MODEL_GV_KAZOOIE_DOOR, +ActorInfo GV_D_80391500 = { MARKER_F0_GV_KAZOOIE_DOOR, ACTOR_143_GV_KAZOOIE_DOOR, ASSET_3D9_MODEL_GV_KAZOOIE_DOOR, 0x1, 0x0, chKazooieDoor_update, func_80326224, func_80325F2C, 0, 0, 0.0f, 0 }; -ActorInfo D_80391524 = { MARKER_EF_GV_STAR_HATCH, ACTOR_142_GV_STAR_HATCH, ASSET_3DB_MODEL_GV_STAR_HATCH, +ActorInfo GV_D_80391524 = { MARKER_EF_GV_STAR_HATCH, ACTOR_142_GV_STAR_HATCH, ASSET_3DB_MODEL_GV_STAR_HATCH, 0x1, 0x0, func_8038E648, func_80326224, func_80325F2C, 0, 0, 0.0f, 0 @@ -465,18 +465,18 @@ void func_8038F130(UNK_TYPE(s32) arg0, ActorMarker *arg1){ func_8038F028(arg0, arg1, 1, 0); //JINXY egg flags? } -void func_8038F154(void) +void GV_func_8038F154(void) { spawnableActorList_add(&D_80390BF0, actor_new, 0X180); spawnableActorList_add(&D_80390C5C, actor_new, 0X58A); spawnableActorList_add(&D_80390C80, actor_new, 0X9A8); spawnableActorList_add(&D_80390D30, actor_new, 0X880); spawnableActorList_add(&D_80390D60, actor_new, 0X80); - spawnableActorList_add(&D_80390CB0, actor_new, 0XDA8); + spawnableActorList_add(&GV_D_80390CB0, actor_new, 0XDA8); spawnableActorList_add(&D_80390D00, actor_new, 0X9A8); spawnableActorList_add(&D_80390D90, actor_new, 0XD80); - spawnableActorList_add(&D_80390DD0, actor_new, 0X4004); - spawnableActorList_add(&D_80390E30, actor_new, 0X448); + spawnableActorList_add(&GV_D_80390DD0, actor_new, 0X4004); + spawnableActorList_add(&GV_D_80390E30, actor_new, 0X448); spawnableActorList_add(&D_80390E54, actor_new, 0X48); spawnableActorList_add(&D_80390ED0, actor_new, 0X180); spawnableActorList_add(&D_80390F00, actor_new, 0X80); @@ -492,7 +492,7 @@ void func_8038F154(void) spawnableActorList_add(&D_80391318, actor_new, 0X78A); spawnableActorList_add(&D_80391358, actor_new, 0X518); spawnableActorList_add(&D_803912B8, actor_new, 0X500); - spawnableActorList_add(&D_80391390, actor_new, 0X500); + spawnableActorList_add(&GV_D_80391390, actor_new, 0X500); spawnableActorList_add(&D_803913B4, actor_new, 0X500); spawnableActorList_add(&D_80390F40, actor_new, 0); spawnableActorList_add(&D_80391494, actor_new, 0X408); @@ -500,8 +500,8 @@ void func_8038F154(void) spawnableActorList_add(&D_80391620, actor_new, 0X400); spawnableActorList_add(&D_803914B8, actor_new, 0X400); spawnableActorList_add(&D_803914DC, actor_new, 0X400); - spawnableActorList_add(&D_80391500, actor_new, 0X400); - spawnableActorList_add(&D_80391524, actor_new, 0X400); + spawnableActorList_add(&GV_D_80391500, actor_new, 0X400); + spawnableActorList_add(&GV_D_80391524, actor_new, 0X400); spawnableActorList_add(&D_8039156C, actor_new, 0X400); spawnableActorList_add(&D_80391428, actor_new, 8); spawnableActorList_add(&D_8039144C, actor_new, 8); diff --git a/src/GV/code_9DB0.c b/src/GV/code_9DB0.c index 8c0005ae..1b048171 100644 --- a/src/GV/code_9DB0.c +++ b/src/GV/code_9DB0.c @@ -30,7 +30,7 @@ Struct_GV_9DB0_1 D_80391650[] = { {0x19F, 7, 0 }, {0x000, 0, 0 }, }; -f32 D_803916D8[3] = {0.0f, 100.0f, 0.0f}; +f32 GV_D_803916D8[3] = {0.0f, 100.0f, 0.0f}; /*.bss */ extern struct { @@ -63,7 +63,7 @@ void func_80390218(void *arg0){ } void func_80390248(void){ - jiggySpawn(JIGGY_40_GV_MATCHING_GAME, D_803916D8); + jiggySpawn(JIGGY_40_GV_MATCHING_GAME, GV_D_803916D8); } //matchingGame_setState diff --git a/src/GV/code_A490.c b/src/GV/code_A490.c index e918e662..196b324e 100644 --- a/src/GV/code_A490.c +++ b/src/GV/code_A490.c @@ -3,10 +3,11 @@ #include "variables.h" /* .bss */ +u8 GV_pad3[0x40]; struct { u8 unk0; f32 unk4; -}D_80391B00; +}GV_D_80391B00; /* .code */ void func_80390880(void){ @@ -20,8 +21,8 @@ void func_80390880(void){ void func_803908C4(s32 arg0){ void *tmp_v0; - D_80391B00.unk0 = arg0; - if(D_80391B00.unk0 == 2){ + GV_D_80391B00.unk0 = arg0; + if(GV_D_80391B00.unk0 == 2){ func_80324E38(0.0f, 3); timed_setCameraToNode(0.0f, 0); timedFunc_set_0(3.0f, func_80390880); @@ -36,7 +37,7 @@ void func_803908C4(s32 arg0){ } } - if(D_80391B00.unk0 == 3){ + if(GV_D_80391B00.unk0 == 3){ levelSpecificFlags_set(6, TRUE); func_803228D8(); func_803204E4(0xe, 1); @@ -51,7 +52,7 @@ void func_803909F4(void){ void *tmp_v0_2; - D_80391B00.unk0 = 0; + GV_D_80391B00.unk0 = 0; if(map_get() != MAP_15_GV_WATER_PYRAMID) return; if(jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID)){ @@ -64,7 +65,7 @@ void func_803909F4(void){ func_8034E71C(tmp_v0_2, -1460, 0.0f); } else{ - D_80391B00.unk4 = 0.0f; + GV_D_80391B00.unk4 = 0.0f; func_803908C4(1); } } @@ -75,23 +76,23 @@ void func_80390A94(void){ time_delta = time_getDelta(); - if(!D_80391B00.unk0) return; + if(!GV_D_80391B00.unk0) return; - if(D_80391B00.unk0 == 1){ - if(0.0f < D_80391B00.unk4){ - D_80391B00.unk4 -= time_delta; - if(D_80391B00.unk4 <= 0.0f){ + if(GV_D_80391B00.unk0 == 1){ + if(0.0f < GV_D_80391B00.unk4){ + GV_D_80391B00.unk4 -= time_delta; + if(GV_D_80391B00.unk4 <= 0.0f){ func_803908C4(2); } } else{ if(jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID)){ - D_80391B00.unk4 = 0.01f; + GV_D_80391B00.unk4 = 0.01f; } } }//L80390B34 - if(D_80391B00.unk0 == 2){ + if(GV_D_80391B00.unk0 == 2){ tmp_v0 = func_8034C528(0x190); if(tmp_v0 && func_8034DC78(tmp_v0) == 1){ func_8030E760(SFX_7F_HEAVYDOOR_SLAM, 0.8f, 0x7fd0); diff --git a/src/GV/code_D60.c b/src/GV/code_D60.c index 70555018..b9b4d2c2 100644 --- a/src/GV/code_D60.c +++ b/src/GV/code_D60.c @@ -24,20 +24,22 @@ ActorInfo D_80390C80 = { MARKER_BC_GOBI_1, ACTOR_12E_GOBI_1, ASSET_3E0_MODEL_GOB 0, 0x533, 0.0f, 0 }; + /* .bss */ +u8 GV_pad0[0x10]; struct { u8 unk0; u8 unk1; -}D_80391A40; +}GV_D_80391A40; /* .code */ -void func_80387150(Actor *this, s32 next_state){ +void GV_func_80387150(Actor *this, s32 next_state){ ActorLocal_GV_D60 *local = (ActorLocal_GV_D60 *)&this->local; this->state = next_state; - D_80391A40.unk0 = FALSE; - D_80391A40.unk1 = FALSE; + GV_D_80391A40.unk0 = FALSE; + GV_D_80391A40.unk1 = FALSE; if(this->state == 1){ func_80335924(this->unk148, 0xd9, 0.5f, 4.0f); @@ -47,14 +49,14 @@ void func_80387150(Actor *this, s32 next_state){ if(this->state == 2){ func_80335924(this->unk148, 0xda, 1.0f, 5.0f); local->unkC = 0.9f; - D_80391A40.unk0 = TRUE; + GV_D_80391A40.unk0 = TRUE; } if(this->state == 3){ func_8028F918(2); func_80335924(this->unk148, 0xf7, 1.0f, 5.33f); local->unk14 = 0.01f; - D_80391A40.unk1 = TRUE; + GV_D_80391A40.unk1 = TRUE; } if(this->state == 4){ @@ -78,16 +80,16 @@ Actor *chgobi1_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ } s32 func_80387354(void){ - return D_80391A40.unk0; + return GV_D_80391A40.unk0; } s32 func_80387360(void){ - return D_80391A40.unk1; + return GV_D_80391A40.unk1; } void func_8038736C(Actor *this){ ActorLocal_GV_D60 *local = (ActorLocal_GV_D60 *)&this->local; - func_80387150(this, 0); + GV_func_80387150(this, 0); func_8030DA44(local->unk0[0]); func_8030DA44(local->unk0[1]); } @@ -118,8 +120,8 @@ void func_80387408(Actor *this){ marker->unk30 = func_8038736C; marker->propPtr->unk8_3 = TRUE; marker->collidable = TRUE; - D_80391A40.unk0 = 0; - D_80391A40.unk1 = 0; + GV_D_80391A40.unk0 = 0; + GV_D_80391A40.unk1 = 0; local->unk0[0] = func_8030D90C(); local->unk0[1] = func_8030D90C(); local->unk8 = 0.0f; @@ -128,7 +130,7 @@ void func_80387408(Actor *this){ local->unk14 = 0.0f; this->unk1C[0] = 0.0f; this->unk1C[1] = 0.0f; - func_80387150(this, 1); + GV_func_80387150(this, 1); if(jiggyscore_isSpawned(JIGGY_44_GV_GOBI_1) && ! func_803203FC(1)){ marker_despawn(this->marker); } @@ -228,5 +230,5 @@ void func_80387408(Actor *this){ this->unk1C[0] = 0.0f; if(sp6C) - func_80387150(this, sp6C); + GV_func_80387150(this, sp6C); } diff --git a/src/MM/ch/conga.c b/src/MM/ch/conga.c index 25590b05..2472b0dd 100644 --- a/src/MM/ch/conga.c +++ b/src/MM/ch/conga.c @@ -21,7 +21,7 @@ void func_80328B8C(Actor*, s32, f32, s32); void func_802C8F70(f32); void func_80324E88(f32); Actor *func_8032811C(s32 actor_id, s32 position[3], s32 yaw); -void func_80387F44(void); +void MM_func_80387F44(void); void func_803876D0(Actor *); @@ -180,7 +180,7 @@ void func_803873C8(ActorMarker *congaMarker){ f32 iVelY; congaPtr->unk10_12 -= (congaPtr->unk10_12 && ( conga_state == 7)); - func_80387F44(); + MM_func_80387F44(); congaPtr->unk28 = 2.0f; orangePtr = func_8032811C(ACTOR_14_ORANGE_PROJECTILE, conga_localPtr->orangeSpawnPosition, congaPtr->yaw); diff --git a/src/MM/ch/lmonkey.c b/src/MM/ch/lmonkey.c index 12617ffd..5214a5d4 100644 --- a/src/MM/ch/lmonkey.c +++ b/src/MM/ch/lmonkey.c @@ -44,7 +44,7 @@ void func_80388300(Actor **arg0){ if(arg0); } -void func_803883AC(Actor *this){ +void MM_func_803883AC(Actor *this){ f32 sp2C; f32 sp28; static D_80389A5C = 0; @@ -85,7 +85,7 @@ void func_803885D0(Actor *this){ func_80343DEC(this); }else{//L80388630 if(func_80329530(this, 0x2BC) && !func_803114B0()){ - func_803883AC(this); + MM_func_803883AC(this); }//L8038865C switch(this->state){ case 1://L80388690 diff --git a/src/MM/ch/orange.c b/src/MM/ch/orange.c index 646f2ad9..29209852 100644 --- a/src/MM/ch/orange.c +++ b/src/MM/ch/orange.c @@ -11,13 +11,13 @@ f32 func_80309724(f32*); /* public functions */ -void func_80387FF4(Actor *this); +void MM_func_80387FF4(Actor *this); Actor* func_80388188(ActorMarker *, Gfx **, Mtx**, Vtx**); /* .data */ ActorInfo chorangeInfo = { MARKER_C_ORANGE_PROJECTILE, ACTOR_14_ORANGE_PROJECTILE, ASSET_2D2_MODEL_ORANGE, 1, NULL, - func_80387FF4, func_80326224, func_80388188, + MM_func_80387FF4, func_80326224, func_80388188, 0, 0, 0.6f, 0 }; @@ -35,7 +35,7 @@ void func_80387F90(ActorMarker *arg0, ActorMarker *other_marker){ if(arg0); } -void func_80387FF4(Actor * this){ +void MM_func_80387FF4(Actor * this){ f32 temp_f2; f32 temp_f0; diff --git a/src/MM/ch/orangepad.c b/src/MM/ch/orangepad.c index 9d2125af..1c4d5d5e 100644 --- a/src/MM/ch/orangepad.c +++ b/src/MM/ch/orangepad.c @@ -19,7 +19,7 @@ ActorInfo chorangepadInfo = { MARKER_66_ORANGE_PAD, ACTOR_57_ORANGE_PAD, ASSET_2 }; /*.code */ -void func_803863F0(s32 x, s32 y, s32 z){ +void MM_func_803863F0(s32 x, s32 y, s32 z){ f32 pos[3]; TUPLE_ASSIGN(pos, x, y, z); @@ -49,7 +49,7 @@ void func_80386444(ActorMarker *arg0){ func_802BAFE4(temp_a0); sp44[1] += 50.0f; - timedFunc_set_3(0.6f, (TFQM3) func_803863F0, (s32)sp44[0], (s32)sp44[1], (s32)sp44[2]); + timedFunc_set_3(0.6f, (TFQM3) MM_func_803863F0, (s32)sp44[0], (s32)sp44[1], (s32)sp44[2]); func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF); if(!jiggyscore_isCollected(JIGGY_8_MM_ORANGE_PADS)){ func_80311480(0xB3B, 4, NULL, NULL, NULL, NULL); diff --git a/src/MM/code_24C0.c b/src/MM/code_24C0.c index 949ae3bc..4b915ed3 100644 --- a/src/MM/code_24C0.c +++ b/src/MM/code_24C0.c @@ -15,7 +15,7 @@ extern ActorInfo chjujuInfo; extern ActorInfo chorangepadInfo; extern ActorInfo chlmonkeyInfo; -void func_803888B0(void){ +void MM_func_803888B0(void){ spawnableActorList_add( &chhutInfo, actor_new, 0X400); spawnableActorList_add( &chchimpystump, actor_new, 0x0); spawnableActorList_add( &chgrublinInfo, actor_new, 0X2000121); diff --git a/src/MM/crc.c b/src/MM/crc.c index 24c1abb8..01942d3f 100644 --- a/src/MM/crc.c +++ b/src/MM/crc.c @@ -27,7 +27,7 @@ void func_80387EC0(void) { } } -void func_80387F44(void) { +void MM_func_80387F44(void) { s32 sp1C; osPiReadIo(0x578, (u32 *)&sp1C); diff --git a/src/MMM/ch/napper.c b/src/MMM/ch/napper.c index 878f51c0..6b8c887e 100644 --- a/src/MMM/ch/napper.c +++ b/src/MMM/ch/napper.c @@ -175,7 +175,7 @@ void chnapper_update(Actor *this){ __chnapper_setState(this, 2); } - if(func_80389530() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ + if(MMM_func_80389530() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ __chnapper_setState(this, 3); } }//L80386F74 diff --git a/src/MMM/code_16B0.c b/src/MMM/code_16B0.c index a7b73137..75e29482 100644 --- a/src/MMM/code_16B0.c +++ b/src/MMM/code_16B0.c @@ -78,7 +78,7 @@ void func_80387B14(Actor *this, s32 next_state){ } -void func_80387CF4(ActorMarker *this_marker, ActorMarker *other_marker) { +void MMM_func_80387CF4(ActorMarker *this_marker, ActorMarker *other_marker) { func_8030E6D4(0x1E); } @@ -176,7 +176,7 @@ void func_80388028(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = TRUE; this->unk16C_0 = TRUE; - marker_setCollisionScripts(this->marker, NULL, func_80387CF4, func_80387D1C); + marker_setCollisionScripts(this->marker, NULL, MMM_func_80387CF4, func_80387D1C); __spawnqueue_add_1(func_80387D48, this->marker); func_80387B14(this, (this->state < 5) ? 1 : 6); }//L803880B4 diff --git a/src/MMM/code_2040.c b/src/MMM/code_2040.c index fab04702..08ffcb30 100644 --- a/src/MMM/code_2040.c +++ b/src/MMM/code_2040.c @@ -160,7 +160,7 @@ ActorInfo D_8038BDFC = { s32 D_8038BE20[4] = {0x87, 0x87, 0x87, 0xB4}; /* .code */ -f32 func_80388430(Actor *this, s32 arg1, s32 arg2, f32 arg3) { +f32 MMM_func_80388430(Actor *this, s32 arg1, s32 arg2, f32 arg3) { f32 sp4C[3]; f32 sp40[3]; f32 sp34[3]; @@ -230,11 +230,11 @@ void func_803888B8(Actor *this){ case 4: switch(this->marker->unk14_20){ case 0x9F: - this->roll = func_80388430(this, 0, -1, this->roll); + this->roll = MMM_func_80388430(this, 0, -1, this->roll); break; case 0xa0: case 0xff: - this->pitch = func_80388430(this, 2, 1, this->pitch); + this->pitch = MMM_func_80388430(this, 2, 1, this->pitch); break; } break; @@ -390,7 +390,7 @@ void func_803890B8(Actor *this) { func_8038AC04(); } -void func_803890E0(void){ +void MMM_func_803890E0(void){ spawnableActorList_add(&D_8038BC28, actor_new, 0); spawnableActorList_add(&D_8038BCDC, actor_new, 0); spawnableActorList_add(&D_8038BC4C, actor_new, 0); diff --git a/src/MMM/code_3120.c b/src/MMM/code_3120.c index c1c6cc6d..816a9782 100644 --- a/src/MMM/code_3120.c +++ b/src/MMM/code_3120.c @@ -20,7 +20,7 @@ u8 func_80389524() { return D_8038C4E0.unk0; } -u8 func_80389530() { +u8 MMM_func_80389530() { return D_8038C4E0.unk2; } diff --git a/src/MMM/code_3420.c b/src/MMM/code_3420.c index 343914bf..1ed338bb 100644 --- a/src/MMM/code_3420.c +++ b/src/MMM/code_3420.c @@ -2,7 +2,7 @@ #include "functions.h" #include "variables.h" -extern void func_8038B6D4(f32* arg0, s32 arg1); +extern void MMM_func_8038B6D4(f32* arg0, s32 arg1); /* internal definitions */ typedef struct { @@ -145,7 +145,7 @@ extern struct { }D_8038C4F0; /* .code */ -void func_80389810(ActorMarker *caller, enum asset_e text_id, s32 arg2) { +void MMM_func_80389810(ActorMarker *caller, enum asset_e text_id, s32 arg2) { switch (D_8038C4F0.unkC) { case 2: func_80389A0C(3); @@ -162,11 +162,11 @@ void func_80389810(ActorMarker *caller, enum asset_e text_id, s32 arg2) { } } -void func_803898A0() { +void MMM_func_803898A0() { jiggySpawn(JIGGY_60_MMM_MOTZHAND, D_8038C1E0); } -void func_803898C8() { +void MMM_func_803898C8() { func_8025A58C(0, 450); } @@ -175,10 +175,10 @@ void func_803898EC() { } void func_80389910() { - func_80311480(0xAD5, 0xE, NULL, NULL, func_80389810, NULL); + func_80311480(0xAD5, 0xE, NULL, NULL, MMM_func_80389810, NULL); timedFunc_set_2(0.0f, func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF); timed_setCameraToNode(2.0f, 0); - timedFunc_set_0(2.1f, func_803898A0); + timedFunc_set_0(2.1f, MMM_func_803898A0); timedFunc_set_0(6.0f, func_803898EC); func_80324E88(6.0f); func_80324E38(6.0f, 0); @@ -195,10 +195,10 @@ void func_80389A0C(s32 next_state){ if(next_state == 2){ if(D_8038C4F0.unkD == 0){ D_8038C4F0.unkD = 1; - func_80311480(0xad3, 4, NULL, NULL, func_80389810, NULL); + func_80311480(0xad3, 4, NULL, NULL, MMM_func_80389810, NULL); } else{//L80389A84 - func_80311480(0xad6, 4, NULL, NULL, func_80389810, NULL); + func_80311480(0xad6, 4, NULL, NULL, MMM_func_80389810, NULL); } }//L80389A9C @@ -215,18 +215,18 @@ void func_80389A0C(s32 next_state){ }//L80389AF4 if(next_state == 4){ - func_80311480(0xadd, 4, NULL, NULL, func_80389810, NULL); + func_80311480(0xadd, 4, NULL, NULL, MMM_func_80389810, NULL); func_80387720(D_8038C4F0.unk4); } if(next_state == 5){ D_8038C4F0.unkD++; - func_80311480(0xad4, 4, NULL, NULL, func_80389810, NULL); + func_80311480(0xad4, 4, NULL, NULL, MMM_func_80389810, NULL); func_80387720(D_8038C4F0.unk4); } if(next_state == 6){ - func_803898C8(); + MMM_func_803898C8(); timedFunc_set_0(1.25f, func_803899BC); func_80387654(D_8038C4F0.unk4); } @@ -266,7 +266,7 @@ void func_80389BCC(s32 key_indx, f32 position[3]) { } } -void func_80389CD8() {} +void MMM_func_80389CD8() {} void func_80389CE0() {} @@ -296,7 +296,7 @@ int func_80389CE8(s32 arg0, s32 arg1, s32 arg2){ void func_80389D9C(s32 key_id){ s32 sp24; sp24 = D_8038C198[key_id].unk1; - func_8038B6D4(func_803517B8(sp24), func_803517E8(sp24)); + MMM_func_8038B6D4(func_803517B8(sp24), func_803517E8(sp24)); D_8038C4F0.unk0++; } diff --git a/src/MMM/code_3D50.c b/src/MMM/code_3D50.c index d544be36..81f86e3b 100644 --- a/src/MMM/code_3D50.c +++ b/src/MMM/code_3D50.c @@ -65,7 +65,7 @@ struct { u8 unk8; BKModel *unkC; s32 unk10; -} D_8038C510; +} MMM_D_8038C510; /* .code */ void func_8038A140(UNK_TYPE(s32) arg0) { @@ -78,20 +78,20 @@ void func_8038A140(UNK_TYPE(s32) arg0) { timedFunc_set_1(3.0f, func_8038A140, 3); } if (arg0 == 3) { - if (D_8038C510.unk8 == 1) { + if (MMM_D_8038C510.unk8 == 1) { mapSpecificFlags_set(3, 1); } item_set(ITEM_0_HOURGLASS_TIMER, 75*60 - 1); item_set(6, 1); } - if (D_8038C510.unk8 == 3) { + if (MMM_D_8038C510.unk8 == 3) { item_set(6, 0); mapSpecificFlags_set(4, 1); } if (arg0 == 4) { func_8028F66C(BS_INTR_F); } - D_8038C510.unk8 = arg0; + MMM_D_8038C510.unk8 = arg0; } Struct_MMM_3D50_0 *func_8038A26C(s32 arg0){ @@ -116,7 +116,7 @@ void func_8038A2B8(void){ } } -void func_8038A2F0(s32 mesh_id, BKVtxRef *ref_vert, Vtx* vert, Struct_MMM_3D50_0 *arg3) { +void MMM_func_8038A2F0(s32 mesh_id, BKVtxRef *ref_vert, Vtx* vert, Struct_MMM_3D50_0 *arg3) { f32 temp_f2; if (arg3->unk4 < 0.5) { @@ -134,7 +134,7 @@ void func_8038A2F0(s32 mesh_id, BKVtxRef *ref_vert, Vtx* vert, Struct_MMM_3D50_0 } -void func_8038A54C(Struct_MMM_3D50_0 *arg0, s32 arg1){ +void MMM_func_8038A54C(Struct_MMM_3D50_0 *arg0, s32 arg1){ s32 v0 = arg0->unk3; arg0->unk3 = arg1; arg0->unk4 = 0.0f; @@ -165,10 +165,10 @@ void func_8038A750(void){ for(v1 = &D_8038C1F0[0]; v1->unk0 != 0; v1++){ v1->unk4 += f20; if(v1->unk3 == 1){ - func_8033F120(D_8038C510.unk0, v1->unk0, func_8038A2F0, v1); + func_8033F120(MMM_D_8038C510.unk0, v1->unk0, MMM_func_8038A2F0, v1); } else if(v1->unk3 == 3){ - func_8033F120(D_8038C510.unk0, v1->unk0, func_8038A58C, v1); + func_8033F120(MMM_D_8038C510.unk0, v1->unk0, func_8038A58C, v1); } } } @@ -179,9 +179,9 @@ void func_8038A82C(Struct_MMM_3D50_0 * arg0){ Struct_MMM_3D50_1 *iPtr; if(arg0->unk2 == 'X'){ - func_8038A54C(arg0, 1); + MMM_func_8038A54C(arg0, 1); player_getPosition(sp44); - func_8038AD10(D_8038C510.unkC, D_8038C510.unk10, sp38); + func_8038AD10(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10, sp38); sp38[1] = sp44[1]; func_8028F620(sp38, 300.0f, -1500.0f); return; @@ -189,10 +189,10 @@ void func_8038A82C(Struct_MMM_3D50_0 * arg0){ for(iPtr = &D_8038C2F0[0]; iPtr->unk0 != 0; iPtr++){//L8038A8C8 if(arg0->unk2 == iPtr->unk0[iPtr->unk4]){ iPtr->unk4++; - func_8038A54C(arg0, 3); + MMM_func_8038A54C(arg0, 3); if( iPtr->unk0[iPtr->unk4] == 0){ func_8038A140(5); - func_8038AF3C(D_8038C510.unkC, D_8038C510.unk10); + func_8038AF3C(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10); func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000); } else{ @@ -216,12 +216,12 @@ void func_8038A994() { void func_8038A9B4(void){ - D_8038C510.unk8 = 0; + MMM_D_8038C510.unk8 = 0; if(map_get() == MAP_24_MMM_TUMBLARS_SHED){ - D_8038C510.unkC = NULL; - D_8038C510.unk0 = func_80309744(0); - D_8038C510.unk4 = NULL; + MMM_D_8038C510.unkC = NULL; + MMM_D_8038C510.unk0 = func_80309744(0); + MMM_D_8038C510.unk4 = NULL; func_8038A2B8(); func_8038A964(); @@ -235,8 +235,8 @@ void func_8038A9B4(void){ } void func_8038AA30(BKModel *arg0, s32 arg1){ - D_8038C510.unkC = arg0; - D_8038C510.unk10 = arg1; + MMM_D_8038C510.unkC = arg0; + MMM_D_8038C510.unk10 = arg1; } void func_8038AA44(void){ @@ -244,12 +244,12 @@ void func_8038AA44(void){ f32 sp28[3]; Struct_MMM_3D50_0 *sp24; - if(D_8038C510.unk8 == 0) return; + if(MMM_D_8038C510.unk8 == 0) return; func_8038A750(); - if( D_8038C510.unk8 == 1 - && D_8038C510.unkC != NULL - && func_8038AD4C(D_8038C510.unkC, D_8038C510.unk10) + if( MMM_D_8038C510.unk8 == 1 + && MMM_D_8038C510.unkC != NULL + && func_8038AD4C(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10) ){ if(!levelSpecificFlags_get(0x2f)){ levelSpecificFlags_set(0x2f, TRUE); @@ -260,33 +260,33 @@ void func_8038AA44(void){ } } - if(D_8038C510.unk8 == 3){ + if(MMM_D_8038C510.unk8 == 3){ if(item_empty(ITEM_6_HOURGLASS)){ func_8038A140(4); } - else if( D_8038C510.unkC != NULL - && func_8038AD4C(D_8038C510.unkC, D_8038C510.unk10) + else if( MMM_D_8038C510.unkC != NULL + && func_8038AD4C(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10) ){ - func_8038AD10(D_8038C510.unkC, D_8038C510.unk10, sp28); - tmp_v0 = func_8033F3C0(D_8038C510.unk0, sp28); + func_8038AD10(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10, sp28); + tmp_v0 = func_8033F3C0(MMM_D_8038C510.unk0, sp28); if(tmp_v0){ sp24 = func_8038A26C(tmp_v0); if( sp24 && sp24->unk3 == 2 - && sp24 != D_8038C510.unk4 + && sp24 != MMM_D_8038C510.unk4 ){ func_8038A82C(sp24); - D_8038C510.unk4 = sp24; + MMM_D_8038C510.unk4 = sp24; } } else{ - D_8038C510.unk4 = 0; + MMM_D_8038C510.unk4 = 0; } } }//L8038AB7C - if( D_8038C510.unk8 == 5 - && func_8038AD38(D_8038C510.unkC, D_8038C510.unk10) + if( MMM_D_8038C510.unk8 == 5 + && func_8038AD38(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10) ){ func_8038A140(6); } diff --git a/src/MMM/code_47D0.c b/src/MMM/code_47D0.c index bb8e3146..e98d43eb 100644 --- a/src/MMM/code_47D0.c +++ b/src/MMM/code_47D0.c @@ -14,7 +14,7 @@ typedef struct { }Struct_MMM_47D0_0; /* .code */ -void func_8038ABC0(s32 arg0) { +void MMM_func_8038ABC0(s32 arg0) { if (getGameMode() != 7) { func_80295864(func_802957F0() & ~arg0); } @@ -22,7 +22,7 @@ void func_8038ABC0(s32 arg0) { void func_8038AC04(void){ if((*(u32*)PHYS_TO_K1(0x1D0)) - 0x356BAAAE){ - func_8038ABC0(0x820); + MMM_func_8038ABC0(0x820); } } @@ -61,7 +61,7 @@ bool func_8038AD4C(s32 arg0, s32 arg1) { && (func_8028ECAC() == 0); } -void func_8038ADF0(Struct_MMM_47D0_0 *arg0, Struct68s *arg1) { +void MMM_func_8038ADF0(Struct_MMM_47D0_0 *arg0, Struct68s *arg1) { u8 sp3F; f32 sp38; Actor *jiggy; diff --git a/src/MMM/code_5000.c b/src/MMM/code_5000.c index 31c634fb..3ab478ca 100644 --- a/src/MMM/code_5000.c +++ b/src/MMM/code_5000.c @@ -86,7 +86,7 @@ void func_8038B630(Struct5Fs *arg0, Struct68s *arg1){ } -void func_8038B6D4(Struct5Fs * arg0, Struct68s *arg1) { +void MMM_func_8038B6D4(Struct5Fs * arg0, Struct68s *arg1) { arg0->unk0 = 1.0f; func_8038B6FC(arg0, arg1); } diff --git a/src/MMM/code_DC0.c b/src/MMM/code_DC0.c index 312454f0..acb0213d 100644 --- a/src/MMM/code_DC0.c +++ b/src/MMM/code_DC0.c @@ -29,7 +29,7 @@ void func_803871D4(s32 arg0) { levelSpecificFlags_setN(0x39, arg0, 3); } -void func_803871FC(Actor *this){ +void MMM_func_803871FC(Actor *this){ switch(this->state){ case 1: func_8033A45C(3, FALSE); @@ -50,7 +50,7 @@ void func_80387280(Actor *this){ this->marker->propPtr->unk8_3 = TRUE; if(!this->initialized){ this->initialized = TRUE; - this->unk130 = func_803871FC; + this->unk130 = MMM_func_803871FC; } switch(this->state){ @@ -66,7 +66,7 @@ void func_80387280(Actor *this){ } } -bool func_80387340(ActorMarker *marker){ +bool MMM_func_80387340(ActorMarker *marker){ Actor *actor = marker_getActor(marker); f32 sp20[3]; s32 sp1C; diff --git a/src/RBB/code_0.c b/src/RBB/code_0.c index 07346459..60ae4a1d 100644 --- a/src/RBB/code_0.c +++ b/src/RBB/code_0.c @@ -43,7 +43,7 @@ Struct_RBB_0_1 D_80390074[4] = { }; /* .code */ -void func_803863F0(Actor *actor, s32 arg1){ +void RBB_func_803863F0(Actor *actor, s32 arg1){ ActorLocal_RBB_0 * local = (ActorLocal_RBB_0 *) &actor->local; void *temp_a0; f32 sp3C[3]; @@ -92,7 +92,7 @@ void func_803865A4(ActorMarker *marker, s32 arg1){ void func_803865D0(ActorMarker *marker){ Actor* actor = marker_getActor(marker); ActorLocal_RBB_0 * local = (ActorLocal_RBB_0 *) &actor->local; - func_803863F0(actor, 1); + RBB_func_803863F0(actor, 1); timed_setCameraToNode(0.0f, D_80390074[local->unk4].unk0); timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (TFQM2) func_803865A4, actor->marker, 4); func_80324E88(0.75*D_80390074[local->unk4].unk4); @@ -158,7 +158,7 @@ void func_803868F0(Actor *this){ local->unk4 = (this->unk78_13 == 0xB)? 3: local->unk4; func_803866F4(this, 1); } - func_803863F0(this, 0); + RBB_func_803863F0(this, 0); }//L803869F4 if(this->state == 2){ if(--local->unkC <= 0){ diff --git a/src/RBB/code_1570.c b/src/RBB/code_1570.c index 9cc5e991..301ec944 100644 --- a/src/RBB/code_1570.c +++ b/src/RBB/code_1570.c @@ -7,12 +7,12 @@ /* typedefs and declarations */ void func_803881E8(Actor *this, s32 arg1); -void func_803882F4(Actor *this); +void RBB_func_803882F4(Actor *this); /* .data */ ActorInfo D_80390270 = { 0x184, 0x174, 0x402, 0x0, NULL, - func_803882F4, NULL, func_80325340, + RBB_func_803882F4, NULL, func_80325340, 0, 0, 0.0f, 0 }; @@ -43,7 +43,7 @@ struct41s D_80390344= { }; /*.code */ -void func_80387960(f32 arg0){ +void RBB_func_80387960(f32 arg0){ f32 sp34[3]; void * temp_v0; f32 sp24[3]; @@ -159,11 +159,11 @@ void func_80387E20(void){ func_802EF3F4(actor, &D_8039032C, &D_80390338, 0x19); } -void func_80387F18(ActorMarker *marker, s32 arg1){ +void RBB_func_80387F18(ActorMarker *marker, s32 arg1){ func_803881E8(marker_getActor(marker), arg1); } -void func_80387F44(void){ +void RBB_func_80387F44(void){ func_80250E94(0.5f, 1.0f, 1.5f, 0.0f, 1.0f, 1.5f); } @@ -187,13 +187,13 @@ void func_80387F88(ActorMarker *marker){ timed_playSfx(3.0f, SFX_1A_BIG_THINGS_FALL_OVER, 0.6f, 22000); func_80324E88(4.0f); func_80324E38(4.0f, 0); - timedFunc_set_2(4.0f, (TFQM2) func_80387F18, (s32) actor->marker, 3); + timedFunc_set_2(4.0f, (TFQM2) RBB_func_80387F18, (s32) actor->marker, 3); } void func_80388154(ActorMarker *marker){ Actor *actor = marker_getActor(marker); func_803879F0(); - timedFunc_set_0(0.0f, (TFQM0) func_80387F44); + timedFunc_set_0(0.0f, (TFQM0) RBB_func_80387F44); timed_playSfx(0.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 0x7fc6); timedFunc_set_2(1.2f, (TFQM2) func_80387B8C, 0x19f, 0); timed_setCameraToNode(1.2f, 8); @@ -203,7 +203,7 @@ void func_80388154(ActorMarker *marker){ void func_803881E8(Actor *this, s32 arg1){ this->state = arg1; if(this->state == 2){ - func_80387960(0.05f); + RBB_func_80387960(0.05f); timedFunc_set_2(0.05f, (TFQM2)func_80387BEC, 0x19f, 0x1f4); timedFunc_set_2(0.1f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000); func_80324E38(0.2f, 3); @@ -219,12 +219,12 @@ void func_803882B4(ActorMarker *marker, s32 arg1){ func_803881E8(actor, 2); } -void func_803882F4(Actor *this){ +void RBB_func_803882F4(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; if(levelSpecificFlags_get(0x2d)){ func_80387AC0(); - func_80387960(0.0f); + RBB_func_80387960(0.0f); func_80387B24(); func_803881E8(this, 3); }else{ diff --git a/src/RBB/code_1FC0.c b/src/RBB/code_1FC0.c index 7614b6af..f61fb10d 100644 --- a/src/RBB/code_1FC0.c +++ b/src/RBB/code_1FC0.c @@ -36,7 +36,7 @@ void func_803883B0(Actor *this, s32 arg1){ this->state = arg1; } -void func_80388430(ActorMarker * marker, ActorMarker *other_marker){ +void RBB_func_80388430(ActorMarker * marker, ActorMarker *other_marker){ Actor * actor = marker_getActor(marker); ActorLocal_RBB_1FC0 *local = (ActorLocal_RBB_1FC0 *) &actor->local; func_8030E6D4(SFX_111_WHIPCRACK_DEATH); @@ -97,7 +97,7 @@ void func_80388620(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; this->marker->propPtr->unk8_3 = 1; - marker_setCollisionScripts(this->marker, func_80388430, NULL, NULL); + marker_setCollisionScripts(this->marker, RBB_func_80388430, NULL, NULL); local->unk4 = 0; local->unk0 = 0.0f; local->unk8 = 0.0f; diff --git a/src/RBB/code_34B0.c b/src/RBB/code_34B0.c index 19378aa3..5e28ade7 100644 --- a/src/RBB/code_34B0.c +++ b/src/RBB/code_34B0.c @@ -2,17 +2,17 @@ #include "functions.h" #include "variables.h" -void func_803899C0(Actor *this); +void RBB_func_803899C0(Actor *this); /* .data */ ActorInfo D_803906B0 = { 0x194, 0x1BE, 0x412, 0x0, NULL, - func_803899C0, NULL, func_80325888, + RBB_func_803899C0, NULL, func_80325888, 0, 0, 0.0f, 0 }; /* .code */ -void func_803898A0(void){ +void RBB_func_803898A0(void){ mapSpecificFlags_set(0, 1); } @@ -23,7 +23,7 @@ void func_803898C4(Actor * this, s32 arg1){ this->position_y -= 35.0f; func_80324E38(1.0f, 3); timed_setCameraToNode(1.0f, 0); - timedFunc_set_0(1.0f, func_803898A0); + timedFunc_set_0(1.0f, RBB_func_803898A0); func_80324E88(5.0f); func_80324E38(5.0f, 0); } @@ -36,7 +36,7 @@ void func_80389980(ActorMarker *marker, s32 arg1){ } } -void func_803899C0(Actor *this){ +void RBB_func_803899C0(Actor *this){ if(!this->unk16C_4){ this->marker->propPtr->unk8_3 = 1; this->unk16C_4 = 1; diff --git a/src/RBB/code_3CB0.c b/src/RBB/code_3CB0.c index bce66c0e..ba7716eb 100644 --- a/src/RBB/code_3CB0.c +++ b/src/RBB/code_3CB0.c @@ -35,7 +35,7 @@ ActorInfo D_80390738 = { }; /* .code */ -void func_8038A0A0(Actor *this, s32 arg1){ +void RBB_func_8038A0A0(Actor *this, s32 arg1){ ActorLocal_RBB_3CB0 *local = (ActorLocal_RBB_3CB0 *)&this->local; if(arg1 == 1) @@ -62,7 +62,7 @@ void func_8038A0A0(Actor *this, s32 arg1){ void func_8038A1C8(ActorMarker *marker, s32 arg1){ Actor *actor = marker_getActor(marker); if(actor->state == 1){ - func_8038A0A0(actor, 2); + RBB_func_8038A0A0(actor, 2); } else if(actor->state == 2){ func_8038FF40(); @@ -109,16 +109,16 @@ void func_8038A324(Actor *this){ this->position_y = (f32)local->unk0->unk0[1]; this->position_z = (f32)local->unk0->unk0[2]; if(levelSpecificFlags_get(local->unk0->unkA)) - func_8038A0A0(this, 2); + RBB_func_8038A0A0(this, 2); else - func_8038A0A0(this, 1); + RBB_func_8038A0A0(this, 1); }//L8038A47C if(this->state == 2){ if( !levelSpecificFlags_get(local->unk0->unkA) && !levelSpecificFlags_get(3) && !levelSpecificFlags_get(4) ){ - func_8038A0A0(this, 1); + RBB_func_8038A0A0(this, 1); } } } \ No newline at end of file diff --git a/src/RBB/code_47D0.c b/src/RBB/code_47D0.c index b36642e3..7261ca34 100644 --- a/src/RBB/code_47D0.c +++ b/src/RBB/code_47D0.c @@ -53,7 +53,7 @@ s32 D_8039092C[3] = { 0, 0xFF, 0}; s32 D_80390938[3] = { 0xFF, 0, 0}; /* .code */ -Struct_RBB_47D0 *func_8038ABC0(Actor *arg0){ +Struct_RBB_47D0 *RBB_func_8038ABC0(Actor *arg0){ Struct_RBB_47D0 *iPtr = D_80390870; while(iPtr->unk0 != 0){ if(iPtr->unk0 == arg0->modelCacheIndex) @@ -134,7 +134,7 @@ void func_8038AEB8(Actor *this){ this->marker->propPtr->unk8_3 = 1; this->marker->unk30 = func_8038AD7C; marker_setCollisionScripts(this->marker, NULL, func_8038AD3C, NULL); - local->unk4 = func_8038ABC0(this); + local->unk4 = RBB_func_8038ABC0(this); mapSpecificFlags_set(local->unk4->unk10, FALSE); this->position_x = local->unk4->unk4[0]; this->position_y = local->unk4->unk4[1]; diff --git a/src/RBB/code_4C70.c b/src/RBB/code_4C70.c index 1fa12dd8..046752ba 100644 --- a/src/RBB/code_4C70.c +++ b/src/RBB/code_4C70.c @@ -40,7 +40,7 @@ ActorInfo D_803909D4 = { 0, 0, 0.0f, 0 }; -ActorInfo D_803909F8 = { +ActorInfo RBB_D_803909F8 = { 0x2C, 0x1C4, 0x416, 0x0, NULL, func_8038B340, NULL, func_8038B230, 0, 0, 0.0f, 0 @@ -65,7 +65,7 @@ Struct_RBB_4C70 *func_8038B060(Actor *this){ return NULL; } -void func_8038B0B8(Actor *this, s32 arg1){ +void RBB_func_8038B0B8(Actor *this, s32 arg1){ ActorLocal_RBB_4C70 *local = (ActorLocal_RBB_4C70 *)&this->local; ParticleEmitter *other; @@ -137,16 +137,16 @@ void func_8038B340(Actor * this){ this->yaw = -90.0f; this->scale = 0.25f; - func_8038B0B8(this, 1); + RBB_func_8038B0B8(this, 1); }//L8038B3E4 if(this->state == 1){ if(mapSpecificFlags_get(local->unk0->unk10)) - func_8038B0B8(this, 2); + RBB_func_8038B0B8(this, 2); } if(this->state == 2){ if( func_80335794(this->unk148) > 0 ) - func_8038B0B8(this, 1); + RBB_func_8038B0B8(this, 1); } } diff --git a/src/RBB/code_5490.c b/src/RBB/code_5490.c index df016795..23a80d48 100644 --- a/src/RBB/code_5490.c +++ b/src/RBB/code_5490.c @@ -8,7 +8,7 @@ extern s32 func_802EDD8C(f32 (*)[3], f32, f32); void func_8038B900(Actor *this); /* .data */ -ActorInfo D_80390AB0 = { +ActorInfo RBB_D_80390AB0 = { 0x30, 0x1C8, 0x41C, 0x0, NULL, NULL, func_8038B900, func_80325888, 0, 0, 0.0f, 0 diff --git a/src/RBB/code_5AB0.c b/src/RBB/code_5AB0.c index a1767c92..c7a6097b 100644 --- a/src/RBB/code_5AB0.c +++ b/src/RBB/code_5AB0.c @@ -5,14 +5,14 @@ void func_8038BF28(Actor *this); /* .data */ -ActorInfo D_80390AE0 = { +ActorInfo RBB_D_80390AE0 = { 0x31, 0x1C9, 0x41D, 0x0, NULL, func_8038BF28, NULL, func_80325888, 0, 0, 0.0f, 0 }; /* .code */ -void func_8038BEA0(Actor *this, s32 arg1){ +void RBB_func_8038BEA0(Actor *this, s32 arg1){ if(arg1 == 1) func_80335924(this->unk148, ASSET_141_ANIM_ANCHOR_LOWERED, 0.0f, 5.5f); @@ -31,14 +31,14 @@ void func_8038BF28(Actor *this){ this->position_z = 1460.0f; this->marker->propPtr->unk8_3 = 1; this->yaw = 0.0f; - func_8038BEA0(this, 1); + RBB_func_8038BEA0(this, 1); if(jiggyscore_isSpawned(JIGGY_53_RBB_SNORKEL)){ marker_despawn(this->marker); } } else{ if(this->state == 1 && mapSpecificFlags_get(8)){ - func_8038BEA0(this, 2); + RBB_func_8038BEA0(this, 2); } } } diff --git a/src/RBB/code_5C10.c b/src/RBB/code_5C10.c index d14bf256..886d32ba 100644 --- a/src/RBB/code_5C10.c +++ b/src/RBB/code_5C10.c @@ -8,7 +8,7 @@ void func_8038C0FC(Actor *this, s32 new_state); void func_8038C204(Actor *this); /* .data */ -ActorInfo D_80390B10 = { +ActorInfo RBB_D_80390B10 = { 0x199, 0x1CB, 0x0, 0x0, NULL, func_8038C204, NULL, func_80325340, 0, 0, 0.0f, 0 diff --git a/src/RBB/code_5F80.c b/src/RBB/code_5F80.c index 2a170a3b..8447cf52 100644 --- a/src/RBB/code_5F80.c +++ b/src/RBB/code_5F80.c @@ -34,7 +34,7 @@ typedef struct{ f32 unk28; } ActorLocal_RBB_5F80; -void func_8038CC9C(Actor *this, s32 new_state); +void RBB_func_8038CC9C(Actor *this, s32 new_state); void func_8038D7E8(ActorMarker *marker, s32 arg1); Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3); void func_8038D8BC(Actor *this); @@ -47,7 +47,7 @@ Struct_RBB_5F80 D_80390B70[4] = { {ACTOR_284_BOSS_BOOM_BOX_SMALL, 0.25f, 2.0f, 0x5, 0x02, 0x2, 1.5f, 1.1f}, }; -ActorInfo D_80390BD0 = { +ActorInfo RBB_D_80390BD0 = { MARKER_1A1_BOSS_BOOM_BOX_LARGEST, ACTOR_281_BOSS_BOOM_BOX_LARGEST, ASSET_428_MODEL_BOSS_BOOM_BOX, 0x0, NULL, func_8038D8BC, NULL, func_8038D638, 0, 0, 0.0f, 0 @@ -65,7 +65,7 @@ ActorInfo D_80390C18 = { 0, 0, 0.0f, 0 }; -ActorInfo D_80390C3C = { +ActorInfo RBB_D_80390C3C = { MARKER_1A4_BOSS_BOOM_BOX_SMALL, ACTOR_284_BOSS_BOOM_BOX_SMALL, ASSET_428_MODEL_BOSS_BOOM_BOX, 0x0, NULL, func_8038D8BC, NULL, func_8038D638, 0, 0, 0.0f, 0 @@ -93,9 +93,9 @@ s32 pad_80391284; f32 D_80391288[3]; /* .code */ -void func_8038C370(ActorMarker *marker, s32 arg1){ +void RBB_func_8038C370(ActorMarker *marker, s32 arg1){ Actor *actor = marker_getActor(marker); - func_8038CC9C(actor, arg1); + RBB_func_8038CC9C(actor, arg1); } void func_8038C39C(Actor *this){ @@ -120,7 +120,7 @@ void func_8038C39C(Actor *this){ particleEmitter_emitN(other, local->unk0->unkE); } -void func_8038C538(Actor *this){ +void RBB_func_8038C538(Actor *this){ ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local; ParticleEmitter *other = partEmitList_pushNew(3*local->unk0->unkE); particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2); @@ -144,7 +144,7 @@ void func_8038C538(Actor *this){ } -void func_8038C70C(Actor *this){ +void RBB_func_8038C70C(Actor *this){ ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local; ParticleEmitter *other = partEmitList_pushNew(0xa); @@ -230,7 +230,7 @@ void func_8038CB68(ActorMarker *marker, s32 arg1, s32 arg2){ Actor *actor = marker_getActor(marker); func_80324E88(0.0f); func_80324E38(0.0f, 0); - timedFunc_set_2(0.0f, (TFQM2)func_8038C370, actor->marker, 3); + timedFunc_set_2(0.0f, (TFQM2)RBB_func_8038C370, actor->marker, 3); } void func_8038CBC0(void){ @@ -239,7 +239,7 @@ void func_8038CBC0(void){ func_802C8090(actor); } -int func_8038CBF0(Actor *this){ +int RBB_func_8038CBF0(Actor *this){ f32 sp2C[3]; f32 sp20[3]; ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local; @@ -258,7 +258,7 @@ int func_8038CBF0(Actor *this){ } -void func_8038CC9C(Actor *this, s32 new_state){ +void RBB_func_8038CC9C(Actor *this, s32 new_state){ f32 sp8C[3]; f32 sp80[3]; ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local; @@ -320,7 +320,7 @@ void func_8038CC9C(Actor *this, s32 new_state){ item_set(ITEM_0_HOURGLASS_TIMER, 0x1067); func_80324E88(2.4f); func_80324E38(2.4f, 0); - timedFunc_set_2(2.4f, (TFQM2)func_8038C370, (s32)this->marker, 3); + timedFunc_set_2(2.4f, (TFQM2)RBB_func_8038C370, (s32)this->marker, 3); } else{//L8038CEFC timedFunc_set_3(2.4f, (TFQM3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 0x1f40, 0x12C); @@ -351,8 +351,8 @@ void func_8038CC9C(Actor *this, s32 new_state){ local->unk14[2] = sp80[2] + this->position_z; local->unk14[1] = 0.0f; func_8038CA70(this, &local->unk14); - func_8038C70C(this); - func_8038C538(this); + RBB_func_8038C70C(this); + RBB_func_8038C538(this); }//L8038D17C if(this->state == 6){ @@ -398,11 +398,11 @@ void func_8038CC9C(Actor *this, s32 new_state){ local->unk14[0] = this->position_x; local->unk14[1] = this->position_y; local->unk14[2] = this->position_z; - local->unk20 = func_8038CBF0(this); + local->unk20 = RBB_func_8038CBF0(this); }//L8038D3FC if(this->state == 3 || this->state == 4 || this->state == 5){ - local->unk20 = func_8038CBF0(this); + local->unk20 = RBB_func_8038CBF0(this); if( local->unk20 == 0){ sp64 = local->unk0->unk4*300.0f; for(i = 0; i < 10; i++){ @@ -410,7 +410,7 @@ void func_8038CC9C(Actor *this, s32 new_state){ local->unk14[1] = local->unk14[1]; local->unk14[2] = local->unk8[2] + randf2(-sp64, sp64); func_8038CA70(this, &local->unk14); - local->unk20 = func_8038CBF0(this); + local->unk20 = RBB_func_8038CBF0(this); if(local->unk20) break; } @@ -434,7 +434,7 @@ void func_8038CC9C(Actor *this, s32 new_state){ void func_8038D590(ActorMarker *marker, s32 arg1){ Actor *actor = marker_getActor(marker); - func_8038CC9C(actor, 4); + RBB_func_8038CC9C(actor, 4); } void func_8038D5BC(ActorMarker *marker, s32 arg1){ @@ -442,7 +442,7 @@ void func_8038D5BC(ActorMarker *marker, s32 arg1){ ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &actor->local; func_8030E6A4(0x3f5, local->unk0->unk10, 0x4e20); - func_8038CC9C(actor, 4); + RBB_func_8038CC9C(actor, 4); func_8038C8A8(actor); } @@ -480,9 +480,9 @@ void func_8038D7E8(ActorMarker *marker, s32 arg1){ func_8030E6A4(SFX_D7_GRABBA_DEATH, local->unk0->unk10, 0x7530); local->unk4 += (arg1) ? 1 : 5; if(local->unk4 >= local->unk0->unkC) - func_8038CC9C(actor, 5); + RBB_func_8038CC9C(actor, 5); else{ - func_8038CC9C(actor, 4); + RBB_func_8038CC9C(actor, 4); } if(!arg1) @@ -518,11 +518,11 @@ void func_8038D8BC(Actor *this){ marker_setCollisionScripts(this->marker, func_8038D590, func_8038D5BC, func_8038D608); func_803300D8(this->marker, func_8038D8B4); if(local->unk0->unk0 == ACTOR_281_BOSS_BOOM_BOX_LARGEST){ - func_8038CC9C(this, 1); + RBB_func_8038CC9C(this, 1); D_80391280 = 0; } else{ - func_8038CC9C(this, 7); + RBB_func_8038CC9C(this, 7); } if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !func_803203FC(2)) @@ -544,12 +544,12 @@ void func_8038D8BC(Actor *this){ if(this->state == 1){ if(func_803203FC(2)){ if(func_803203FC(3)){ - func_8038CC9C(this, 2); + RBB_func_8038CC9C(this, 2); } } else{//L8038DAA8 if(ml_vec3f_distance(&this->position, &sp64) < 1200.0f){ - func_8038CC9C(this, 2); + RBB_func_8038CC9C(this, 2); } } }//L8038DAD8 @@ -578,7 +578,7 @@ void func_8038D8BC(Actor *this){ if(item_empty(ITEM_0_HOURGLASS_TIMER)){ func_803204E4(3, 0); func_803204E4(5, 0); - func_8038CC9C(this, 8); + RBB_func_8038CC9C(this, 8); } } func_8033568C(this->unk148, &sp54, &sp50); @@ -589,13 +589,13 @@ void func_8038D8BC(Actor *this){ } if(func_80335794(this->unk148) > 0) - func_8038CC9C(this, 3); + RBB_func_8038CC9C(this, 3); }//L8038DD64 if(this->state == 5){ if(func_80335794(this->unk148) > 0){ - func_8038CC9C(this, 6); + RBB_func_8038CC9C(this, 6); }else{ tmp_f2 = func_80335684(this->unk148); if(tmp_f2 <= 0.3) @@ -608,6 +608,6 @@ void func_8038D8BC(Actor *this){ if(this->state == 7){ if(func_80335794(this->unk148) > 0) - func_8038CC9C(this, 3); + RBB_func_8038CC9C(this, 3); } } diff --git a/src/RBB/code_640.c b/src/RBB/code_640.c index 76ae5f01..b367cf01 100644 --- a/src/RBB/code_640.c +++ b/src/RBB/code_640.c @@ -30,22 +30,22 @@ extern ActorInfo D_803908E4; extern ActorInfo D_80390908; extern ActorInfo D_803909B0; extern ActorInfo D_803909D4; -extern ActorInfo D_803909F8; +extern ActorInfo RBB_D_803909F8; extern ActorInfo D_80390A50; extern ActorInfo D_80390380; extern ActorInfo D_80390A80; //anchorswitch -extern ActorInfo D_80390AB0; //dolphin -extern ActorInfo D_80390AE0; //anchor -extern ActorInfo D_80390B10; +extern ActorInfo RBB_D_80390AB0; //dolphin +extern ActorInfo RBB_D_80390AE0; //anchor +extern ActorInfo RBB_D_80390B10; extern ActorInfo D_80390B40; //rarewareflag -extern ActorInfo D_80390BD0; +extern ActorInfo RBB_D_80390BD0; extern ActorInfo D_80390BF4; extern ActorInfo D_80390C18; -extern ActorInfo D_80390C3C; -extern ActorInfo D_80390CF0; +extern ActorInfo RBB_D_80390C3C; +extern ActorInfo RBB_D_80390CF0; extern ActorInfo D_80390D88; extern ActorInfo D_80390DAC; //TNTpart_IDStruct; -extern ActorInfo D_80390E00; +extern ActorInfo RBB_D_80390E00; extern ActorInfo D_80390E34; extern ActorInfo D_80390E58; extern ActorInfo D_803900E0; @@ -168,7 +168,7 @@ void func_80386BF8(Actor *arg0){ func_802D4A9C(arg0, 0); } -void rbb_func_80386C48(void){ +void RBB_func_80386C48(void){ spawnableActorList_add(&D_80390D20, actor_new, 0x4880); spawnableActorList_add(&D_80390050, actor_new, 0); spawnableActorList_add(&D_80390200, actor_new, 0x80); @@ -195,22 +195,22 @@ void rbb_func_80386C48(void){ spawnableActorList_add(&D_80390908, actor_new, 0x80); spawnableActorList_add(&D_803909B0, actor_new, 0x880); spawnableActorList_add(&D_803909D4, actor_new, 0x880); - spawnableActorList_add(&D_803909F8, actor_new, 0x880); + spawnableActorList_add(&RBB_D_803909F8, actor_new, 0x880); spawnableActorList_add(&D_80390A50, actor_new, 0x80); spawnableActorList_add(&D_80390380, actor_new, 0x9aa); spawnableActorList_add(&D_80390A80, actor_new, 0x80); //anchorswitch - spawnableActorList_add(&D_80390AB0, actor_new, 0x8C8); //dolphin - spawnableActorList_add(&D_80390AE0, actor_new, 0xC80); //anchor - spawnableActorList_add(&D_80390B10, actor_new, 0x80); + spawnableActorList_add(&RBB_D_80390AB0, actor_new, 0x8C8); //dolphin + spawnableActorList_add(&RBB_D_80390AE0, actor_new, 0xC80); //anchor + spawnableActorList_add(&RBB_D_80390B10, actor_new, 0x80); spawnableActorList_add(&D_80390B40, actor_new, 0x880); //rarewareflag - spawnableActorList_add(&D_80390BD0, actor_new, 0xc2c); + spawnableActorList_add(&RBB_D_80390BD0, actor_new, 0xc2c); spawnableActorList_add(&D_80390BF4, actor_new, 0xc2c); spawnableActorList_add(&D_80390C18, actor_new, 0xc2c); - spawnableActorList_add(&D_80390C3C, actor_new, 0xc2c); - spawnableActorList_add(&D_80390CF0, actor_new, 0x80); + spawnableActorList_add(&RBB_D_80390C3C, actor_new, 0xc2c); + spawnableActorList_add(&RBB_D_80390CF0, actor_new, 0x80); spawnableActorList_add(&D_80390D88, actor_new, 0x2000889); spawnableActorList_add(&D_80390DAC, actor_new, 0x2000889); - spawnableActorList_add(&D_80390E00, actor_new, 0x80); + spawnableActorList_add(&RBB_D_80390E00, actor_new, 0x80); spawnableActorList_add(&D_80390E34, actor_new, 0x80); spawnableActorList_add(&D_80390E58, actor_new, 0x80); spawnableActorList_add(&D_803900E0, actor_new, 0); diff --git a/src/RBB/code_7A60.c b/src/RBB/code_7A60.c index 24eeae77..10d9969d 100644 --- a/src/RBB/code_7A60.c +++ b/src/RBB/code_7A60.c @@ -6,7 +6,7 @@ void func_8038DE68(Actor *this); /* .data */ -ActorInfo D_80390CF0 = { +ActorInfo RBB_D_80390CF0 = { 0x1C0, 0x2AD, 0x0, 0x0, NULL, func_8038DE68, NULL, func_80325340, 0, 0, 0.0f, 0 diff --git a/src/RBB/code_8520.c b/src/RBB/code_8520.c index b448e8a0..dab05dfe 100644 --- a/src/RBB/code_8520.c +++ b/src/RBB/code_8520.c @@ -41,7 +41,7 @@ ActorInfo D_80390DAC = { 0, 0, 0.0f, 0 }; -s32 D_80390DD0[3] = {0xDE, 0xA7, 0x71}; +s32 RBB_D_80390DD0[3] = {0xDE, 0xA7, 0x71}; s32 D_80390DDC[4] = {0xFF, 0xFF, 0xFF, 0xFF}; s32 D_80390DEC[4] = {0,0,0,0}; @@ -116,7 +116,7 @@ void func_8038EC14(Actor *this){ func_802EFB84(other, 2.0f, 3.0f); particleEmitter_setParticleSpawnPositionRange(other, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f); particleEmitter_setParticleVelocityRange(other, -70.0f, 50.0f, -70.0f, 70.0f, 100.0f, 70.0f); - func_802EFFA8(other, &D_80390DD0); + func_802EFFA8(other, &RBB_D_80390DD0); func_802EFEC0(other, 3.0f, 4.0f); particleEmitter_emitN(other, 6); } diff --git a/src/RBB/code_9670.c b/src/RBB/code_9670.c index c288de44..58d3902f 100644 --- a/src/RBB/code_9670.c +++ b/src/RBB/code_9670.c @@ -4,12 +4,12 @@ extern -void func_8038FB84(Actor *this); +void RBB_func_8038FB84(Actor *this); /* .data */ -ActorInfo D_80390E00 = { +ActorInfo RBB_D_80390E00 = { 0x1B8, 0x2A5, 0x0, 0x0, NULL, - func_8038FB84, NULL, func_80325340, + RBB_func_8038FB84, NULL, func_80325340, 0, 0, 0.0f, 0 }; @@ -17,7 +17,7 @@ ActorInfo D_80390E00 = { u8 D_803912B0; /* .code */ -void func_8038FA60(ActorMarker *marker){ +void RBB_func_8038FA60(ActorMarker *marker){ Actor *actor = marker_getActor(marker); func_802C8F70(actor->yaw); func_802C937C(6, &actor->position); @@ -28,7 +28,7 @@ void func_8038FA9C(Actor *this, s32 arg1){ func_80324E38(0.0f, 3); timedFunc_set_2(1.0f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000); timed_setCameraToNode(1.8f, 1); - timedFunc_set_1(2.0f, (GenMethod_1) func_8038FA60, (s32)this->marker); + timedFunc_set_1(2.0f, (GenMethod_1) RBB_func_8038FA60, (s32)this->marker); func_80324E88(5.0f); func_80324E38(5.0f, 0); } @@ -43,7 +43,7 @@ void func_8038FB6C(void){ D_803912B0--; } -void func_8038FB84(Actor *this){ +void RBB_func_8038FB84(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; D_803912B0 = 0; diff --git a/src/RBB/code_9840.c b/src/RBB/code_9840.c index b6144824..b0944e5c 100644 --- a/src/RBB/code_9840.c +++ b/src/RBB/code_9840.c @@ -12,7 +12,7 @@ typedef struct { }ActorLocal_RBB_9840; /* .data */ -s16 D_80390E30[2] = {0x177, 0x17F}; +s16 RBB_D_80390E30[2] = {0x177, 0x17F}; ActorInfo D_80390E34 = { 0x1D2, 0x31B, 0x0, 0x0, NULL, func_8038FC48, NULL, func_80325340, @@ -38,7 +38,7 @@ void func_8038FC48(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; actor_collisionOff(this); - local->unk4 = D_80390E30 + (this->marker->unk14_20 - 0x1d2); + local->unk4 = RBB_D_80390E30 + (this->marker->unk14_20 - 0x1d2); local->unk8 = NULL; local->unk0 = func_802F9AA8(0x400); diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index 91dd96c8..f627326a 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -38,7 +38,7 @@ void __chAttackTutorial_spawnEnemy(ActorMarker *marker, s32 enemy_id){ if(marker); } -s32 func_803871FC(Actor *this, s32 arg1){ +s32 SM_func_803871FC(Actor *this, s32 arg1){ volatile s32 sp1C; s32 tmp_v0; @@ -82,7 +82,7 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){ case 2://L803873E0 this->unk38_31 = 0; - func_803871FC(this, ++this->unk10_12); + SM_func_803871FC(this, ++this->unk10_12); break; case 3://L8038742C mapSpecificFlags_set(5,1); @@ -94,7 +94,7 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){ if(!honeycombscore_get(HONEYCOMB_17_SM_COLIWOBBLE)){ this->unk10_12 = 3; this->unk38_31 = 1; - func_803871FC(this, this->unk10_12); + SM_func_803871FC(this, this->unk10_12); } break; }//L803874A8 @@ -155,7 +155,7 @@ void func_80387690(ActorMarker *marker, enum asset_e text_id, s32 arg2){ case 0xE14: case 0xE16: case 0xE18: - func_803871FC(actor, actor->unk10_12); + SM_func_803871FC(actor, actor->unk10_12); break; case 0xE15: ability_unlock(ABILITY_C_ROLL); diff --git a/src/SM/code_0.c b/src/SM/code_0.c index 9e0b419c..9c784bc3 100644 --- a/src/SM/code_0.c +++ b/src/SM/code_0.c @@ -13,11 +13,11 @@ typedef struct { }Struct_SM_0; /* .code */ -void func_803863F0(Actor *this, s32 arg1) { +void SM_func_803863F0(Actor *this, s32 arg1) { func_80288F78(this, 0.20f, 0xF280FA); } -void func_80386420(Actor *arg0, s32 arg1) { +void SM_func_80386420(Actor *arg0, s32 arg1) { func_80288F78(arg0, 0.20f, 0x3ED803E); func_80288F78(arg0, 0.35f, 0x3ED8C3E); func_80288F78(arg0, 0.71f, 0x21F336); @@ -28,6 +28,6 @@ void func_80386420(Actor *arg0, s32 arg1) { /* .data */ Struct_SM_0 D_8038AAC0[2] = { - {0x20A, func_803863F0, 0, 0}, - {0x208, func_80386420, 0, 0}, + {0x20A, SM_func_803863F0, 0, 0}, + {0x208, SM_func_80386420, 0, 0}, }; diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index 5f61e7dc..b112d3b4 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -20,7 +20,7 @@ typedef struct sm_2900_struct{ //public void func_803899B0(Actor * this); -void func_80389610(Actor * this); +void SM_func_80389610(Actor * this); /* .data */ ActorAnimationInfo D_8038AF60[6] = { @@ -141,7 +141,7 @@ void func_80388FA0(Actor *this, s32 arg1){ case 5: func_80388F24(this); func_8028F94C(2,this->position); - func_80389610(this); + SM_func_80389610(this); break; case 3: actor_loopAnimation(this); @@ -256,7 +256,7 @@ void func_80389494(Actor * this, s32* arg1, s32 *arg2){ } } -void func_80389610(Actor * this){ +void SM_func_80389610(Actor * this){ s32 sp2C; s32 sp28; @@ -476,7 +476,7 @@ void func_803899B0(Actor * this){ }//L80389EA0 if(actor_animationIsAt(this, 0.9999f)){ if(!mapSpecificFlags_get(1)){ - func_80389610(this); + SM_func_80389610(this); } func_80388FA0(this, 3); }//L80389EE0 @@ -489,7 +489,7 @@ void func_803899B0(Actor * this){ }else if(actor_animationIsAt(this, 0.35f)){//L80389F78 if(mapSpecificFlags_get(1)){ - func_80389610(this); + SM_func_80389610(this); } } break; diff --git a/src/SM/code_4070.c b/src/SM/code_4070.c index e46d08ac..010dbe3c 100644 --- a/src/SM/code_4070.c +++ b/src/SM/code_4070.c @@ -7,12 +7,12 @@ Actor *func_802D94B4(ActorMarker *, Gfx **, Mtx **, Vtx**); void func_80324E88(f32); //public -void func_8038A5D8(Actor *this); +void SM_func_8038A5D8(Actor *this); void func_8038A4DC(Actor *this, s32 arg1); /* .data */ ActorInfo D_8038B0B0 = { 0x1ED, 0x3B9, 0, 1, NULL, - func_8038A5D8, func_80326224, func_80325340, + SM_func_8038A5D8, func_80326224, func_80325340, 0, 0, 0.0f, 0 }; @@ -55,7 +55,7 @@ void func_8038A4DC(Actor *this, s32 arg1){ func_80328A84(this, arg1); } -void func_8038A5D8(Actor *this){ +void SM_func_8038A5D8(Actor *this){ f32 sp5C[3]; s32 sp44[6]; f32 sp40; diff --git a/src/SM/code_5B0.c b/src/SM/code_5B0.c index 87aca080..340286db 100644 --- a/src/SM/code_5B0.c +++ b/src/SM/code_5B0.c @@ -6,8 +6,8 @@ void func_803869A0(Actor*, f32, f32); void func_802C4218(s32, f32, f32, f32); -void func_80386EF4(Actor *this); -void func_80386A00(Actor *this); +void SM_func_80386EF4(Actor *this); +void SM_func_80386A00(Actor *this); /*.data */ ActorAnimationInfo D_8038AAF0[] = { @@ -18,14 +18,14 @@ ActorAnimationInfo D_8038AAF0[] = { ActorInfo D_8038AB00 = { MARKER_135_QUARRIE, ACTOR_16F_QUARRIE, ASSET_42D_MODEL_QUARRIE, 1, NULL, - func_80386EF4, func_80326224, func_80325E78, + SM_func_80386EF4, func_80326224, func_80325E78, 2000, 0, 5.0f, 0 }; ActorInfo D_8038AB24 = { MARKER_29D_ROCK_TRAPPING_GRUNTY, ACTOR_3CA_ROCK_TRAPPING_GRUNTY, ASSET_47B_MODEL_ROCK, 1, D_8038AAF0, - func_80386A00, func_80326224, func_80325E78, + SM_func_80386A00, func_80326224, func_80325E78, 0, 0, 0.0f, 0 }; @@ -50,7 +50,7 @@ void func_803869A0(Actor *this, f32 arg1, f32 arg2) { } } -void func_80386A00(Actor *this) { +void SM_func_80386A00(Actor *this) { if (this->unk16C_4 <= 0) { if (func_8031FF1C(BKPROG_FC_DEFEAT_GRUNTY) == 0) { marker_despawn(this->marker); @@ -99,7 +99,7 @@ void func_80386C2C(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) { particleEmitter_emitN(p_ctrl, arg2); } -void func_80386D68(Actor *this){ +void SM_func_80386D68(Actor *this){ FUNC_8030E8B4(SFX_9B_BOULDER_BREAKING_1, 1.0f, 32000, this->position, 1000, 2000); this->unk44_31 = func_8030D90C(); @@ -122,11 +122,11 @@ void func_80386EB4(ActorMarker *marker, ActorMarker *other_marker) { Actor *this; this = marker_getActor(marker); if ((this->state ) == 2) { - func_80386D68(this); + SM_func_80386D68(this); } } -void func_80386EF4(Actor *this) { +void SM_func_80386EF4(Actor *this) { u32 temp_t3; Actor *other; if ((this->unk16C_4) <= 0) { diff --git a/src/SM/code_BF0.c b/src/SM/code_BF0.c index 6d9a75f2..b1866997 100644 --- a/src/SM/code_BF0.c +++ b/src/SM/code_BF0.c @@ -2,18 +2,18 @@ #include "functions.h" #include "variables.h" -void func_80386FE0(Actor *this); +void SM_func_80386FE0(Actor *this); /* .data */ ActorInfo D_8038ABF0 = { 0x134, 0x16E, 0, 1, NULL, - func_80386FE0, func_80326224, func_80325340, + SM_func_80386FE0, func_80326224, func_80325340, 2000, 0, 0.0f, 0 }; /* .code */ -void func_80386FE0(Actor *this){ +void SM_func_80386FE0(Actor *this){ if(!this->unk16C_4){ this->unk10_12 = 0; this->unk38_31 = this->unk10_12; diff --git a/src/SM/code_F0.c b/src/SM/code_F0.c index 3a1d0823..166a9dfd 100644 --- a/src/SM/code_F0.c +++ b/src/SM/code_F0.c @@ -140,7 +140,7 @@ bool SM_CRCs_are_valid(void){ return FALSE; } -void func_80386810(void) +void SM_func_80386810(void) { spawnableActorList_add(&D_8038AB00, actor_new, 0X2000180); spawnableActorList_add(&D_8038ABF0, actor_new, 0X80); diff --git a/src/TTC/ch/lockup.c b/src/TTC/ch/lockup.c index bbf729fb..e763fa9b 100644 --- a/src/TTC/ch/lockup.c +++ b/src/TTC/ch/lockup.c @@ -55,7 +55,7 @@ Actor *func_803894C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ } -void func_80389530(Actor *this){ +void TTC_func_80389530(Actor *this){ func_80328B8C(this, 1, 0.2f, 1); this->marker->collidable = FALSE; this->unk38_31 = 0; @@ -142,7 +142,7 @@ void func_80389600(Actor *this){ case 4: //L803898F4 case 5: //L803898F4 if(this->marker->unk14_21 && actor_animationIsAt(this, 0.99f)){ - func_80389530(this); + TTC_func_80389530(this); for(i = 5; i < 0xe; i++){ func_8034A174(this->marker->unk44, i, this->unk1C); func_802EE6CC(this->unk1C, D_8038C80C, D_8038C7FC, 1, 0.4f, 50.0f, 0xb4, 0xa0, 0); diff --git a/src/TTC/code_0.c b/src/TTC/code_0.c index 8f123ce4..ecb22585 100644 --- a/src/TTC/code_0.c +++ b/src/TTC/code_0.c @@ -25,7 +25,7 @@ ActorInfo D_8038C3D0 = { /* .code */ -void func_803863F0(enum sfx_e sfx_id, f32 arg1, s32 arg2, f32 position[3], f32 arg4, f32 arg5){ +void TTC_func_803863F0(enum sfx_e sfx_id, f32 arg1, s32 arg2, f32 position[3], f32 arg4, f32 arg5){ if(func_803114B0()){ arg2 -= 10000; if(arg2 < 0) @@ -40,7 +40,7 @@ void func_80386454(Actor *this){ animctrl_setDuration(this->animctrl, randf2(1.9f, 2.1f)); } -bool func_803864B0(Actor *this, f32 arg1) { +bool TTC_func_803864B0(Actor *this, f32 arg1) { f32 sp5C; f32 sp58; f32 pad; @@ -88,7 +88,7 @@ bool func_803864B0(Actor *this, f32 arg1) { if ((func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11) < this->unk28) { this->unk28 = (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) != 0) ? 0.0f : 17.0f; } else if (sp38 == 0) { - func_803863F0(SFX_AE_YUMYUM_TALKING, randf2(0.9f, 1.0f), 22000, this->position, 500.0f, 2000.0f); + TTC_func_803863F0(SFX_AE_YUMYUM_TALKING, randf2(0.9f, 1.0f), 22000, this->position, 500.0f, 2000.0f); } return 1; @@ -104,7 +104,7 @@ bool func_80386760(Actor *this, s32 arg1) { animctrl_setDuration(this->animctrl, 1.0f); sp2C = (s32) ((f64) (60.0f / (f32) func_8033DD90()) * 0.5); - if ((this->unk1C[0] != 0.0f) || !func_803864B0(this, sp2C)) { + if ((this->unk1C[0] != 0.0f) || !TTC_func_803864B0(this, sp2C)) { if (((f64) animctrl_getAnimTimer(this->animctrl) < 0.1) && ((f64) randf() < 0.5)) { if (this->unk1C[0] != 0.0f) { arg1 *= 2; @@ -148,7 +148,7 @@ void func_80386A9C(ParticleEmitter *pCtrl, f32 position[3]){ func_802EFA70(pCtrl, 2); } -void func_80386B54(f32 position[3], s32 count){ +void TTC_func_80386B54(f32 position[3], s32 count){ static struct41s D_8038C3F4 = { {{-50.0f, 750.0f, -50.0f}, {120.0f, 900.0f, 120.0f}}, {{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}} @@ -196,7 +196,7 @@ void func_80386CBC(f32 position[3], s32 count){ particleEmitter_emitN(pCtrl, count); } -void func_80386D68(f32 position[3], enum asset_e sprite_id, s32 count){ +void TTC_func_80386D68(f32 position[3], enum asset_e sprite_id, s32 count){ static struct31s D_8038C484 = { {0.2f, 0.35f}, {0.0f, 0.0f}, @@ -227,9 +227,9 @@ void func_80386DF4(ActorMarker *this_marker, ActorMarker *other_marker){ this = marker_getActor(this_marker); this->marker->collidable = FALSE; this->unk138_27 = TRUE; - func_803863F0(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1500.0f, 2000.0f); - func_803863F0(SFX_115_BUZZBOMB_DEATH, 1.2f, 26000, this->position, 1500.0f, 2000.0f); - func_80386B54(this->position, 2); + TTC_func_803863F0(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1500.0f, 2000.0f); + TTC_func_803863F0(SFX_115_BUZZBOMB_DEATH, 1.2f, 26000, this->position, 1500.0f, 2000.0f); + TTC_func_80386B54(this->position, 2); func_80386C08(this->position, 2); func_80386CBC(this->position, 0xC); func_803115C4(0xa14); @@ -301,7 +301,7 @@ void func_80386FDC(Actor *this){ func_80328B8C(this, 2, 0.01f, 1); actor_playAnimationOnce(this); animctrl_setDuration(this->animctrl, 1.0f); - func_803863F0(SFX_3F2_UNKNOWN, randf2(1.0f, 1.1f), 22000, this->position, 1500.0f, 2000.0f); + TTC_func_803863F0(SFX_3F2_UNKNOWN, randf2(1.0f, 1.1f), 22000, this->position, 1500.0f, 2000.0f); } else{ animctrl_setDuration(this->animctrl, 2.0f); @@ -312,7 +312,7 @@ void func_80386FDC(Actor *this){ this->position_y += this->velocity_y; this->velocity_y += -5.0f; if(actor_animationIsAt(this, 0.63f)){ - func_803863F0(SFX_80_YUMYUM_CLACK, 1.0f, 20000, this->position, 1500.0f, 2000.0f); + TTC_func_803863F0(SFX_80_YUMYUM_CLACK, 1.0f, 20000, this->position, 1500.0f, 2000.0f); } if(this->position_y <= sp48){ @@ -339,7 +339,7 @@ void func_80386FDC(Actor *this){ } if(actor_animationIsAt(this, 0.8f) && 2.0f == this->velocity_x){ - func_803863F0(SFX_4B_GULPING, randf2(0.8f, 0.9f), 22000, this->position, 700.0f, 2000.0f); + TTC_func_803863F0(SFX_4B_GULPING, randf2(0.8f, 0.9f), 22000, this->position, 700.0f, 2000.0f); break; }//L803873C4 @@ -347,15 +347,15 @@ void func_80386FDC(Actor *this){ if(!this->marker->unk14_21) break; - func_803863F0(SFX_4C_LIP_SMACK, 1.0f, 20000, this->position, 500.0f, 2000.0f); + TTC_func_803863F0(SFX_4C_LIP_SMACK, 1.0f, 20000, this->position, 500.0f, 2000.0f); func_8034A174(this->marker->unk44, 5, sp38); switch(this->unk38_31){ case 0x60: - func_80386D68(sp38, ASSET_718_SPRITE_SPARKLE_WHITE_2, 8); + TTC_func_80386D68(sp38, ASSET_718_SPRITE_SPARKLE_WHITE_2, 8); break; case 0xb5: - func_80386D68(sp38, ASSET_715_SPRITE_SPARKLE_RED, 8); + TTC_func_80386D68(sp38, ASSET_715_SPRITE_SPARKLE_RED, 8); break; } break; diff --git a/src/TTC/code_10A0.c b/src/TTC/code_10A0.c index 1021e222..d3cbbfca 100644 --- a/src/TTC/code_10A0.c +++ b/src/TTC/code_10A0.c @@ -16,7 +16,7 @@ typedef struct { }ActorLocal_Blubber; void func_803878CC(Actor *this); -void func_80387CF4(Actor *this); +void TTC_func_80387CF4(Actor *this); Actor *func_80387D6C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); /* .data */ @@ -29,10 +29,10 @@ ActorAnimationInfo D_8038C4E0[] = { {0xB8, 0.8f} }; -ActorInfo D_8038C510 = { +ActorInfo TTC_D_8038C510 = { MARKER_A3_BLUBBER, ACTOR_115_BLUBBER, ASSET_370_MODEL_BLUBBER, 0x1, D_8038C4E0, - func_803878CC, func_80387CF4, func_80387D6C, + func_803878CC, TTC_func_80387CF4, func_80387D6C, 0, 0x399, 1.8f, 0 }; @@ -237,7 +237,7 @@ void func_803878CC(Actor * this){ } } -void func_80387CF4(Actor *this){ +void TTC_func_80387CF4(Actor *this){ func_80343DEC(this); if(0.99 <= this->unk48){ func_8028F918(0); diff --git a/src/TTC/code_19D0.c b/src/TTC/code_19D0.c index 477c0486..195cbd63 100644 --- a/src/TTC/code_19D0.c +++ b/src/TTC/code_19D0.c @@ -65,7 +65,7 @@ Actor *func_80387EB0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { return func_80325888(marker, gfx, mtx, vtx); } -void func_80387F18(Actor *this) { +void TTC_func_80387F18(Actor *this) { func_80328AEC(this, 3); this->unk1C[0] = 0.0f; switch((s32)this->unk60){ @@ -83,15 +83,15 @@ void func_80387F18(Actor *this) { } } -void func_80387FB0(ActorMarker *caller, enum asset_e text_id, s32 arg2){ +void TTC_func_80387FB0(ActorMarker *caller, enum asset_e text_id, s32 arg2){ Actor *this; this = marker_getActor(caller); - func_80387F18(this); + TTC_func_80387F18(this); func_802BAE4C(); comusic_8025AB44(COMUSIC_12_TTC_NIPPER, -1, 300); } -void func_80387FF4(Actor *this) { +void TTC_func_80387FF4(Actor *this) { s32 i; func_80328B8C(this, 4, 0.01f, 1); @@ -140,12 +140,12 @@ void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) { } if (this->unk60 == 80.0f) { - func_80387FF4(this); + TTC_func_80387FF4(this); this->unk60 = 40.0f; return; } - func_80387FF4(this); + TTC_func_80387FF4(this); this->unk60 = 80.0f; func_80311480(0xA10, 4, NULL, NULL, NULL, NULL); return; @@ -234,14 +234,14 @@ void func_80388434(Actor *this){ && temp_v0 != 10 ){ func_80328B8C(this, 5, 0.01f, 1); - if(func_80311480(0xa0e, 0xf, this->position, this->marker, func_80387FB0, NULL)){ + if(func_80311480(0xa0e, 0xf, this->position, this->marker, TTC_func_80387FB0, NULL)){ this->unk138_24 = TRUE; } comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300); set_camera_to_node(11); } else{//L803886B0 - func_80387F18(this); + TTC_func_80387F18(this); } break; } @@ -263,7 +263,7 @@ void func_80388434(Actor *this){ } if(this->unk60 <= this->unk38_31){ - func_80387F18(this); + TTC_func_80387F18(this); break; } this->unk38_31++; @@ -300,7 +300,7 @@ void func_80388434(Actor *this){ case 4:// L80388910 if(actor_animationIsAt(this, 0.99f)){ - func_80387F18(this); + TTC_func_80387F18(this); } break; diff --git a/src/TTC/code_26D0.c b/src/TTC/code_26D0.c index 0c93ffb9..4bec2470 100644 --- a/src/TTC/code_26D0.c +++ b/src/TTC/code_26D0.c @@ -5,7 +5,7 @@ #include "SnS.h" extern ActorInfo D_8038C3D0; -extern ActorInfo D_8038C510; +extern ActorInfo TTC_D_8038C510; extern ActorInfo D_8038C580; extern ActorInfo D_8038C5E0; extern ActorInfo D_8038C604; @@ -24,7 +24,7 @@ extern ActorInfo D_8038C8D4; extern ActorInfo D_8038C8F8; extern ActorInfo gChTreasureInfo; -void func_80388C78(Actor *this); +void TTC_func_80388C78(Actor *this); void func_80388CB8(Actor *this); void func_80388D34(Actor *this); void func_802D3D54(Actor *this); @@ -62,21 +62,21 @@ ActorInfo D_8038C64C = { ActorInfo D_8038C670 = { 0x26A, 0x2DF, 0x3BE, 0x1, NULL, - func_80388C78, func_80326224, func_80325E78, + TTC_func_80388C78, func_80326224, func_80325E78, 0, 0, 0.0f, 0 }; ActorInfo D_8038C694 = { 0x268, 0x2E0, 0x3B6, 0x1, NULL, - func_80388C78, func_80326224, func_80325E78, + TTC_func_80388C78, func_80326224, func_80325E78, 0, 0, 0.0f, 0 }; ActorInfo D_8038C6B8 = { 0x269, 0x2E1, 0x3B7, 0x1, NULL, - func_80388C78, func_80326224, func_80325E78, + TTC_func_80388C78, func_80326224, func_80325E78, 0, 0, 0.0f, 0 }; @@ -88,12 +88,12 @@ ActorInfo D_8038C6DC = { }; /* .code */ -void func_80388AC0(void) +void TTC_func_80388AC0(void) { spawnableActorList_add(&D_8038C5E0, actor_new, 0); spawnableActorList_add(&D_8038C604, actor_new, 0); spawnableActorList_add(&D_8038C580, actor_new, 0X4100168); - spawnableActorList_add(&D_8038C510, actor_new, 0X4000101); + spawnableActorList_add(&TTC_D_8038C510, actor_new, 0X4000101); spawnableActorList_add(&D_8038C718, actor_new, 0X188); spawnableActorList_add(&D_8038C790, actor_new, 0X148); spawnableActorList_add(&D_8038C7B4, actor_new, 0X148); @@ -111,7 +111,7 @@ void func_80388AC0(void) spawnableActorList_add(&D_8038C3D0, actor_new, 0X2000041); } -void func_80388C78(Actor *this){ +void TTC_func_80388C78(Actor *this){ if(!this->initialized){ func_802D3D74(this); this->initialized = TRUE; @@ -133,7 +133,7 @@ void func_80388D04(s32 arg0){ } void func_80388D34(Actor *this){ - func_80388C78(this); + TTC_func_80388C78(this); if(!this->unk16C_4){ __spawnqueue_add_1((GenMethod_1)func_80388D04, (s32)this->marker); this->unk16C_4 = TRUE; diff --git a/src/TTC/code_2B80.c b/src/TTC/code_2B80.c index a4967d5b..ccf3782a 100644 --- a/src/TTC/code_2B80.c +++ b/src/TTC/code_2B80.c @@ -23,13 +23,13 @@ ActorInfo D_8038C718 = { }; /* .code */ -bool func_80388F70(Actor *this){ +bool TTC_func_80388F70(Actor *this){ return this->modelCacheIndex == 0x56; } void func_80388F88(void){ static f32 D_8038C73C[3] = {2500.0f, 250.0f, 4600.0f}; - func_803272D0(D_8038C73C, 2000.0f, 2, func_80388F70); + func_803272D0(D_8038C73C, 2000.0f, 2, TTC_func_80388F70); } void func_80388FBC(Actor *this) { diff --git a/src/TTC/code_35D0.c b/src/TTC/code_35D0.c index 6dcaf261..d4b2f1fb 100644 --- a/src/TTC/code_35D0.c +++ b/src/TTC/code_35D0.c @@ -9,7 +9,7 @@ typedef struct { s32 unk0; }ActorLocal_TreasureHunt; -void func_80389E90(Actor *this); +void TTC_func_80389E90(Actor *this); Actor *func_8038A0D0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); extern u32 D_8037DCB4; @@ -38,21 +38,21 @@ s32 D_8038C898[6] = { ActorInfo D_8038C8B0 = { MARKER_62_RED_ARROW, ACTOR_53_RED_ARROW, ASSET_3E9_MODEL_RED_ARROW, 0, NULL, - func_80389E90, func_80326224, func_8038A0D0, + TTC_func_80389E90, func_80326224, func_8038A0D0, 0, 0x400, 0.0f, 0 }; ActorInfo D_8038C8D4 = { MARKER_63_RED_QUESTION_MARK, ACTOR_54_RED_QUESTION_MARK, ASSET_3EB_MODEL_RED_QUESTION_MARK, 0, NULL, - func_80389E90, func_80326224, func_8038A0D0, + TTC_func_80389E90, func_80326224, func_8038A0D0, 0, 0x400, 0.0f, 0 }; ActorInfo D_8038C8F8 = { MARKER_64_RED_X, ACTOR_55_RED_X, ASSET_3EA_MODEL_RED_X, 0, NULL, - func_80389E90, func_80326224, func_8038A0D0, + TTC_func_80389E90, func_80326224, func_8038A0D0, 0, 0x400, 0.0f, 0 }; @@ -71,7 +71,7 @@ struct42s D_8038C950 = { }; /* .code */ -bool func_803899C0(void) { +bool TTC_func_803899C0(void) { enum comusic_e phi_a0; s32 phi_a1; @@ -114,7 +114,7 @@ void func_80389A9C(void) { } void func_80389B38(s32 arg0){ - if(D_8037DCB4 == arg0 && func_803899C0()){ + if(D_8037DCB4 == arg0 && TTC_func_803899C0()){ if(arg0 == 0 && !jiggyscore_isCollected(JIGGY_11_TTC_RED_X)){ func_80311480(0xA18, 4, NULL, NULL, NULL, NULL); } @@ -128,7 +128,7 @@ void func_80389B38(s32 arg0){ } } -void func_80389BFC(ActorMarker *this, ActorMarker *arg1){\ +void TTC_func_80389BFC(ActorMarker *this, ActorMarker *arg1){\ func_80389B38(0); } @@ -152,7 +152,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){ static ParticleEmitter *D_8038D700; static f32 D_8038D708[3]; - if(D_8037DCB4 == 5 && func_803899C0()){ + if(D_8037DCB4 == 5 && TTC_func_803899C0()){ D_8038D708[0] = (f32)arg0[0]; D_8038D708[1] = (f32)arg0[1]; D_8038D708[2] = (f32)arg0[2]; @@ -179,7 +179,7 @@ void func_80389E84(void){ D_8037DCB4 = 0; } -void func_80389E90(Actor *this){ +void TTC_func_80389E90(Actor *this){ f32 tick = time_getDelta(); ActorLocal_TreasureHunt *local = (ActorLocal_TreasureHunt*)&this->local; f64 tmp_f12; diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index 0a82111c..39ec2bcc 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -168,7 +168,7 @@ void func_8038A37C(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) { } } -void func_8038A5D8(Struct_TTC_3E30_1 *arg0, s32 arg1) { +void TTC_func_8038A5D8(Struct_TTC_3E30_1 *arg0, s32 arg1) { s32 temp_v0; temp_v0 = arg0->unk3; @@ -301,9 +301,9 @@ void func_8038AC48(Struct_TTC_3E30_1 *arg0) { } else { if (i_ptr->unk4 & 0xFFE) { func_8038A258(2); - func_8038A5D8(arg0, 5); + TTC_func_8038A5D8(arg0, 5); } else { - func_8038A5D8(arg0, 3); + TTC_func_8038A5D8(arg0, 3); } if (i_ptr->unk0[i_ptr->unk6] == 0) { func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000); @@ -355,7 +355,7 @@ void func_8038AC48(Struct_TTC_3E30_1 *arg0) { } } if ((func_8038BF68() == 0) && (phi_s7 == 0) && (D_8038D720.unk8 == 0)) { - func_8038A5D8(arg0, 1); + TTC_func_8038A5D8(arg0, 1); } } @@ -612,7 +612,7 @@ u32 func_8038B600(void) { return var_a3; } -void func_8038B6D4(s32 arg0, s32 arg1, s32 arg2, enum bkprog_e prog_id, s32 prog_val, s32 prog_bit_size, enum bkprog_e arg6){ +void TTC_func_8038B6D4(s32 arg0, s32 arg1, s32 arg2, enum bkprog_e prog_id, s32 prog_val, s32 prog_bit_size, enum bkprog_e arg6){ if( ((arg2 + 20 == D_8038CAD8[arg1].unk5) && func_803203FC(arg2)) || arg0 == 3 ){ @@ -660,13 +660,13 @@ void func_8038B800(s32 arg0) { func_803204E4(0x65, 1); func_803204E4(sp38, 1); } - func_8038B6D4(0, arg0, 0x6C, 0x60, 5, 3, 0x33); - func_8038B6D4(0, arg0, 0x6D, 0x63, 7, 3, 0x34); - func_8038B6D4(0, arg0, 0x6E, 0x66, 8, 4, 0x35); - func_8038B6D4(0, arg0, 0x6F, 0x6A, 9, 4, 0x36); - func_8038B6D4(0, arg0, 0x70, 0x6E, 0xA, 4, 0x37); - func_8038B6D4(0, arg0, 0x71, 0x72, 0xC, 4, 0x38); - func_8038B6D4(0, arg0, 0x72, 0x76, 0xF, 4, 0x39); + TTC_func_8038B6D4(0, arg0, 0x6C, 0x60, 5, 3, 0x33); + TTC_func_8038B6D4(0, arg0, 0x6D, 0x63, 7, 3, 0x34); + TTC_func_8038B6D4(0, arg0, 0x6E, 0x66, 8, 4, 0x35); + TTC_func_8038B6D4(0, arg0, 0x6F, 0x6A, 9, 4, 0x36); + TTC_func_8038B6D4(0, arg0, 0x70, 0x6E, 0xA, 4, 0x37); + TTC_func_8038B6D4(0, arg0, 0x71, 0x72, 0xC, 4, 0x38); + TTC_func_8038B6D4(0, arg0, 0x72, 0x76, 0xF, 4, 0x39); func_8038B79C(0, arg0, 0x94, ITEM_15_HEALTH_TOTAL, 0, 8); func_8038B79C(0, arg0, 0x77, ITEM_14_HEALTH, 0, item_getCount(ITEM_15_HEALTH_TOTAL)); func_8038B79C(0, arg0, 0x95, ITEM_1C_MUMBO_TOKEN, 0, 99); @@ -690,7 +690,7 @@ void func_8038BB10(ActorMarker *caller, enum asset_e text_id, s32 arg2) { func_8038B5B4(); } -void func_8038BBA0(s32 arg0) { +void TTC_func_8038BBA0(s32 arg0) { s32 i; if ((s32) D_8038CAD8[arg0].unk5 >= 0x14) { @@ -775,7 +775,7 @@ bool func_8038BD10(Struct_TTC_3E30_1 *arg0) { func_8038AB44(); if ((D_8038CAD8 + var_s1)->unk0[(D_8038CAD8 + var_s1)->unk4] == '\0') { if ((D_8038CAD8 + var_s1)->unk5 != 0) { - func_8038BBA0(var_s1); + TTC_func_8038BBA0(var_s1); } return 1; } diff --git a/src/core1/code_0.c b/src/core1/code_0.c index 10555291..c0079ce3 100644 --- a/src/core1/code_0.c +++ b/src/core1/code_0.c @@ -22,12 +22,12 @@ s32 D_8027BEE8; s32 D_8027BEEC; u64 D_8027BEF0; -extern u8 D_80286F90; +extern u8 core2_TEXT_START[]; extern u16 D_803A5D00[2][0x1ECC0/2]; void func_8023DA20(s32 arg0){ - bzero(&D_8027A130, &D_80286F90 - (u8*)&D_8027A130); + bzero(&D_8027A130, core2_TEXT_START - (u8*)&D_8027A130); osWriteBackDCacheAll(); sns_find_and_parse_payload(); osInitialize(); diff --git a/src/core1/code_10A00.c b/src/core1/code_10A00.c index af186bc3..57c0e81d 100644 --- a/src/core1/code_10A00.c +++ b/src/core1/code_10A00.c @@ -7,7 +7,7 @@ #define CORE2_DATA_CRC2 0 #endif -extern s32 D_803727F4; +extern s32 core1_D_803727F4 = CORE2_DATA_CRC2; extern struct { u8 pad0[4]; @@ -74,7 +74,7 @@ f32 func_8024E420(s32 arg0, s32 arg1, s32 arg2) { f32 phi_f2; phi_f2 = 0.0125f; - if ((D_80379B90.unk4 != D_803727F4) || (D_80379B90.unkC != D_80276574)) { + if ((D_80379B90.unk4 != core1_D_803727F4) || (D_80379B90.unkC != D_80276574)) { phi_f2 = 0.00625f; } if (arg0 > 0) { diff --git a/src/core1/code_18350.c b/src/core1/code_18350.c index 1c66dc1c..a8f2650a 100644 --- a/src/core1/code_18350.c +++ b/src/core1/code_18350.c @@ -707,7 +707,7 @@ f32 func_80257AD4(f32 val1, f32 val2) return sinf((func_802588B0(val1, val2) / val2) * (2*BAD_PI)); } -f32 ml_f_map(f32 a, f32 b, f32 c, f32 d, f32 e) +f32 ml_map_f(f32 a, f32 b, f32 c, f32 d, f32 e) { f32 val; @@ -756,9 +756,9 @@ f32 func_80257C48(f32 arg0, f32 arg1, f32 arg2) f32 func_80257C60(f32 a, f32 b, f32 c, f32 d, f32 e, f32 (*func)(f32)) { - f32 val = func(ml_f_map(a, b, c, 0.f, 1.f)); + f32 val = func(ml_map_f(a, b, c, 0.f, 1.f)); - return ml_f_map(val, 0, 1, d, e); + return ml_map_f(val, 0, 1, d, e); } f32 func_80257CC0(f32 a, f32 b, f32 c, f32 d, f32 e) @@ -774,9 +774,9 @@ f32 func_80257CF8(f32 a, f32 b, f32 c, f32 d, f32 e) f32 func_80257D30(f32 a, f32 b, f32 c, f32 d, f32 e) { if (a < 0) - return ml_f_map(a, -b, -c, -d, -e); + return ml_map_f(a, -b, -c, -d, -e); else - return ml_f_map(a, b, c, d, e); + return ml_map_f(a, b, c, d, e); } void func_80257DB0(f32 arg0[3], f32 arg1[3], f32 arg2[3]) diff --git a/src/core1/code_1D00.c b/src/core1/code_1D00.c index 15de80a2..a1fd8ec5 100644 --- a/src/core1/code_1D00.c +++ b/src/core1/code_1D00.c @@ -373,7 +373,7 @@ bool amgr_handleFrameMsg(AudioInfo *info, AudioInfo *prev_info){ func_802403F0(); func_8023FFAC(); if(prev_info){ - sp30 = osAiSetNextBuf(prev_info->data, prev_info->frameSamples*4); + sp30 = osAiSetNextBuffer(prev_info->data, prev_info->frameSamples*4); }//L8024003C if(sp30 == -1){ func_80247F24(2, 0x7d2); diff --git a/src/core1/code_8C50.c b/src/core1/code_8C50.c index 0bfe03bb..82e39b62 100644 --- a/src/core1/code_8C50.c +++ b/src/core1/code_8C50.c @@ -81,7 +81,7 @@ volatile s32 D_8028062C; Struct_Core1_8C50_s * D_80280630[20]; volatile s32 D_80280680; volatile s32 D_80280684; -s32 D_80280688; +void* D_80280688; OSTimer D_80280690; //audio_timer OSTimer D_802806B0; //controller_timer s32 D_802806D0; @@ -216,7 +216,7 @@ void func_80246B94(void){ void func_80246C2C(void){ if((D_8027FC14 << 1) < 0){ osDpSetStatus(DPC_SET_FREEZE); - D_80280688 = osViGetCurrFrameBuffer(); + D_80280688 = osViGetCurrentFramebuffer(); func_8024BFAC(); } D_8027FC14 = D_8027FC18 = 2; @@ -239,7 +239,7 @@ void func_80246D78(void){ volatile s32 sp30; sp30 = FALSE; - if( osViGetCurrFrameBuffer() != D_80280688 || sp2C){ + if( osViGetCurrentFramebuffer() != D_80280688 || sp2C){ if(osDpGetStatus() & DPC_STATUS_FREEZE){ osDpSetStatus(DPC_CLR_FREEZE); diff --git a/src/core1/code_E360.c b/src/core1/code_E360.c index 84a9e47c..2f593603 100644 --- a/src/core1/code_E360.c +++ b/src/core1/code_E360.c @@ -122,7 +122,7 @@ void func_8024BFD8(s32 arg0){ osViSwapBuffer(D_803A5D00[D_80280720 = func_8024BD80()]); D_80280E90 = 0; - while(!(osDpGetStatus() & 2) && osViGetCurrFrameBuffer() != osViGetNextFrameBuffer()){ + while(!(osDpGetStatus() & 2) && osViGetCurrentFramebuffer() != osViGetNextFramebuffer()){ osRecvMesg(&D_802807D0, NULL, OS_MESG_BLOCK); D_80280E90++; }//L8024C178 diff --git a/src/core1/done/audio/drvrNew.c b/src/core1/done/audio/drvrNew.c index 760e8922..895ae9e9 100644 --- a/src/core1/done/audio/drvrNew.c +++ b/src/core1/done/audio/drvrNew.c @@ -67,7 +67,7 @@ static s32 NULL_PARAMS[10] = { 0, 0, 0, 0, 0, 0, 0, 0 }; -void init_lpfilter(ALLowPass *lp) +void _init_lpfilter(ALLowPass *lp) { s32 i, temp; s16 fc; @@ -168,7 +168,7 @@ void alFxNew(ALFx *r, ALSynConfig *c, ALHeap *hp) d->lp = alHeapAlloc(hp, 1, sizeof(ALLowPass)); d->lp->fstate = alHeapAlloc(hp, 1, sizeof(POLEF_STATE)); d->lp->fc = param[j++]; - init_lpfilter(d->lp); + _init_lpfilter(d->lp); } else { d->lp = 0; j++; diff --git a/src/core1/done/audio/n_csplayer.c b/src/core1/done/audio/n_csplayer.c index 26495a88..0b004d99 100644 --- a/src/core1/done/audio/n_csplayer.c +++ b/src/core1/done/audio/n_csplayer.c @@ -56,7 +56,7 @@ void n_alCSPNew(N_ALCSPlayer *seqp, ALSeqpConfig *c) */ seqp->maxChannels = c->maxChannels; seqp->chanState = alHeapAlloc(hp, c->maxChannels, sizeof(ALChanState) ); - __initChanState((ALSeqPlayer*)seqp); /* sct 11/6/95 */ + __n_initChanState((ALSeqPlayer*)seqp); /* sct 11/6/95 */ /* * init the voice state array @@ -120,8 +120,8 @@ static ALMicroTime __n_CSPVoiceHandler(void *node) n_alSynFreeVoice(voice); vs = (ALVoiceState *)voice->clientPrivate; if(vs->flags) - __seqpStopOsc((ALSeqPlayer*)seqp,vs); - __unmapVoice((ALSeqPlayer*)seqp, voice); + __n_seqpStopOsc((ALSeqPlayer*)seqp,vs); + __n_unmapVoice((ALSeqPlayer*)seqp, voice); break; case (AL_SEQP_ENV_EVT): @@ -134,7 +134,7 @@ static ALMicroTime __n_CSPVoiceHandler(void *node) delta = seqp->nextEvent.msg.vol.delta; vs->envEndTime = seqp->curTime + delta; vs->envGain = seqp->nextEvent.msg.vol.vol; - n_alSynSetVol(voice, __vsVol(vs, (ALSeqPlayer*)seqp), delta); + n_alSynSetVol(voice, __n_vsVol(vs, (ALSeqPlayer*)seqp), delta); break; case (AL_TREM_OSC_EVT): @@ -142,8 +142,8 @@ static ALMicroTime __n_CSPVoiceHandler(void *node) oscState = seqp->nextEvent.msg.osc.oscState; delta = (*seqp->updateOsc)(oscState,&oscValue); vs->tremelo = (u8)oscValue; - n_alSynSetVol(&vs->voice, __vsVol(vs,(ALSeqPlayer*)seqp), - __vsDelta(vs,seqp->curTime)); + n_alSynSetVol(&vs->voice, __n_vsVol(vs,(ALSeqPlayer*)seqp), + __n_vsDelta(vs,seqp->curTime)); evt.type = AL_TREM_OSC_EVT; evt.msg.osc.vs = vs; evt.msg.osc.oscState = oscState; @@ -179,8 +179,8 @@ static ALMicroTime __n_CSPVoiceHandler(void *node) for (vs = seqp->vAllocHead; vs != 0; vs = vs->next) { n_alSynSetVol(&vs->voice, - __vsVol(vs, (ALSeqPlayer*)seqp), - __vsDelta(vs, seqp->curTime)); + __n_vsVol(vs, (ALSeqPlayer*)seqp), + __n_vsDelta(vs, seqp->curTime)); } break; @@ -204,8 +204,8 @@ static ALMicroTime __n_CSPVoiceHandler(void *node) n_alSynStopVoice(&vs->voice); n_alSynFreeVoice(&vs->voice); if(vs->flags) - __seqpStopOsc((ALSeqPlayer*)seqp,vs); - __unmapVoice((ALSeqPlayer*)seqp, &vs->voice); + __n_seqpStopOsc((ALSeqPlayer*)seqp,vs); + __n_unmapVoice((ALSeqPlayer*)seqp, &vs->voice); } seqp->state = AL_STOPPED; @@ -243,8 +243,8 @@ static ALMicroTime __n_CSPVoiceHandler(void *node) occurring prior to KILL_TIME. */ for (vs = seqp->vAllocHead; vs != 0; vs = vs->next) { - if (__voiceNeedsNoteKill ((ALSeqPlayer*)seqp, &vs->voice, KILL_TIME)) - __seqpReleaseVoice((ALSeqPlayer*)seqp, &vs->voice, KILL_TIME); + if (__n_voiceNeedsNoteKill ((ALSeqPlayer*)seqp, &vs->voice, KILL_TIME)) + __n_seqpReleaseVoice((ALSeqPlayer*)seqp, &vs->voice, KILL_TIME); } seqp->state = AL_STOPPING; @@ -265,7 +265,7 @@ static ALMicroTime __n_CSPVoiceHandler(void *node) seqp->target = seqp->nextEvent.msg.spseq.seq; seqp->chanMask = 0xFFFF; if (seqp->bank) - __initFromBank((ALSeqPlayer *)seqp, seqp->bank); + __n_initFromBank((ALSeqPlayer *)seqp, seqp->bank); break; case (AL_SEQP_BANK_EVT): @@ -273,7 +273,7 @@ static ALMicroTime __n_CSPVoiceHandler(void *node) ((seqp->state == AL_STOPPED)?((void)0):func_8033F000("seqp->state == AL_STOPPED","n_csplayer.c", 283)); seqp->bank = seqp->nextEvent.msg.spbank.bank; - __initFromBank((ALSeqPlayer *)seqp, seqp->bank); + __n_initFromBank((ALSeqPlayer *)seqp, seqp->bank); break; /* sct 11/6/95 - these events should now be handled by __n_CSPHandleNextSeqEvent */ @@ -402,7 +402,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) vstate = seqp->vAllocHead; while(vs){ if(vstate->channel == byte2){ - __seqpReleaseVoice(seqp, &vstate->voice.node.next, vstate->sound->envelope->releaseTime); + __n_seqpReleaseVoice(seqp, &vstate->voice.node.next, vstate->sound->envelope->releaseTime); } vs = vs->next; } @@ -435,7 +435,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) if (seqp->state != AL_PLAYING) break; - sound = __lookupSoundQuick((ALSeqPlayer*)seqp, key, vel, chan); + sound = __n_lookupSoundQuick((ALSeqPlayer*)seqp, key, vel, chan); ALFlagFailIf(!sound, seqp->debugFlags & NO_SOUND_ERR_MASK, ERR_ALSEQP_NO_SOUND); @@ -443,7 +443,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) config.fxBus = 0; config.unityPitch = 0; - vstate = __mapVoice((ALSeqPlayer*)seqp, key, vel, chan); + vstate = __n_mapVoice((ALSeqPlayer*)seqp, key, vel, chan); ALFlagFailIf(!vstate, seqp->debugFlags & NO_VOICE_ERR_MASK, ERR_ALSEQP_NO_VOICE ); @@ -521,8 +521,8 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) pitch = vstate->pitch * seqp->chanState[chan].pitchBend * vstate->vibrato; fxmix = seqp->chanState[chan].fxmix; - pan = __vsPan(vstate, (ALSeqPlayer*)seqp); - vol = __vsVol(vstate, (ALSeqPlayer*)seqp); + pan = __n_vsPan(vstate, (ALSeqPlayer*)seqp); + vol = __n_vsVol(vstate, (ALSeqPlayer*)seqp); deltaTime = sound->envelope->attackTime; n_alSynStartVoiceParams(voice, sound->wavetable, @@ -562,7 +562,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) */ case (AL_MIDI_NoteOff): - vstate = __lookupVoice((ALSeqPlayer*)seqp, key, chan); + vstate = __n_lookupVoice((ALSeqPlayer*)seqp, key, chan); ALFlagFailIf(!vstate, seqp->debugFlags & NOTE_OFF_ERR_MASK, ERR_ALSEQP_OFF_VOICE ); @@ -571,7 +571,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) else { vstate->phase = AL_PHASE_RELEASE; - __seqpReleaseVoice((ALSeqPlayer*)seqp, &vstate->voice, + __n_seqpReleaseVoice((ALSeqPlayer*)seqp, &vstate->voice, vstate->sound->envelope->releaseTime); } @@ -583,13 +583,13 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) * aftertouch affects only notes that are already * sounding. */ - vstate = __lookupVoice((ALSeqPlayer*)seqp, key, chan); + vstate = __n_lookupVoice((ALSeqPlayer*)seqp, key, chan); ALFailIf(!vstate, ERR_ALSEQP_POLY_VOICE ); vstate->velocity = byte2; n_alSynSetVol(&vstate->voice, - __vsVol(vstate, (ALSeqPlayer*)seqp), - __vsDelta(vstate,seqp->curTime)); + __n_vsVol(vstate, (ALSeqPlayer*)seqp), + __n_vsDelta(vstate,seqp->curTime)); break; case (AL_MIDI_ChannelPressure): @@ -602,8 +602,8 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) if (vs->channel == chan) { vs->velocity = byte1; n_alSynSetVol(&vs->voice, - __vsVol(vs, (ALSeqPlayer*)seqp), - __vsDelta(vs,seqp->curTime)); + __n_vsVol(vs, (ALSeqPlayer*)seqp), + __n_vsDelta(vs,seqp->curTime)); } } break; @@ -617,7 +617,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) { if (vs->channel == chan) { - pan = __vsPan(vs, (ALSeqPlayer*)seqp); + pan = __n_vsPan(vs, (ALSeqPlayer*)seqp); n_alSynSetPan(&vs->voice, pan); } } @@ -629,9 +629,9 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) { if ((vs->channel == chan) && (vs->envPhase != AL_PHASE_RELEASE)) { - vol = __vsVol(vs, (ALSeqPlayer*)seqp); + vol = __n_vsVol(vs, (ALSeqPlayer*)seqp); n_alSynSetVol(&vs->voice, vol, - __vsDelta(vs,seqp->curTime)); + __n_vsDelta(vs,seqp->curTime)); } } break; @@ -641,9 +641,9 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) { if ((vs->channel == chan) && (vs->envPhase != AL_PHASE_RELEASE)) { - vol = __vsVol(vs, (ALSeqPlayer*)seqp); + vol = __n_vsVol(vs, (ALSeqPlayer*)seqp); n_alSynSetVol(&vs->voice, vol, - __vsDelta(vs,seqp->curTime)); + __n_vsDelta(vs,seqp->curTime)); } } break; @@ -676,7 +676,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) else if(vs->phase == AL_PHASE_SUSTREL) { vs->phase = AL_PHASE_RELEASE; - __seqpReleaseVoice((ALSeqPlayer*)seqp, + __n_seqpReleaseVoice((ALSeqPlayer*)seqp, &vs->voice, vs->sound->envelope->releaseTime); } @@ -719,7 +719,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) if (key < seqp->bank->instCount) { ALInstrument *inst = seqp->bank->instArray[key]; - __setInstChanState((ALSeqPlayer*)seqp, inst, chan); /* sct 11/6/95 */ + __n_setInstChanState((ALSeqPlayer*)seqp, inst, chan); /* sct 11/6/95 */ } else { diff --git a/src/core1/done/audio/n_env.c b/src/core1/done/audio/n_env.c index edad4c00..d9497ce0 100644 --- a/src/core1/done/audio/n_env.c +++ b/src/core1/done/audio/n_env.c @@ -218,7 +218,7 @@ Acmd *n_alEnvmixerPull(void *filter, s32 sampleOffset, Acmd *p) * Changing to STOPPED and reset the filter */ ptr = __n_pullSubFrame(e, &inp, &loutp, samples, ptr); - n_alEnvmixerResampleParam(e, 4, 0); + n_alEnvmixerParam(e, 4, 0); } break; @@ -252,7 +252,7 @@ Acmd *n_alEnvmixerPull(void *filter, s32 sampleOffset, Acmd *p) * on down the chain */ ptr = __n_pullSubFrame(e, &inp, &loutp, samples, ptr); - n_alEnvmixerResampleParam(e, e->em_ctrlList->type, e->em_ctrlList->data.i); + n_alEnvmixerParam(e, e->em_ctrlList->type, e->em_ctrlList->data.i); break; } loutp += (samples<<1); diff --git a/src/core1/done/audio/n_envresample.c b/src/core1/done/audio/n_envresample.c index b88f3a41..80530f1e 100644 --- a/src/core1/done/audio/n_envresample.c +++ b/src/core1/done/audio/n_envresample.c @@ -2,7 +2,7 @@ #include "n_synth.h" -s32 +int n_alEnvmixerParam(N_PVoice *filter, s32 paramID, void *param) { N_PVoice *e = filter; diff --git a/src/core1/done/audio/n_synallocvoice.c b/src/core1/done/audio/n_synallocvoice.c index b80d6014..5b3c226f 100644 --- a/src/core1/done/audio/n_synallocvoice.c +++ b/src/core1/done/audio/n_synallocvoice.c @@ -45,7 +45,7 @@ s32 n_alSynAllocVoice( N_ALVoice *voice, ALVoiceConfig *vc) update->type = AL_FILTER_SET_VOLUME; update->data.i = 0; update->moredata.i = pvoice->offset - 64; - n_alEnvmixerResampleParam(voice->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(voice->pvoice, AL_FILTER_ADD_UPDATE, update); /* * stop stolen voice @@ -55,7 +55,7 @@ s32 n_alSynAllocVoice( N_ALVoice *voice, ALVoiceConfig *vc) update->delta = n_syn->paramSamples + pvoice->offset; update->type = AL_FILTER_STOP_VOICE; update->next = 0; - n_alEnvmixerResampleParam(voice->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(voice->pvoice, AL_FILTER_ADD_UPDATE, update); } else { #ifdef _DEBUG __osError(ERR_ALSYN_NO_UPDATE, 0); diff --git a/src/core1/done/audio/n_synfreevoice.c b/src/core1/done/audio/n_synfreevoice.c index 8352cd60..11d99790 100644 --- a/src/core1/done/audio/n_synfreevoice.c +++ b/src/core1/done/audio/n_synfreevoice.c @@ -19,7 +19,7 @@ void n_alSynFreeVoice(N_ALVoice *voice) update->type = AL_FILTER_FREE_VOICE; update->pvoice = (PVoice *)voice->pvoice; - n_alEnvmixerResampleParam(voice->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(voice->pvoice, AL_FILTER_ADD_UPDATE, update); } else { _n_freePVoice(voice->pvoice); } diff --git a/src/core1/done/audio/n_synsetfxmix.c b/src/core1/done/audio/n_synsetfxmix.c index 7f4fb024..16ef5e15 100644 --- a/src/core1/done/audio/n_synsetfxmix.c +++ b/src/core1/done/audio/n_synsetfxmix.c @@ -24,6 +24,6 @@ void n_alSynSetFXMix(N_ALVoice *v, u8 fxmix) update->data.i = fxmix; update->next = 0; - n_alEnvmixerResampleParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); } } diff --git a/src/core1/done/audio/n_synsetpan.c b/src/core1/done/audio/n_synsetpan.c index 0eb251d3..00c9d038 100644 --- a/src/core1/done/audio/n_synsetpan.c +++ b/src/core1/done/audio/n_synsetpan.c @@ -22,6 +22,6 @@ void n_alSynSetPan(N_ALVoice *v, u8 pan) update->data.i = pan; update->next = 0; - n_alEnvmixerResampleParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); } } diff --git a/src/core1/done/audio/n_synsetpitch.c b/src/core1/done/audio/n_synsetpitch.c index ce54e25e..82e25929 100644 --- a/src/core1/done/audio/n_synsetpitch.c +++ b/src/core1/done/audio/n_synsetpitch.c @@ -22,6 +22,6 @@ void n_alSynSetPitch( N_ALVoice *v, f32 pitch) update->data.f = pitch; update->next = 0; - n_alEnvmixerResampleParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); } } diff --git a/src/core1/done/audio/n_synsetvol.c b/src/core1/done/audio/n_synsetvol.c index 941e183f..c3b53970 100644 --- a/src/core1/done/audio/n_synsetvol.c +++ b/src/core1/done/audio/n_synsetvol.c @@ -25,6 +25,6 @@ void n_alSynSetVol( N_ALVoice *v, s16 volume, ALMicroTime t) //f = v->pvoice->channelKnob; //(*f->setParam)(f, AL_FILTER_ADD_UPDATE, update); - n_alEnvmixerResampleParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); } } \ No newline at end of file diff --git a/src/core1/done/audio/n_synstartvoice.c b/src/core1/done/audio/n_synstartvoice.c index 78401da5..a923742c 100644 --- a/src/core1/done/audio/n_synstartvoice.c +++ b/src/core1/done/audio/n_synstartvoice.c @@ -43,7 +43,7 @@ void n_alSynStartVoice( N_ALVoice *v, ALWaveTable *table) update->next = 0; update->unity = v->unityPitch; - n_alEnvmixerResampleParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); } } diff --git a/src/core1/done/audio/n_synstartvoiceparam.c b/src/core1/done/audio/n_synstartvoiceparam.c index 10483fc5..50046e68 100644 --- a/src/core1/done/audio/n_synstartvoiceparam.c +++ b/src/core1/done/audio/n_synstartvoiceparam.c @@ -36,7 +36,7 @@ void n_alSynStartVoiceParams(N_ALVoice *v, ALWaveTable *w, update->samples = _n_timeToSamples( t); update->wave = w; - n_alEnvmixerResampleParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); } } diff --git a/src/core1/done/audio/n_synstopvoice.c b/src/core1/done/audio/n_synstopvoice.c index 19e3bf60..96415ee0 100644 --- a/src/core1/done/audio/n_synstopvoice.c +++ b/src/core1/done/audio/n_synstopvoice.c @@ -15,6 +15,6 @@ void n_alSynStopVoice( N_ALVoice *v) update->type = AL_FILTER_STOP_VOICE; update->next = 0; - n_alEnvmixerResampleParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); + n_alEnvmixerParam(v->pvoice, AL_FILTER_ADD_UPDATE, update); } } diff --git a/src/core1/done/audio/n_synthesizer.c b/src/core1/done/audio/n_synthesizer.c index 5921ae4d..ad8431e8 100644 --- a/src/core1/done/audio/n_synthesizer.c +++ b/src/core1/done/audio/n_synthesizer.c @@ -213,7 +213,7 @@ Acmd *n_alAudioFrame(Acmd *cmdList, s32 *cmdLen, s16 *outBuf, s32 outLen) * Synthesis driver private interfaces ***********************************************************************/ -ALParam *__allocParam() +ALParam *__n_allocParam() { ALParam *update = 0; diff --git a/src/core1/done/audio/reverb.c b/src/core1/done/audio/reverb.c index e89f979a..529e9529 100644 --- a/src/core1/done/audio/reverb.c +++ b/src/core1/done/audio/reverb.c @@ -207,7 +207,7 @@ s32 alFxParamHdl(void *filter, s32 paramID, void *param) if(f->delay[s].lp) { f->delay[s].lp->fc = (s16)val; - init_lpfilter(f->delay[s].lp); + _init_lpfilter(f->delay[s].lp); } break; } diff --git a/src/core2/bs/bEggAss.c b/src/core2/bs/bEggAss.c index 321e57f4..97c9ee38 100644 --- a/src/core2/bs/bEggAss.c +++ b/src/core2/bs/bEggAss.c @@ -30,7 +30,7 @@ void bseggass_update(void) { has_eggs = (item_empty(ITEM_D_EGGS) == 0); if (should_poop_egg()) { if (has_eggs) - D_8037D2E0 = func_80258948(D_8037D2E0 + 1, 3); + D_8037D2E0 = ml_min_w(D_8037D2E0 + 1, 3); else func_80346C10(&sp28, -1, 0, ITEM_D_EGGS, 0); } diff --git a/src/core2/bs/bEggHead.c b/src/core2/bs/bEggHead.c index aaf2c38b..4de5dca7 100644 --- a/src/core2/bs/bEggHead.c +++ b/src/core2/bs/bEggHead.c @@ -33,7 +33,7 @@ void bsegghead_update(void) { has_eggs = (item_empty(ITEM_D_EGGS) == 0); if (should_shoot_egg()) { if (has_eggs) - D_8037D2F0 = func_80258948(D_8037D2F0 + 1, 3); + D_8037D2F0 = ml_min_w(D_8037D2F0 + 1, 3); else func_80346C10(&sp28, -1, 0, ITEM_D_EGGS, 0); } diff --git a/src/core2/code_3BB80.c b/src/core2/code_3BB80.c index 3a7ff47e..e8f891a1 100644 --- a/src/core2/code_3BB80.c +++ b/src/core2/code_3BB80.c @@ -193,15 +193,15 @@ void func_802C2B5C(void){ func_802E1790(); switch(loaded_asm_file){ case OVERLAY_2_WHALE: - cc_func_803870E0(); + CC_func_803870E0(); break; case OVERLAY_4_DESERT: - gv_func_80387118(); + GV_func_80387118(); break; case OVERLAY_5_BEACH: break; case OVERLAY_7_SWAMP: - bgs_func_803885DC(); + BGS_func_803885DC(); break; default: break; @@ -363,37 +363,37 @@ void func_802C2B5C(void){ cutscene_func_8038C4E0(); break; case OVERLAY_B_TRAINING: - sm_func_80386810(); + SM_func_80386810(); break; case OVERLAY_3_HAUNTED: - mmm_func_803890E0(); + MMM_func_803890E0(); break; case OVERLAY_2_WHALE: - cc_func_80387DA0(); + CC_func_80387DA0(); break; case OVERLAY_4_DESERT: - gv_func_8038F154(); + GV_func_8038F154(); break; case OVERLAY_5_BEACH: - ttc_func_80388AC0(); + TTC_func_80388AC0(); break; case OVERLAY_6_JUNGLE: - mm_func_803888B0(); + MM_func_803888B0(); break; case OVERLAY_7_SWAMP: - bgs_func_8038F1E0(); + BGS_func_8038F1E0(); break; case OVERLAY_8_SHIP: - rbb_func_80386C48(); + RBB_func_80386C48(); break; case OVERLAY_9_SNOW: - fp_func_80391324(); + FP_func_80391324(); spawnableActorList_add(&D_80367BC8, actor_new, 0x8); spawnableActorList_add(&D_80367BEC, actor_new, 0x8); spawnableActorList_add(&D_80367C10, actor_new, 0x8); break; case OVERLAY_A_TREE: - ccw_func_8038DB6C(); + CCW_func_8038DB6C(); break; } diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 4f3d74cb..28c100ca 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -377,7 +377,7 @@ void func_802E4214(s32 arg0){ D_8037E8E0.unkC = 0; D_8037E8E0.unk1C = 0; func_8033C070(); - func_8025B0E4(); + sns_save_and_update_global_data(); func_8030D86C(); func_80259A24(); func_80322764(); diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index e4f9e151..8e382843 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -137,7 +137,7 @@ void __overlay_mmm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; } void func_80322930(void){ func_8038953C(); - func_80389CD8(); + MMM_func_80389CD8(); func_8038A994(); } @@ -158,7 +158,7 @@ void func_803229C0(s32 arg0, s32 arg1){ } void __overlay_cc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ - func_80388760(gfx, mtx, vtx); + CC_func_80388760(gfx, mtx, vtx); } void func_80322A00(void){ @@ -172,7 +172,7 @@ void func_80322A28(void){ } void __overlay_cc_update(void){ - func_80388F4C(); + CC_func_80388F4C(); func_8038817C(); } @@ -308,7 +308,7 @@ void func_80322DB0(void){ void func_80322DE8(void){ func_8038A7F0(); - func_8038A9C0(); + FP_func_8038A9C0(); func_8038B7A4(); func_803918C0(); } diff --git a/src/core2/code_AD110.c b/src/core2/code_AD110.c index dbf9789a..d456adf7 100644 --- a/src/core2/code_AD110.c +++ b/src/core2/code_AD110.c @@ -292,7 +292,7 @@ extern void func_8031FB14(s32, s32); extern void func_802C1674(s32, s32); extern void func_802C169C(s32, s32); -extern void func_80389BFC(s32, s32); +extern void core2_func_80389BFC(s32, s32); extern void func_80389C24(s32, s32); extern void func_80389C4C(s32, s32); extern void func_80389C74(s32, s32); @@ -414,7 +414,7 @@ Method_core2_AD110 D_8036FE5C[]; /* ={ func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, - func_8033443C, func_80389BFC, func_80389C24, func_80389C4C, + func_8033443C, core2_func_80389BFC, func_80389C24, func_80389C4C, func_80389C74, func_80389C9C, func_80389CC4, func_802D2B94, func_802D2C24, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, func_8033443C, diff --git a/src/core2/code_C4320.c b/src/core2/code_C4320.c index 0ad6abb2..2e27e8b7 100644 --- a/src/core2/code_C4320.c +++ b/src/core2/code_C4320.c @@ -211,13 +211,13 @@ void func_8034B8C0(enum map_e map_id, s32 demo_id) { func_802E4A70(); } if ((demo_id == 0x5B) || (demo_id == 0x5F)) { - func_8025BC04(); + sns_backup_items_and_unlock_all(); } } void func_8034B940(void){ demo_free(); - func_8025BCEC(); + sns_restore_backed_up_items(); } void func_8034B968(void){ diff --git a/src/core2/code_C4B0.c b/src/core2/code_C4B0.c index c5cd6f6c..9826066e 100644 --- a/src/core2/code_C4B0.c +++ b/src/core2/code_C4B0.c @@ -381,7 +381,7 @@ void func_80293F0C(void){ D_8037C27A = 0; if (D_8037C27C) { - D_8037C280 = func_80258948(D_8037C280 + 1, 3); + D_8037C280 = ml_min_w(D_8037C280 + 1, 3); } else { D_8037C280 = 0; } diff --git a/src/core2/code_CC1E0.c b/src/core2/code_CC1E0.c index 8bff2138..2fc693ec 100644 --- a/src/core2/code_CC1E0.c +++ b/src/core2/code_CC1E0.c @@ -112,7 +112,7 @@ s32 func_803531C8(u8 projectile_indx, s32 arg1){ break; case MARKER_34_CEMETARY_POT: //L80353400 - if(func_802458A8(sp40, other_marker, 0x3C) && func_80387340(other_marker)){ + if(func_802458A8(sp40, other_marker, 0x3C) && MMM_func_80387340(other_marker)){ func_8033E984(); } break; diff --git a/src/core2/code_CF3E0.c b/src/core2/code_CF3E0.c index cff7c543..cb3b8c01 100644 --- a/src/core2/code_CF3E0.c +++ b/src/core2/code_CF3E0.c @@ -78,7 +78,7 @@ void func_80356560(s32 arg0) { //THIS VALUE #ifndef CORE2_CODE_CRC2 - #define CORE2_CODE_CRC2 0 + #define CORE2_CODE_CRC2 0x9E44C2DC #endif // bk_boot segment start (skipping entry function) @@ -88,7 +88,7 @@ extern u8 D_00005E70[]; // bk_boot segment crc next word s32 D_803727F0 = 0; -s32 D_803727F4 = CORE2_CODE_CRC2; +s32 core2_D_803727F4 = CORE2_CODE_CRC2; s32 D_803727F8 = 0; s32 D_803727FC = 0; diff --git a/src/core2/yaw.c b/src/core2/yaw.c index 9e17abe0..9f9a599d 100644 --- a/src/core2/yaw.c +++ b/src/core2/yaw.c @@ -72,7 +72,7 @@ void func_802990B4(void){ func_802991A8(1); } -void func_80299118(void){ +void yaw_update(void){ switch(D_8037C698){ case 0: break; @@ -96,7 +96,7 @@ void yaw_setIdeal(f32 arg0){ D_8037C694 = mlNormalizeAngle(arg0); } -void func_802991D8(f32 arg0){ +void yaw_set(f32 arg0){ D_8037C690 = mlNormalizeAngle(arg0); } diff --git a/src/cutscenes/code_0.c b/src/cutscenes/code_0.c index 2ae39e8b..8506896b 100644 --- a/src/cutscenes/code_0.c +++ b/src/cutscenes/code_0.c @@ -63,7 +63,7 @@ extern struct31s D_8038D8A4; extern struct42s D_8038D8D4; /* .code */ -void func_803863F0(void){ +void cutscenes_func_803863F0(void){ func_8025A2D8(); } @@ -192,7 +192,7 @@ void func_80386990(void){ func_802F9DB8(indx, 0.6f, 0.7f, 0.04f); } -void func_80386A00(void){ +void cutscenes_func_80386A00(void){ s32 indx; indx = func_802F9AA8(SFX_191_STATIC); @@ -381,7 +381,7 @@ void func_80387424(s32 arg0) { particleEmitter_emitN(pCtrl, 8); } -void func_80387560(s32 arg0) { +void cutscenes_func_80387560(s32 arg0) { Actor *sp44; ParticleEmitter *pCtrl; f32 sp34[3]; @@ -457,7 +457,7 @@ void func_803878A4(s32 arg0) { particleEmitter_emitN(pCtrl, 1); } -void func_803879E0(s32 arg0) { +void cutscenes_func_803879E0(s32 arg0) { Actor *sp44; ParticleEmitter *pCtrl; f32 sp34[3]; @@ -639,7 +639,7 @@ void func_8038837C(s32 arg0, s32 arg1) { func_80288F78(arg0, 0.03f, 0x012A8CFAU); } -void func_803883AC(s32 arg0, s32 arg1) { +void cutscenes_func_803883AC(s32 arg0, s32 arg1) { func_80288F78(arg0, 0.0282f, 0x012A8CFAU); func_80288F78(arg0, 0.6107f, 0x207375U); func_80288F78(arg0, 0.6107f, 0xF9534EU); @@ -676,7 +676,7 @@ void func_803884DC(s32 arg0, s32 arg1) { func_80288F78(arg0, 0.2f, 0x017D80FA); } -void func_80388660(s32 arg0, s32 arg1) { +void cutscenes_func_80388660(s32 arg0, s32 arg1) { func_8028913C(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 3, 0); func_8028913C(arg0, 1); @@ -825,14 +825,14 @@ void func_803890CC(s32 arg0, s32 arg1) { func_8028913C(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 1); func_80361D7C(arg0, 0.08f, arg1, 5, 0x6DB375U); - func_80288D40(arg0, 0.08f, func_80387560, arg1); + func_80288D40(arg0, 0.08f, cutscenes_func_80387560, arg1); func_80361D7C(arg0, 0.2f, arg1, 5, 0x6DB375U); - func_80288D40(arg0, 0.2f, func_80387560, arg1); + func_80288D40(arg0, 0.2f, cutscenes_func_80387560, arg1); func_80361D7C(arg0, 0.3f, arg1, 5, 0x6DB375U); - func_80288D40(arg0, 0.3f, func_80387560, arg1); + func_80288D40(arg0, 0.3f, cutscenes_func_80387560, arg1); } -void func_80389204(s32 arg0, s32 arg1) { +void cutscenes_func_80389204(s32 arg0, s32 arg1) { func_8028913C(arg0, 1); func_80361C64(arg0, 0.01f, reinterpret_cast(s32, arg1), 3, 2); func_8028913C(arg0, 1); @@ -905,13 +905,13 @@ void func_803896C8(s32 arg0, s32 arg1) { func_80361C24(arg0, 0.65f, arg1, 7); } -void func_80389850(s32 arg0, s32 arg1) { +void cutscenes_func_80389850(s32 arg0, s32 arg1) { func_80361C64(arg0, 0.36f, arg1, 7, 0); func_80361C64(arg0, 0.618f, arg1, 7, 1); func_80361C64(arg0, 0.696f, arg1, 5, 1); } -void func_803898C8(s32 arg0, s32 arg1) { +void cutscenes_func_803898C8(s32 arg0, s32 arg1) { func_8028913C(arg0, 1); func_80361C64(arg0, 0.03f, reinterpret_cast(s32, arg1), 7, 0); func_8028913C(arg0, 1); @@ -984,7 +984,7 @@ void func_80389DFC(s32 arg0, s32 arg1) { func_80288EB0(arg0, 0.9f, 0, 5.0f, 0.8f); } -void func_80389EA8(s32 arg0, s32 arg1) { +void cutscenes_func_80389EA8(s32 arg0, s32 arg1) { func_8028913C(arg0, 1); func_80361C64(arg0, 0.023f, arg1, 1, 1); func_8028913C(arg0, 2); @@ -1011,7 +1011,7 @@ void func_8038A05C(s32 arg0, s32 arg1) { func_80361C64(arg0, 0.02f, arg1, 1, 0); } -void func_8038A0A0(s32 arg0, s32 arg1) { +void cutscenes_func_8038A0A0(s32 arg0, s32 arg1) { func_80288D08(arg0, 0.01f, func_803864AC); func_80288D08(arg0, 0.0f, func_803865F0); func_80288F78(arg0, 0.8f, 0xB1C075U); @@ -1039,7 +1039,7 @@ void func_8038A254(s32 arg0, s32 arg1) { func_80288F78(arg0, 0.5f, 0x041B809CU); } -void func_8038A2F0(s32 arg0, s32 arg1) { +void cutscenes_func_8038A2F0(s32 arg0, s32 arg1) { func_8028913C(arg0, 1); func_80361C64(arg0, 0.023f, arg1, 1, 0); } @@ -1066,7 +1066,7 @@ void func_8038A334(s32 arg0, s32 arg1) { func_80288F78(arg0, 0.93f, 0x9880C3U); } -void func_8038A54C(s32 arg0, s32 arg1) { +void cutscenes_func_8038A54C(s32 arg0, s32 arg1) { func_80288F78(arg0, 0.23f, 0x013973A4U); func_80288F78(arg0, 0.36f, 0x01398CA4U); func_80288D08(arg0, 0.53f, func_80386668); @@ -1111,7 +1111,7 @@ void func_8038A7E8(s32 arg0, s32 arg1) { func_80288F78(arg0, 0.53f, 0x013980A4U); } -void func_8038A864(s32 arg0, s32 arg1) { +void cutscenes_func_8038A864(s32 arg0, s32 arg1) { func_80361CF4(arg0, 0.001f, arg1, 0.7f); func_8028913C(arg0, 2); func_80288D40(arg0, 0.7f, func_80386578, arg1); @@ -1154,7 +1154,7 @@ void func_8038AAFC(s32 arg0, s32 arg1) { func_80288D08(arg0, 0.4f, func_803867D0); } -void func_8038AB60(s32 arg0, s32 arg1) { +void cutscenes_func_8038AB60(s32 arg0, s32 arg1) { func_80361D7C(arg0, 0.21f, reinterpret_cast(s32, arg1), 5, 0x96804EU); func_80361D7C(arg0, 0.43f, arg1, 5, 0x96864EU); func_80361D7C(arg0, 0.65f, arg1, 5, 0x96884EU); @@ -1330,10 +1330,10 @@ void func_8038B9B4(s32 arg0, s32 arg1) { func_80288EB0(arg0, 0.66f, 0, 20.0f, 0.8f); func_80288D40(arg0, 0.7f, func_803878A4, arg1); func_80288F78(arg0, 0.76f, 0x1F8075U); - func_80288D40(arg0, 0.77f, func_803879E0, arg1); - func_80288D40(arg0, 0.86f, func_803879E0, arg1); + func_80288D40(arg0, 0.77f, cutscenes_func_803879E0, arg1); + func_80288D40(arg0, 0.86f, cutscenes_func_803879E0, arg1); func_80288EB0(arg0, 0.86f, 0, 20.0f, 0.9f); - func_80288D40(arg0, 0.96f, func_803879E0, arg1); + func_80288D40(arg0, 0.96f, cutscenes_func_803879E0, arg1); } @@ -1401,10 +1401,10 @@ void func_8038BF5C(s32 arg0, s32 arg1) { func_80288D40(arg0, 0.85f, func_80387B58, arg1); func_80288D40(arg0, 0.95f, func_80387B58, arg1); func_8028913C(arg0, 0x14); - func_80288D08(arg0, 0.05f, func_80386A00); + func_80288D08(arg0, 0.05f, cutscenes_func_80386A00); } -void func_8038C0DC(s32 arg0, s32 arg1) { +void cutscenes_func_8038C0DC(s32 arg0, s32 arg1) { func_80361C64(arg0, 0.01f, arg1, 4, 1); func_8028913C(arg0, 1); func_80288D08(arg0, 0.02f, func_80386990); @@ -1413,13 +1413,13 @@ void func_8038C0DC(s32 arg0, s32 arg1) { } -void func_8038C16C(s32 arg0, s32 arg1) { +void cutscenes_func_8038C16C(s32 arg0, s32 arg1) { func_80288F78(arg0, 0.2f, 0x17808CU); } void func_8038C19C(s32 arg0, s32 arg1) { func_8028913C(arg0, 1); - func_80288D08(arg0, 0.02f, func_803863F0); + func_80288D08(arg0, 0.02f, cutscenes_func_803863F0); func_8028913C(arg0, 1); func_80288D08(arg0, 0.97f, func_80386410); } @@ -1464,7 +1464,7 @@ void func_8038C404(s32 arg0, s32 arg1) { func_80288D40(arg0, 0.74f, func_80387FC0, arg1); } -void func_8038C454(s32 arg0, s32 arg1) { +void cutscenes_func_8038C454(s32 arg0, s32 arg1) { func_80288D40(arg0, 0.2f, func_803881CC, arg1); func_80288F78(arg0, 0.2f, 0x1E808CU); func_80288D40(arg0, 0.3f, func_803881CC, arg1); diff --git a/src/cutscenes/code_60F0.c b/src/cutscenes/code_60F0.c index 01a9ee60..0d6255b9 100644 --- a/src/cutscenes/code_60F0.c +++ b/src/cutscenes/code_60F0.c @@ -605,7 +605,7 @@ ActorInfo D_8038E6D4 = }; -void func_8038C4E0(void){ +void cutscene_func_8038C4E0(void){ spawnableActorList_add(&D_8038DC90, actor_new, 0X40); spawnableActorList_add(&D_8038DCFC, actor_new, 0X140); spawnableActorList_add(&D_8038DCD8, actor_new, 0X2000); diff --git a/src/cutscenes/code_6730.c b/src/cutscenes/code_6730.c index cc4694dc..b2817be9 100644 --- a/src/cutscenes/code_6730.c +++ b/src/cutscenes/code_6730.c @@ -39,7 +39,7 @@ extern struct41s D_8038E770 ={ }; /* .code */ -void func_8038CB20(ParticleEmitter *pCtrl){ +void cutscenes_func_8038CB20(ParticleEmitter *pCtrl){ particleEmitter_setSprite(pCtrl, ASSET_713_SPRITE_SPARKLE_YELLOW); func_802EFFA8(pCtrl, D_8038E73C); func_802EF9E4(pCtrl, 230); @@ -77,7 +77,7 @@ void func_8038CCA8(Actor *this){ animctrl_setSmoothTransition(this->animctrl, 0); this->unk60 = this->yaw/4; local->unk0 = partEmitList_pushNew(0xA0); - func_8038CB20(local->unk0); + cutscenes_func_8038CB20(local->unk0); } switch(this->state){ diff --git a/src/fight/chbossjinjo.c b/src/fight/chbossjinjo.c index c0d3596c..8b969020 100644 --- a/src/fight/chbossjinjo.c +++ b/src/fight/chbossjinjo.c @@ -71,7 +71,7 @@ struct31s D_80391968 = { }; /* .code */ -void func_8038C2C0(f32 position[3], s32 count, enum asset_e id, f32 arg3){ +void fight_func_8038C2C0(f32 position[3], s32 count, enum asset_e id, f32 arg3){ ParticleEmitter * temp_s0 = partEmitList_pushNew(count); f32 sp24; @@ -110,21 +110,21 @@ void func_8038C424(f32 position[3], s32 count, enum asset_e id, f32 arg3){ particleEmitter_emitN(temp_s0, count); } -void func_8038C588(void){ +void fight_func_8038C588(void){ func_80386654(1.0f, &D_80391958, &D_80391948); } -void func_8038C5BC(void){ +void fight_func_8038C5BC(void){ func_80386654(1.0f, &D_80391948, &D_80391958); } void chbossjinjo_spawnParticles(Actor *this, enum asset_e arg1, enum asset_e arg2, f32 arg3){ f32 sp1C[3]; - func_8038C0DC(&sp1C); - func_8038C2C0(this->position, 0x20, arg1, arg3); + fight_func_8038C0DC(&sp1C); + fight_func_8038C2C0(this->position, 0x20, arg1, arg3); func_8038C424(this->position, 4, arg2, arg3); - timedFunc_set_0(0.0f, func_8038C588); - timedFunc_set_0(0.3f, func_8038C5BC); + timedFunc_set_0(0.0f, fight_func_8038C588); + timedFunc_set_0(0.3f, fight_func_8038C5BC); } void chbossjinjo_spawnAttackParticles(Actor *this){ @@ -156,7 +156,7 @@ void chbossjinjo_spawnAttackParticles(Actor *this){ } -void func_8038C6FC(Actor *this, s16 arg1){ +void fight_func_8038C6FC(Actor *this, s16 arg1){ f32 temp_f2 = this->yaw; f32 tick = time_getDelta(); @@ -250,7 +250,7 @@ void func_8038C840(Actor *this){ }//L8038CB9C if(sp48){ if(animctrl_getAnimTimer(this->animctrl) < 0.2){ - func_8038C6FC(this, sp42); + fight_func_8038C6FC(this, sp42); } if(actor_animationIsAt(this, 0.1f)){ @@ -309,7 +309,7 @@ void func_8038C840(Actor *this){ } break; case 5: // 8038CE68 - func_8038C0DC(&sp50); + fight_func_8038C0DC(&sp50); sp50[1] += 100.0f; func_80387470(this, sp50, 1200.0f, 3840.0f, 200.0f, 2500.0f, 70.0f); func_8038C79C(this); diff --git a/src/fight/chbossjinjobase.c b/src/fight/chbossjinjobase.c index 20062401..5c091bdb 100644 --- a/src/fight/chbossjinjobase.c +++ b/src/fight/chbossjinjobase.c @@ -74,7 +74,7 @@ void func_8038D428(ActorMarker *arg0, ActorMarker *arg1) { } } -void func_8038D510(Actor *arg0) { +void fight_func_8038D510(Actor *arg0) { ActorLocal_fight_6E90 *sp18 = (ActorLocal_fight_6E90 *)&arg0->local; if ((u8)arg0->unk44_31 != 0) { @@ -102,7 +102,7 @@ void func_8038D568(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; marker_setCollisionScripts(this->marker, NULL, func_8038D428, NULL); - func_803300D8(this->marker, func_8038D510); + func_803300D8(this->marker, fight_func_8038D510); this->marker->propPtr->unk8_3 = 1; actor_collisionOn(this); this->unk38_31 = 0; diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index 821b4cfe..fdb4c0ca 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -14,11 +14,10 @@ void chfinalboss_update(Actor *this); void func_802C8F70(f32); s32 func_803297C8(Actor*, f32*); Actor *func_8032813C(); -void func_803900DC(ActorMarker *, f32 *, f32, f32); +void fight_func_803900DC(ActorMarker *, f32 *, f32, f32); extern Actor* func_80329958(ActorMarker *this, s32 arg1); extern void func_803298D8(); void func_80324E88(f32); -extern void func_80324E60(Actor*, s32, f32); extern void func_80324CFC(f32, enum comusic_e, s32); extern void sfxsource_setSampleRate(u8, s32); extern void func_80328FF0(Actor *arg0, f32 arg1); @@ -64,8 +63,8 @@ typedef struct ch_fight_180_s{ }ActorLocal_fight_180; /* .data */ -f32 D_80391380[4] = {1.0f, 1.0f, 1.0f, 1.0f}; -f32 D_80391390[4] = {0.33f, 0.33f, 0.33f, 1.0f}; +f32 fight_D_80391380[4] = {1.0f, 1.0f, 1.0f, 1.0f}; +f32 fight_D_80391390[4] = {0.33f, 0.33f, 0.33f, 1.0f}; ActorAnimationInfo D_803913A0[] = { { 0, 0.0f}, { 0x1C5, 0.6f}, @@ -113,13 +112,13 @@ ActorAnimationInfo D_803913A0[] = { { 0x266, 4.0f} }; -ActorInfo D_80391500 = { +ActorInfo fight_D_80391500 = { MARKER_25E_GRUNTILDA_FINAL_BOSS, ACTOR_38B_GRUNTILDA_FINAL_BOSS, ASSET_53D_MODEL_GRUNTILDA_FINAL_BOSS, 1, D_803913A0, chfinalboss_update, func_80326224, chfinalboss_draw, 0, 0, 0.0f, 0 }; -f32 D_80391524[3] = {0.0f, -8.0f, 400.0f}; +f32 fight_D_80391524[3] = {0.0f, -8.0f, 400.0f}; f32 D_80391530[3] = {0.0f, -8.0f, 0.0f}; @@ -172,7 +171,7 @@ struct43s D_80391678 = { s32 D_803916C0[3] = {0xff, 0xff, 0xff}; s32 D_803916CC[3] = {0xff, 0, 0}; -s32 D_803916D8[3] = {0x4B, 0x4B, 0x4B}; +s32 fight_D_803916D8[3] = {0x4B, 0x4B, 0x4B}; f32 D_803916E4[4] = {0.1f, 0.2f, 1.9f, 3.9f}; @@ -325,7 +324,7 @@ void func_80386698(f32 arg0) { temp_v0 = func_8034C528(0x19A); if (temp_v0 != NULL) { - func_8034DDF0(temp_v0, D_80391524, D_80391530, arg0, 1); + func_8034DDF0(temp_v0, fight_D_80391524, D_80391530, arg0, 1); } } @@ -402,9 +401,9 @@ void func_803869BC(Actor *this) { sp30[2] = D_803916CC[2]; sp2C = 0x715; } else if ((temp_t3 == 8) || (temp_t3 == 9)) { - sp30[0] = D_803916D8[0]; - sp30[1] = D_803916D8[1]; - sp30[2] = D_803916D8[2]; + sp30[0] = fight_D_803916D8[0]; + sp30[1] = fight_D_803916D8[1]; + sp30[2] = fight_D_803916D8[2]; sp2C = 0x000; } else { sp30[0] = D_803916C0[0]; @@ -425,7 +424,7 @@ void func_803869BC(Actor *this) { } } -void func_80386B54(f32 *arg0, f32 arg1) { +void fight_func_80386B54(f32 *arg0, f32 arg1) { f32 sp34; f32 sp28[3]; s32 i; @@ -437,7 +436,7 @@ void func_80386B54(f32 *arg0, f32 arg1) { } } -bool func_80386BEC(Actor *this, f32 arg1) { +bool fight_func_80386BEC(Actor *this, f32 arg1) { this->yaw_ideal = (f32) func_80329784(this); func_80328FB0(this, arg1); if ((this->yaw_ideal < (this->yaw + arg1)) && ((this->yaw - arg1) < this->yaw_ideal)) { @@ -459,7 +458,7 @@ bool func_80386C68(Actor *this, f32 arg1) { return FALSE; } -void func_80386CF8(Actor *actor) { +void fight_func_80386CF8(Actor *actor) { f32 sp4C[3]; f32 sp40[3]; f32 sp34[3]; @@ -510,7 +509,7 @@ void func_80386EC0(s32 arg0) { marker = func_8032813C(0x38A, D_80392758, 0)->marker; func_8030E878(SFX_147_GRUNTY_SPELL_ATTACK_2, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f); - func_803900DC(marker, D_80392758, D_80392768[1], D_80392768[2]); + fight_func_803900DC(marker, D_80392758, D_80392768[1], D_80392768[2]); } void func_80386F5C(ActorMarker * arg0, f32 arg1[3], f32 arg2, f32 arg3) { @@ -528,7 +527,7 @@ void func_80386FD8(s32 arg0) { marker = func_8032813C(0x389, D_80392758, 0)->marker; func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f); - func_8038FB84(marker, D_80392758, D_80392768, D_80392778); + fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778); } void func_80387074(s32 arg0) { @@ -536,7 +535,7 @@ void func_80387074(s32 arg0) { marker = func_8032813C(0x3AA, D_80392758, 0)->marker; func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f); - func_8038FB84(marker, D_80392758, D_80392768, D_80392778); + fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778); } void func_80387110(ActorMarker *marker, f32 arg1[3], f32 arg2, s32 arg3) { @@ -553,7 +552,7 @@ void func_80387110(ActorMarker *marker, f32 arg1[3], f32 arg2, s32 arg3) { D_80392758[1] += 80.0f; if (arg3 == 0) { - func_80386B54(sp2C, arg2); + fight_func_80386B54(sp2C, arg2); } else if (local->mirror_phase5 == 0) { sp2C[0] = D_80391710[0]; sp2C[1] = D_80391710[1]; @@ -586,7 +585,7 @@ void func_803872F8(Actor *arg0) { func_80387110(arg0->marker, vec, 3.0f, 1); } -s32 func_80387340(Actor *this, f32 arg1) { +s32 fight_func_80387340(Actor *this, f32 arg1) { f32 sp24[3]; if (actor_animationIsAt(this, 0.50f) != 0) { @@ -762,7 +761,7 @@ void func_80387B00(Actor *this) { local = (ActorLocal_fight_180 *) this->local; - func_80386B54(sp28, 0.80f); + fight_func_80386B54(sp28, 0.80f); this->unk1C_x = sp28[0]; this->unk1C_y = sp28[1]; this->unk1C_z = sp28[2]; @@ -813,7 +812,7 @@ void func_80387BFC(Actor *this, f32 arg1) { sp44[2] *= this->unk28; } -void func_80387D4C(Actor *actor) { +void fight_func_80387D4C(Actor *actor) { ActorLocal_fight_180 *local; f32 sp20[3]; @@ -1056,9 +1055,9 @@ void chfinalboss_phase1_update(ActorMarker *marker) { func_80386600(this->marker, 0); func_803869BC(this); func_80387ACC(this, 60.0f * sp54); - if (func_80386BEC(this, 240.0f * sp54)) { + if (fight_func_80386BEC(this, 240.0f * sp54)) { chfinalboss_phase1_setState(this, 5); - func_80386654(1.0f, D_80391380, D_80391390); + func_80386654(1.0f, fight_D_80391380, fight_D_80391390); } break; case 5: @@ -1091,7 +1090,7 @@ void chfinalboss_phase1_update(ActorMarker *marker) { FUNC_8030E8B4(SFX_C4_TWINKLY_MUNCHER_GRR, 0.6f, 28000, this->position, 2000, 10000); } if ((local->unk14 * 0.75) < local->unk20) { - func_80386B54(sp40, 0); + fight_func_80386B54(sp40, 0); this->unk1C[0] = sp40[0]; this->unk1C[1] = sp40[1]; this->unk1C[2] = sp40[2]; @@ -1123,7 +1122,7 @@ void chfinalboss_phase1_update(ActorMarker *marker) { func_80328FB0(this, 30.0f * sp54); if (this->unk28 < 0) { chfinalboss_phase1_setState(this, 4); - func_80386654(1.5f, D_80391390, D_80391380); + func_80386654(1.5f, fight_D_80391390, fight_D_80391380); } break; case 8: @@ -1132,11 +1131,11 @@ void chfinalboss_phase1_update(ActorMarker *marker) { this->unk28 = this->unk28 + local->unk28 * sp54; local->unk20 = local->unk20 - this->unk28 * sp54; func_80387ACC(this, 60.0f * sp54); - func_80387D4C(this); + fight_func_80387D4C(this); func_80328FB0(this, 30.0f * sp54); if (this->unk28 < 0) { chfinalboss_phase1_setState(this, 9); - func_80386654(2.0f, D_80391390, D_80391380); + func_80386654(2.0f, fight_D_80391390, fight_D_80391380); this->unk60 = 4.0f; } break; @@ -1154,9 +1153,9 @@ void chfinalboss_phase1_update(ActorMarker *marker) { break; case 10: func_80387ACC(this, 60.0f * sp54); - func_80386BEC(this, 30.0f); + fight_func_80386BEC(this, 30.0f); func_8038871C(this, 460.0f, 400.0f * sp54); - func_80387340(this, 1.0f); + fight_func_80387340(this, 1.0f); if (actor_animationIsAt(this, 0.9999f)) { chfinalboss_phase1_setState(this, 2); func_803880A0(this, 2000.0f); @@ -1164,14 +1163,14 @@ void chfinalboss_phase1_update(ActorMarker *marker) { break; case 11: func_80387ACC(this, 60.0f * sp54); - func_80386BEC(this, 30.0f); + fight_func_80386BEC(this, 30.0f); if (local->unk9) { func_8038871C(this, 460.0f, 400.0f * sp54); } break; case 12: func_80387ACC(this, 60.0f * sp54); - func_80386BEC(this, 30.0f); + fight_func_80386BEC(this, 30.0f); func_8038871C(this, 460.0f, 400.0f * sp54); func_803873DC(this, 600.0f, 2000.0f); if (actor_animationIsAt(this, 0.9999f)) { @@ -1182,7 +1181,7 @@ void chfinalboss_phase1_update(ActorMarker *marker) { break; case 13: func_80387ACC(this, 60.0f * sp54); - func_80386BEC(this, 30.0f); + fight_func_80386BEC(this, 30.0f); if (actor_animationIsAt(this, 0.9999f)) { if (local->hits >= 4) { chfinalboss_phase1_setState(this, 0xB); @@ -1255,13 +1254,13 @@ void chfinalboss_phase2_update(ActorMarker *marker) { break; case 15: - if (func_80386BEC(this, 9.0f)) { + if (fight_func_80386BEC(this, 9.0f)) { chfinalboss_phase2_setState(this, 0x10); } break; case 16: - func_80386BEC(this, 3.0f); - func_80387340(this, 1.3f); + fight_func_80386BEC(this, 3.0f); + fight_func_80387340(this, 1.3f); if (actor_animationIsAt(this, 0.9999f)) { chfinalboss_phase2_setState(this, 0x12); local->unk3++; @@ -1275,19 +1274,19 @@ void chfinalboss_phase2_update(ActorMarker *marker) { } break; case 17: - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); func_803873DC(this, 1200.0f, 2400.0f); if (actor_animationIsAt(this, 0.9999f)) { chfinalboss_setPhase(this->marker, 3); } break; case 18: - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); if (this->unk60 > 0.0) { this->unk60 = this->unk60 - sp4C; break; } - if (func_80386BEC(this, 3.0f)) { + if (fight_func_80386BEC(this, 3.0f)) { chfinalboss_phase2_setState(this, 0x10); } break; @@ -1405,7 +1404,7 @@ void chfinalboss_phase3_setState(Actor *this, s32 arg1) { FUNC_8030E8B4(SFX_131_GRUNTY_WEEEGH, 1.0f, 32000, this->position, 5000, 12000); break; case 26: - func_80386CF8(this); + fight_func_80386CF8(this); func_80324E38(0.0f, 1); func_80311480(randi2(0, 5) + 0x112C, 0xA8, NULL, this->marker, chfinalboss_phase3_endTextCallback, NULL); break; @@ -1421,7 +1420,7 @@ u8 D_8039283C; u8 D_8039283D; u8 D_8039283E; u8 D_8039283F; -u8 D_80392840; +u8 fight_D_80392840; u8 D_80392841; u8 D_80392842; u8 D_80392843; @@ -1457,7 +1456,7 @@ u8 D_80392860; u8 D_80392861; u8 D_80392862; u8 D_80392863; -u8 D_80392864; +u8 fight_D_80392864; u8 D_80392865; u8 D_80392866; u8 D_80392867; @@ -1519,13 +1518,13 @@ void chfinalboss_phase3_update(ActorMarker *marker) { } break; case 23: - if (func_80386BEC(this, 9.0f) && (func_80297C6C() != 3)) { + if (fight_func_80386BEC(this, 9.0f) && (func_80297C6C() != 3)) { chfinalboss_phase3_setState(this, 0x18); } break; case 24: - func_80386BEC(this, 3.0f); - if (func_80387340(this, 1.3f)) { + fight_func_80386BEC(this, 3.0f); + if (fight_func_80387340(this, 1.3f)) { local->unk3++; } if (actor_animationIsAt(this, 0.9999f)) { @@ -1759,15 +1758,15 @@ void chfinalboss_phase4_update(ActorMarker *marker) { break; case 29: - if ((func_80386BEC(this, 9.0f)) && (func_80297C6C() != 3) && (D_803927C4 == 0)) { + if ((fight_func_80386BEC(this, 9.0f)) && (func_80297C6C() != 3) && (D_803927C4 == 0)) { chfinalboss_phase4_setState(this, 0x1E); } break; case 30: - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); if (D_803927C4 == 0) { - func_80387340(this, 1.0f); + fight_func_80387340(this, 1.0f); if (actor_animationIsAt(this, 0.9999f)) { static f32 D_803917D0[4] = {2.4f, 2.1f, 1.8f, 1.5f}; @@ -1781,12 +1780,12 @@ void chfinalboss_phase4_update(ActorMarker *marker) { break; case 31: - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); if (this->unk60 > 0.0) { this->unk60 -= sp74; break; } - if (func_80386BEC(this, 3.0f)) { + if (fight_func_80386BEC(this, 3.0f)) { chfinalboss_phase4_setState(this, 0x1E); } break; @@ -1798,7 +1797,7 @@ void chfinalboss_phase4_update(ActorMarker *marker) { break; case 33: - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); sp5C[0] = this->position[0] + (this->velocity[0] * sp74); sp5C[1] = this->position[1] + (this->velocity[1] * sp74); sp5C[2] = this->position[2] + (this->velocity[2] * sp74); @@ -1999,22 +1998,22 @@ void chfinalboss_phase5_update(ActorMarker *marker) { } switch (this->state) { case 35: - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); break; case 36: - if (func_80386BEC(this, 9.0f) && (func_80297C6C() != 3)) { + if (fight_func_80386BEC(this, 9.0f) && (func_80297C6C() != 3)) { chfinalboss_phase5_setState(this, 0x25); } break; case 37: - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); if (func_80297C6C() == 3) { chfinalboss_phase5_setState(this, 0x24); break; } - if (func_80387340(this, 1.0f)) { + if (fight_func_80387340(this, 1.0f)) { local->unk3++; } if ((actor_animationIsAt(this, 0.9999f)) && (local->unk3 >= 5)) { @@ -2023,7 +2022,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) { break; case 38: - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); func_803873DC(this, 700.0f, 2400.0f); if (actor_animationIsAt(this, 0.9999f)) { chfinalboss_phase5_setState(this, 0x27); @@ -2035,7 +2034,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) { if (local->unk8) { func_80386C68(this, 4.5f); } else { - func_80386BEC(this, 3.0f); + fight_func_80386BEC(this, 3.0f); } if (this->unk60 > 0.0) { this->unk60 -= dt; @@ -2317,7 +2316,7 @@ void chfinalboss_update(Actor *this){ func_80386628(this->marker, 1); func_8038FC00(); - func_80386654(1.0f, D_80391380, D_80391390); + func_80386654(1.0f, fight_D_80391380, fight_D_80391390); func_8028F784(1); func_8028F4B8(D_80391804, 2000.0f, -2800.0f); func_8028FA14(0x93, 2); @@ -2384,7 +2383,7 @@ void chfinalboss_update(Actor *this){ }//L8038C0C8 } -void func_8038C0DC(f32 (*arg0)[3]) { +void fight_func_8038C0DC(f32 (*arg0)[3]) { (*arg0)[0] = D_80392798[0]; (*arg0)[1] = D_80392798[1]; (*arg0)[2] = D_80392798[2]; diff --git a/src/fight/chjinjonator.c b/src/fight/chjinjonator.c index 95cdfc0c..3e2b0279 100644 --- a/src/fight/chjinjonator.c +++ b/src/fight/chjinjonator.c @@ -7,7 +7,7 @@ extern void func_80328B8C(Actor *, s32, f32, s32); extern void func_80324CFC(f32, s32, s32); extern void func_802F9E44(s32, f32, f32, f32, f32); extern void func_80387470(Actor *, f32 [3], f32, f32, f32, f32, f32); -extern void func_8038C0DC(f32[3]); +extern void fight_func_8038C0DC(f32[3]); extern void chbossjinjo_spawnParticles(Actor *, enum asset_e, enum asset_e, f32); @@ -282,7 +282,7 @@ void chjinjonator_update(Actor *this){ case 7: //80390B78 sp50 = local->unk24*0.11 + 1.0; chjinjonator_80390278(this); - func_8038C0DC(local->unk8); + fight_func_8038C0DC(local->unk8); local->unk8[1] += 100.0f; func_80387470(this, local->unk8, sp50*2400.0f, sp50*2400.0f*4.2, 170.0f, sp50*2500.0f, 0.0f); break; @@ -358,7 +358,7 @@ void chjinjonator_update(Actor *this){ case 12: //80390F7C sp48 = local->unk24*0.11 + 1.0; chjinjonator_80390278(this); - func_8038C0DC(local->unk8); + fight_func_8038C0DC(local->unk8); local->unk8[1] += 100.0f; func_80387470(this, local->unk8, sp48*2400.0f, sp48*2400.0f*4.2, 170.0f, sp48*2500.0f, 0.0f); break; diff --git a/src/fight/chjinjonatorbase.c b/src/fight/chjinjonatorbase.c index 0b711f7b..3f71fb3c 100644 --- a/src/fight/chjinjonatorbase.c +++ b/src/fight/chjinjonatorbase.c @@ -9,7 +9,7 @@ typedef struct { void chjinjonatorbase_update(Actor *); /* .data */ -ActorInfo D_80391A40 = { +ActorInfo fight_D_80391A40 = { MARKER_27F_JINJONATOR_STATUE_BASE, ACTOR_3A9_JINJONATOR_STATUE_BASE, ASSET_544_MODEL_JINJONATOR_STATUE_BASE, 0x1, NULL, chjinjonatorbase_update, func_80326224, func_80325888, @@ -18,7 +18,7 @@ ActorInfo D_80391A40 = { s32 D_80391A64[3] = {0xC8, 0xC8, 0xA0}; -struct31s D_80391A70 = { +struct31s fight_D_80391A70 = { {1.0f, 1.0f}, {1.7f, 2.7f}, {0.0f, 0.05f}, @@ -53,7 +53,7 @@ void func_8038E03C(f32 arg0[3], u32 arg1) { particleEmitter_setStartingFrameRange(temp_v0, 0, 7); particleEmitter_setPosition(temp_v0, arg0); particleEmitter_setPositionAndVelocityRanges(temp_v0, &D_80391A98); - func_802EFB98(temp_v0, &D_80391A70); + func_802EFB98(temp_v0, &fight_D_80391A70); particleEmitter_emitN(temp_v0, arg1); } diff --git a/src/fight/chspellfireball.c b/src/fight/chspellfireball.c index a69c4e4c..938a80d3 100644 --- a/src/fight/chspellfireball.c +++ b/src/fight/chspellfireball.c @@ -18,7 +18,7 @@ typedef struct { void func_8038F620(Actor *this); /* .data */ -ActorInfo D_80391B00 = { +ActorInfo fight_D_80391B00 = { MARKER_25C_GRUNTY_SPELL_FIREBALL, ACTOR_389_GRUNTY_SPELL_FIREBALL, ASSET_541_SPRITE_FIREBALL_SPELL_ATTACK, 0x1, NULL, func_8038F620, func_80326224, func_80325888, @@ -73,13 +73,13 @@ f32 D_80391D34[6] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; f32 D_80391D4C[6] = {-50.0f, -50.0f, -50.0f, 50.0f, 50.0f, 50.0f}; f32 D_80391D64[6] = {0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f}; f32 D_80391D7C[6] = {-260.0f, -260.0f, -260.0f, 260.0f, 260.0f, 260.0f}; -f32 D_80391D94[4] = {0.15f, 0.3f, 0.0f, 0.0f}; +f32 fight_D_80391D94[4] = {0.15f, 0.3f, 0.0f, 0.0f}; f32 D_80391DA4[4] = {0.0f, 0.01f, 0.7f, 0.8f}; f32 D_80391DB4[2] = {0.0f, 0.65f}; /* .bss */ // u8 pad[0x180]; //TODO!!!! define other file .bss sections -u8 D_803928E0; +u8 fight_D_803928E0; u8 D_803928E1; u8 D_803928E2; u8 D_803928E3; @@ -226,8 +226,8 @@ void func_8038F3B4(ActorMarker *marker, ActorMarker *other){ func_8038F084(marker); switch(func_80320424(0x23, 3)){ case 1: //8038F41C - if(!D_803928E0 && func_80311480(randi2(0, 5) + 0x10f2, 0, 0, 0, 0, 0)) - D_803928E0 = 1; + if(!fight_D_803928E0 && func_80311480(randi2(0, 5) + 0x10f2, 0, 0, 0, 0, 0)) + fight_D_803928E0 = 1; break; case 2: //8038F468 if(!D_803928E1 && func_80311480(randi2(0, 5) + 0x110b, 0, 0, 0, 0, 0)) @@ -380,7 +380,7 @@ void func_8038F620(Actor *this){ }//L8038FB74 } -void func_8038FB84(ActorMarker *arg0, f32 *arg1, f32 *arg2, f32 *arg3) { +void fight_func_8038FB84(ActorMarker *arg0, f32 *arg1, f32 *arg2, f32 *arg3) { Actor *temp_v0 = marker_getActor(arg0); temp_v0->position_x = arg1[0]; @@ -395,7 +395,7 @@ void func_8038FB84(ActorMarker *arg0, f32 *arg1, f32 *arg2, f32 *arg3) { } void func_8038FC00(void) { - D_803928E0 = (u8)0; + fight_D_803928E0 = (u8)0; D_803928E1 = (u8)0; D_803928E2 = (u8)0; D_803928E3 = (u8)0; diff --git a/src/fight/chstonejinjo.c b/src/fight/chstonejinjo.c index 48da47a8..2403c782 100644 --- a/src/fight/chstonejinjo.c +++ b/src/fight/chstonejinjo.c @@ -10,7 +10,7 @@ extern f32 chbossjinjo_8038D268(void); void chstonejinjo_update(Actor *); /* .data */ -ActorAnimationInfo D_803919F0[] ={ +ActorAnimationInfo fight_D_803919F0[] ={ {0, 0.0f}, {0x265, 1e+8f}, {0x265, 1e+8f}, @@ -18,7 +18,7 @@ ActorAnimationInfo D_803919F0[] ={ }; ActorInfo D_80391A10 = { MARKER_276_STONE_JINJO, ACTOR_3A1_STONE_JINJO, ASSET_545_MODEL_STONE_JINJO, - 0x1, D_803919F0, + 0x1, fight_D_803919F0, chstonejinjo_update, func_80326224, func_80325888, 0, 0x800, 1.0f, 0 }; @@ -124,7 +124,7 @@ void chstonejinjo_breakOpen(ActorMarker *marker){ sp38 = 0x30 + actor->unkF4_8*2; sp34 = chbossjinjo_8038D268(); sp30 = actor->unk1C[0] + sp34; - func_8038C0DC(&sp24); + fight_func_8038C0DC(&sp24); func_8028F94C(2, &sp24); func_8038C27C(1); timed_setCameraToNode(0 * sp30, sp38); diff --git a/src/fight/code_0.c b/src/fight/code_0.c index 3425b5ac..bc825051 100644 --- a/src/fight/code_0.c +++ b/src/fight/code_0.c @@ -5,16 +5,16 @@ #include "prop.h" extern ActorInfo D_80366F68; -extern ActorInfo D_80391500; +extern ActorInfo fight_D_80391500; extern ActorInfo D_80391840; extern ActorInfo D_80391864; extern ActorInfo D_80391888; extern ActorInfo D_803918AC; extern ActorInfo D_80391990; -extern ActorInfo D_80391A10; -extern ActorInfo D_80391A40; +extern ActorInfo fight_D_80391A10; +extern ActorInfo fight_D_80391A40; extern ActorInfo D_80391AD0; -extern ActorInfo D_80391B00; +extern ActorInfo fight_D_80391B00; extern ActorInfo D_80391B24; extern ActorInfo D_80391DC0; extern ActorInfo D_80392018; @@ -23,18 +23,18 @@ extern ActorInfo D_80392090; /* .bss */ u8 pad_80392750[0x10]; -void func_803863F0(void) +void fight_func_803863F0(void) { - spawnableActorList_add(&D_80391B00, actor_new, 0X108444); + spawnableActorList_add(&fight_D_80391B00, actor_new, 0X108444); spawnableActorList_add(&D_80391DC0, actor_new, 0X108444); - spawnableActorList_add(&D_80391500, actor_new, 0X300468); + spawnableActorList_add(&fight_D_80391500, actor_new, 0X300468); spawnableActorList_add(&D_80391840, actor_new, 0X8464); spawnableActorList_add(&D_80391864, actor_new, 0X8464); spawnableActorList_add(&D_80391888, actor_new, 0X8464); spawnableActorList_add(&D_803918AC, actor_new, 0X8464); - spawnableActorList_add(&D_80391A10, actor_new, 0X20004); + spawnableActorList_add(&fight_D_80391A10, actor_new, 0X20004); spawnableActorList_add(&D_80391990, actor_new, 0X800100C); - spawnableActorList_add(&D_80391A40, actor_new, 0X8009404); + spawnableActorList_add(&fight_D_80391A40, actor_new, 0X8009404); spawnableActorList_add(&D_80391B24, actor_new, 0X108444); spawnableActorList_add(&D_80391AD0, actor_new, 0X101404); spawnableActorList_add(&D_80366F68, actor_new, 0X100404); diff --git a/src/fight/code_9850.c b/src/fight/code_9850.c index 8cad93b8..85183c63 100644 --- a/src/fight/code_9850.c +++ b/src/fight/code_9850.c @@ -22,12 +22,12 @@ f32 D_80391DF4[4] = {0.3f, 0.3f, 0.3f, 1.0f}; s32 D_80391E04[2] = {1, 9}; f32 D_80391E0C[4] = {4.5f, 4.5f, 4.5f, 4.5f}; f32 D_80391E1C[4] = {0.0f, 0.0f, 0.85f, 1.35f}; -f32 D_80391E2C[2] = {0.6f, 0.7f}; +f32 fight_D_80391E2C[2] = {0.6f, 0.7f}; f32 D_80391E34[6] = {-130.0f, 0.0f, -130.0f, 130.0f, 0.0f, 130.0f}; f32 D_80391E4C[4] = {1.1f, 1.1f, 4.0f, 5.4f}; f32 D_80391E5C[6] = {-20.0f, 0.0f, -20.0f, 20.0f, 40.0f, 20.0f}; -f32 D_80391E74[6] = {0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f}; +f32 fight_D_80391E74[6] = {0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f}; f32 D_80391E8C[6] = {-420.0f, 410.0f, -420.0f, 480.0f, 860.0f, 480.0f}; f32 D_80391EA4[4] = {0.35f, 0.65f, 0.0f, 0.0f}; f32 D_80391EB4[4] = {0.0f, 0.01f, 2.0f, 2.3f}; @@ -73,17 +73,17 @@ void func_8038FCF0(ActorMarker *marker, ActorMarker *other_marker){ timedFunc_set_0(0.0f, func_8038FC88); timedFunc_set_0(0.3f, func_8038FCBC); func_8038EBE0(actor->position, 4, ASSET_710_SPRITE_SPARKLE_PURPLE, - &D_80391E5C, &D_80391E74, &D_80391E8C, + &D_80391E5C, &fight_D_80391E74, &D_80391E8C, &D_80391EA4, &D_80391EB4, &D_80391EC4 ); func_8038EBE0(actor->position, 4, ASSET_711_SPRITE_SPARKLE_DARK_BLUE, - &D_80391E5C, &D_80391E74, &D_80391E8C, + &D_80391E5C, &fight_D_80391E74, &D_80391E8C, &D_80391EA4, &D_80391EB4, &D_80391EC4 ); func_8038EEFC(actor->position, 3, &D_80391E4C); func_8038ED9C(&sp38, 0x6C8, 3, &D_80391E04, &D_80391E34, - &D_80391E0C, &D_80391E1C, &D_80391E2C + &D_80391E0C, &D_80391E1C, &fight_D_80391E2C ); marker_despawn(actor->marker); } @@ -132,7 +132,7 @@ void func_8038FE94(Actor *this){ } } -void func_803900DC(ActorMarker *marker, f32 (*arg1)[3], f32 arg2, f32 arg3){ +void fight_func_803900DC(ActorMarker *marker, f32 (*arg1)[3], f32 arg2, f32 arg3){ Actor *actor = marker_getActor(marker); actor->position_x = (*arg1)[0]; actor->position_y = (*arg1)[1]; diff --git a/src/lair/code_0.c b/src/lair/code_0.c index 201092b9..9f2646c0 100644 --- a/src/lair/code_0.c +++ b/src/lair/code_0.c @@ -20,25 +20,25 @@ extern void *func_8034C2C4(ActorMarker *, s32); -void func_803863F0(Actor *this); -void func_803864B0(Actor *this); -void func_80386550(Actor *this); +void lair_func_803863F0(Actor *this); +void lair_func_803864B0(Actor *this); +void lair_func_80386550(Actor *this); Actor *func_8038664C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_80386D78(Actor *this); -void SM_CRCs_are_valid(Actor *this); +void func_80386780(Actor *this); void func_803867A8(Actor *this); void func_80386D20(Actor *this); void func_803870DC(Actor *this); -Actor *func_80387560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); +Actor *lair_func_80387560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_80387730(Actor *this); void func_803880BC(Actor *this); void func_8038824C(Actor *this); void func_803882B0(Actor *this); void func_80388524(Actor *this); void func_80388FC8(Actor *this); -void func_80389204(Actor *this); +void lair_func_80389204(Actor *this); void func_803893B8(Actor *this); -void func_803894B0(Actor *this); +void lair_func_803894B0(Actor *this); void func_8038982C(Actor *this); void func_80389898(Actor *this); void func_80389D08(Actor *this); @@ -57,7 +57,7 @@ void func_80389FF4(Actor *this); void func_8038A014(Actor *this); void func_8038A034(Actor *this); void func_8038A064(Actor *this); -void func_8038A084(Actor *this); +void lair_func_8038A084(Actor *this); void func_8038A0A4(Actor *this); extern ActorInfo D_80393560; @@ -86,7 +86,7 @@ extern ActorInfo D_80394C94; /* .data */ extern ActorAnimationInfo D_80392CB0[]; -extern ActorInfo D_80392D90 = { 0x270, 0x2D8, 0x3B2, 0x1, NULL, func_802D3D54, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +extern ActorInfo lair_D_80392D90 = { 0x270, 0x2D8, 0x3B2, 0x1, NULL, func_802D3D54, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; extern ActorInfo D_80392DB4 = { 0x110, 0x214, 0x4AB, 0x1, D_80392CB0, func_803896D4, func_80326224, func_80325888, 0, 0, 0.0f, 0}; extern ActorInfo D_80392DD8 = { 0x113, 0x217, 0x4A9, 0x1, D_80392CB0, func_803896F4, func_80326224, func_80325888, 0, 0, 0.0f, 0}; extern ActorInfo D_80392DFC = { 0x115, 0x219, 0x4AA, 0x1, D_80392CB0, func_80389714, func_80326224, func_80325888, 0, 0, 0.0f, 0}; @@ -95,14 +95,14 @@ extern ActorInfo D_80392E44 = { 0x11C, 0x222, 0x4B2, 0x1, D_80392CB0, func_80389 extern ActorInfo D_80392E68 = { 0x11D, 0x223, 0x4B0, 0x1, D_80392CB0, func_80389784, func_80326224, func_80325888, 0, 0, 0.0f, 0}; extern ActorInfo D_80392E8C = { 0x232, 0x23C, 0x4B8, 0x1, D_80392CB0, func_803897AC, func_80326224, func_80325888, 0, 0, 0.0f, 0}; extern ActorInfo D_80392EB0 = { 0x23F, 0x246, 0x534, 0x1, D_80392CB0, func_80386D20, func_80326224, func_80325888, 0, 0, 0.0f, 0}; -extern ActorInfo D_80392ED4 = { 0x241, 0x248, 0x540, 0x1, D_80392CB0, SM_CRCs_are_valid, func_80326224, func_80325888, 0, 0, 0.0f, 0}; -extern ActorInfo D_80392EF8 = { 0x109, 0x20D, 0x4A1, 0x1, D_80392CB0, func_80386550, func_80326224, func_80325888, 0, 0, 0.0f, 0x85}; +extern ActorInfo D_80392ED4 = { 0x241, 0x248, 0x540, 0x1, D_80392CB0, func_80386780, func_80326224, func_80325888, 0, 0, 0.0f, 0}; +extern ActorInfo D_80392EF8 = { 0x109, 0x20D, 0x4A1, 0x1, D_80392CB0, lair_func_80386550, func_80326224, func_80325888, 0, 0, 0.0f, 0x85}; extern ActorInfo D_80392F1C = { 0x264, 0x2E5, 0x550, 0x19, D_80392CB0, func_80388524, func_80326224, func_80325888, 0, 0, 0.0f, 0}; -extern ActorInfo D_80392F40 = { 0x224, 0x230, 0x4BF, 0xB, D_80392CB0, func_803863F0, func_80326224, func_80325888, 0, 0, 0.0f, 0x88}; -extern ActorInfo D_80392F64 = { 0x225, 0x231, 0x4D5, 0xE, D_80392CB0, func_803864B0, func_80326224, func_80325888, 0, 0, 0.0f, 0x88}; +extern ActorInfo D_80392F40 = { 0x224, 0x230, 0x4BF, 0xB, D_80392CB0, lair_func_803863F0, func_80326224, func_80325888, 0, 0, 0.0f, 0x88}; +extern ActorInfo D_80392F64 = { 0x225, 0x231, 0x4D5, 0xE, D_80392CB0, lair_func_803864B0, func_80326224, func_80325888, 0, 0, 0.0f, 0x88}; extern ActorInfo D_80392F88 = { 0x111, 0x215, 0x4A4, 0x1, NULL, func_80388FC8, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; extern ActorInfo D_80392FAC = { 0x112, 0x216, 0x4A5, 0x1, NULL, func_80388FC8, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; -extern ActorInfo D_80392FD0 = { 0x114, 0x218, 0x4A6, 0x1, NULL, func_80389204, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +extern ActorInfo D_80392FD0 = { 0x114, 0x218, 0x4A6, 0x1, NULL, lair_func_80389204, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; extern ActorInfo D_80392FF4 = { 0x10D, 0x211, 0x4A3, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; extern ActorInfo D_80393018 = { 0x22C, 0x23A, 0x4D9, 0x1, NULL, func_803882B0, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; extern ActorInfo D_8039303C = { 0x164, 0x259, 0x507, 0x1, NULL, func_803880BC, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; @@ -118,16 +118,16 @@ extern ActorInfo D_80393180 = { 0x228, 0x235, 0x4D7, 0x1, NULL, func_80388524, f extern ActorInfo D_803931A4 = { 0x229, 0x236, 0x4D8, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x8B}; extern ActorInfo D_803931C8 = { MARKER_121_GLASS_EYE, ACTOR_227_GLASS_EYE, ASSET_4BD_MODEL_GLASS_EYE, 0x1, NULL, func_8038A034, func_80326224, func_80325888, 0, 0, 0.0f, 0x89}; extern ActorInfo D_803931EC = { 0x116, 0x21A, 0x4AC, 0x1, NULL, func_803893B8, func_80326224, func_80325E78, 0, 0, 0.0f, 0x82}; -extern ActorInfo D_80393210 = { 0x117, 0x21B, 0x4AD, 0x1, NULL, func_803894B0, func_80326224, func_80325E78, 0, 0, 0.0f, 0x82}; +extern ActorInfo D_80393210 = { 0x117, 0x21B, 0x4AD, 0x1, NULL, lair_func_803894B0, func_80326224, func_80325E78, 0, 0, 0.0f, 0x82}; extern ActorInfo D_80393234 = { 0x10B, 0x20F, 0x4B4, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x90}; extern ActorInfo D_80393258 = { 0x10C, 0x210, 0x4AE, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x84}; extern ActorInfo D_8039327C = { 0x10E, 0x212, 0x4A7, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x7F}; extern ActorInfo D_803932A0 = { 0x120, 0x226, 0x4BC, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x87}; extern ActorInfo D_803932C4 = { 0x122, 0x228, 0x4BE, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0x8C}; extern ActorInfo D_803932E8 = { 0x10F, 0x213, 0x4A8, 0x1, NULL, func_803875F0, func_80326224, func_80325E78, 0, 0, 0.0f, 0x80}; -extern ActorInfo D_8039330C = { 0x118, 0x21E, 0x4B1, 0x1, NULL, func_8038A084, func_80326224, func_80325E78, 0, 0, 0.0f, 0x8F}; +extern ActorInfo D_8039330C = { 0x118, 0x21E, 0x4B1, 0x1, NULL, lair_func_8038A084, func_80326224, func_80325E78, 0, 0, 0.0f, 0x8F}; extern ActorInfo D_80393330 = { 0x119, 0x21F, 0x4B6, 0x1, NULL, func_8038A0A4, func_80326224, func_80325E78, 0, 0, 0.0f, 0x92}; -extern ActorInfo D_80393354 = { 0x266, 0x2E3, 0x563, 0x1, NULL, func_803870DC, func_80326224, func_80387560, 0, 0, 0.0f, 0}; +extern ActorInfo D_80393354 = { 0x266, 0x2E3, 0x563, 0x1, NULL, func_803870DC, func_80326224, lair_func_80387560, 0, 0, 0.0f, 0}; extern ActorInfo D_80393378 = { 0x17D, 0x1E1, 0x517, 0x1, NULL, func_80389D08, func_80326224, func_80389E10, 0, 0, 0.0f, 0x8D}; extern ActorInfo D_8039339C = { 0x234, 0x23E, 0x4E1, 0x12, D_80392CB0, func_8038982C, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; extern ActorInfo D_803933C0 = { 0x163, 0x258, 0x511, 0x12, D_80392CB0, func_80389898, func_80326224, func_8038664C, 0, 0, 0.0f, 0x8E}; @@ -147,7 +147,7 @@ extern s32 D_80393504[4]; //chcobweb -void func_803863F0(Actor *this) +void lair_func_803863F0(Actor *this) { if(!this->initialized) { @@ -171,7 +171,7 @@ void func_803863F0(Actor *this) } //chbigyellowcobweb -void func_803864B0(Actor *this) +void lair_func_803864B0(Actor *this) { if (!this->initialized) { @@ -194,7 +194,7 @@ void func_803864B0(Actor *this) } } -void func_80386550(Actor *this) +void lair_func_80386550(Actor *this) { if (!this->initialized) { @@ -265,7 +265,7 @@ ParticleEmitter *func_803866D8(s32 a0) return ptr; } -void SM_CRCs_are_valid(Actor *this) +void func_80386780(Actor *this) { func_802D4AC0(this, 0x8000C6, 0xC7); } @@ -376,7 +376,7 @@ void func_80386D20(Actor *this) func_802D4A9C(this, 0); } -void chwasp_setState(void) +void func_80386D40(void) { func_802D68F0(0xC); item_set(ITEM_6_HOURGLASS, TRUE); @@ -442,7 +442,7 @@ void func_80386D78(Actor *this) { this->unk60 = 26.0f; this->position[1] = this->unk1C[1]; func_802BAFE4(0x80); - timedFunc_set_0(3.0f, chwasp_setState); + timedFunc_set_0(3.0f, func_80386D40); } } @@ -520,7 +520,7 @@ void func_803870DC(Actor *this) { } } -Actor *func_80387560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) +Actor *lair_func_80387560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { Actor *actor = marker_getActor(marker); u32 i; @@ -853,7 +853,7 @@ void func_8038824C(Actor *this) } -void func_80388278(Actor *this) +void lair_func_80388278(Actor *this) { void func_802F9D38(s32); @@ -1145,7 +1145,7 @@ void func_80388524(Actor *this) { this->position[1] += 5.0f; if (this->unk1C[1] < this->position[1]) { func_80388404(0x36, SFX_6C_LOCKUP_CLOSING, 1.0f, 15000); - func_80388278(this); + lair_func_80388278(this); marker_despawn(this->marker); } break; @@ -1154,7 +1154,7 @@ void func_80388524(Actor *this) { this->position[1] += 5.0f; if (this->unk1C[1] < this->position[1]) { func_80388404(0x33, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 17000); - func_80388278(this); + lair_func_80388278(this); marker_despawn(this->marker); } break; @@ -1179,7 +1179,7 @@ void func_80388524(Actor *this) { this->position[1] += 5.0f; if (this->unk1C[1] < this->position[1]) { func_80388404(0x38, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 17000); - func_80388278(this); + lair_func_80388278(this); marker_despawn(this->marker); } break; @@ -1196,7 +1196,7 @@ void func_80388524(Actor *this) { this->position[1] += 3.2; if (this->unk1C[1] <= this->position[1]) { func_80388404(0x39, SFX_6C_LOCKUP_CLOSING, 1.0f, 20000); - func_80388278(this); + lair_func_80388278(this); marker_despawn(this->marker); } break; @@ -1206,7 +1206,7 @@ void func_80388524(Actor *this) { sp28 = func_80326EEC(0x236); this->unk1C[0] += 3.6; if (this->unk1C[0] > 250.0f) { - func_80388278(this); + lair_func_80388278(this); marker_despawn(this->marker); marker_despawn(sp28->marker); func_80320004(0x35, TRUE); @@ -1299,7 +1299,7 @@ void func_80388FC8(Actor *this) } } -void func_80389204(Actor *this) +void lair_func_80389204(Actor *this) { func_802D3D74(this); @@ -1399,7 +1399,7 @@ void func_803893B8(Actor *this) } } -void func_803894B0(Actor *this) +void lair_func_803894B0(Actor *this) { void func_802EE2E8(Actor *, s32, s32, s32, f32, f32, f32); func_802D3D74(this); @@ -1511,7 +1511,7 @@ void func_80389898(Actor *this) if (this->unk10_12) { func_80328AC8(this, 0x13); - func_803298AC(this); + actor_playAnimationOnce(this); func_80320004(BKPROG_9E_CRYPT_COFFIN_LID_OPEN, TRUE); } @@ -1561,7 +1561,7 @@ void func_80389934(Actor *this) if (--this->unk1C[0] == 0) { func_80328AC8(this, 0x17); - func_803298AC(this); + actor_playAnimationOnce(this); FUNC_8030E624(SFX_3F6_UNKNOWN, 0.6f, 32000); func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7FFF); } @@ -1766,7 +1766,7 @@ void func_8038A064(Actor *this) func_80389FA8(this, BKPROG_C5_RAREWARE_BOX_BROKEN); } -void func_8038A084(Actor *this) +void lair_func_8038A084(Actor *this) { func_80389FA8(this, BKPROG_CD_GRATE_TO_WATER_SWITCH_3_OPEN); } @@ -1776,7 +1776,7 @@ void func_8038A0A4(Actor *this) func_80389FA8(this, BKPROG_CE_GRATE_TO_MMM_PUZZLE_OPEN); } -void func_8038A0C4(void) +void lair_func_8038A0C4(void) { spawnableActorList_add(&D_80392F40, actor_new, 0x18628); spawnableActorList_add(&D_80392F64, actor_new, 0x18608); @@ -1847,5 +1847,5 @@ void func_8038A0C4(void) spawnableActorList_add(&D_80394CF0, actor_new, 0x80508); spawnableActorList_add(&D_80394C94, actor_new, 0x500); spawnableActorList_add(&D_80393354, actor_new, 0x8602); - spawnableActorList_add(&D_80392D90, actor_new, 0x20000); + spawnableActorList_add(&lair_D_80392D90, actor_new, 0x20000); } diff --git a/src/lair/code_42A0.c b/src/lair/code_42A0.c index 96b276cc..1fc46a3a 100644 --- a/src/lair/code_42A0.c +++ b/src/lair/code_42A0.c @@ -71,7 +71,7 @@ void func_8038A730(Actor *this, f32 *arg1, enum sfx_e arg2, enum sfx_e arg3, u32 } } -void func_8038A864(Actor *this) { +void lair_func_8038A864(Actor *this) { switch (this->state) { case 2: func_8038A730(this, D_80393670, SFX_3F_CAULDRON_SQEAK_1, SFX_40_CAULDRON_SQEAK_2, 11000); @@ -172,7 +172,7 @@ void func_8038ADC0(ActorMarker *marker, enum asset_e text_id, s32 arg2){ func_80320004(0xF3, TRUE); } -bool func_8038ADF0(s32 arg0, s32 arg1) { +bool lair_func_8038ADF0(s32 arg0, s32 arg1) { s32 phi_v1; phi_v1 = arg1 - arg0; @@ -192,7 +192,7 @@ void func_8038AE2C(Actor *this) { s32 sp38; f32 sp34; - func_8038A864(this); + lair_func_8038A864(this); if (!this->unk16C_4) { sp50 = FALSE; this->unk16C_4 = TRUE; @@ -375,8 +375,8 @@ void func_8038AE2C(Actor *this) { } func_8038AC7C(this); sp38 = func_80329784(this); - if( func_8038ADF0(sp38, (s32) this->velocity[0]) - || func_8038ADF0((s32) this->velocity[0], sp38) + if( lair_func_8038ADF0(sp38, (s32) this->velocity[0]) + || lair_func_8038ADF0((s32) this->velocity[0], sp38) ) { this->yaw_ideal = (f32) sp38; } diff --git a/src/lair/code_5640.c b/src/lair/code_5640.c index f105238a..0fd68237 100644 --- a/src/lair/code_5640.c +++ b/src/lair/code_5640.c @@ -29,7 +29,7 @@ void func_8038BA30(ActorMarker *marker, enum asset_e text_id, s32 arg2){ func_80320424(0x20 + this->unkF4_8*6 + phi_v1, 2); } -void func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){ +void lair_func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){ Actor *this; this = marker_getActor(marker); @@ -44,7 +44,7 @@ void func_8038BADC(ActorMarker *marker, enum asset_e text_id, s32 arg2) { if (text_id == ((ActorLocal_lair_5640 *)&this->local)->unk0 + 2) { if (!func_8031FF1C(this->unkF4_8 + 0xE8)) { if (item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL)) { - func_80311480(0x10A2, 0xF, this->position, this->marker, func_8038BADC, func_8038BA88); + func_80311480(0x10A2, 0xF, this->position, this->marker, func_8038BADC, lair_func_8038BA88); return; } } diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index a84bbbeb..f8472ecc 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -48,7 +48,7 @@ enum FF_Action /* .h */ void func_8038D670(enum FF_Action next_state);// ff_set_state -void func_8038C6BC(void); +void lair_func_8038C6BC(void); /* extern */ extern void func_802FACA4(enum item_e); @@ -114,7 +114,7 @@ extern struct { /* .code */ // FF: get total number of questions per type -s16 func_8038C2C0(enum ff_question_type_e type) +s16 lair_func_8038C2C0(enum ff_question_type_e type) { return FF_QuestionTypeInfoArr[type].totalQuestionCount; } @@ -129,13 +129,13 @@ void func_8038C2D4(enum ff_question_type_e type) } // FF: set isAsked flag for type and question -void func_8038C338(enum ff_question_type_e type, s32 questionIdx, int val) +void lair_func_8038C338(enum ff_question_type_e type, s32 questionIdx, int val) { func_803208C0(FF_QuestionTypeInfoArr[type].startingFlagIdx + questionIdx, val); } // FF: get isAsked flag for type and question -int func_8038C370(enum ff_question_type_e type, s32 questionIdx) +int lair_func_8038C370(enum ff_question_type_e type, s32 questionIdx) { return func_803207F0(FF_QuestionTypeInfoArr[type].startingFlagIdx + questionIdx); } @@ -148,7 +148,7 @@ void func_8038C3A0(u32 a0, BKVtxRef *a1, Vtx *a2, Struct_lair_5ED0_0 *a3) a2->v.cn[2] = a1->v.v.cn[2] * a3->unk10; } -void *func_8038C5B8(s32 a0) +void *lair_func_8038C5B8(s32 a0) { Struct_lair_5ED0_0 *ptr; @@ -169,25 +169,25 @@ void *func_8038C5B8(s32 a0) return ptr; } -void func_8038C610(s32 a0) +void lair_func_8038C610(s32 a0) { func_8034DEB4(func_8034C528(a0 + 200), -3000); } -void func_8038C640(s32 a0, Struct_lair_5ED0_0 *a1) +void lair_func_8038C640(s32 a0, Struct_lair_5ED0_0 *a1) { s32 i; for (i = 0; i < ARRLEN(a1->unk0); i++) if (a1->unk0[i]) - func_8038C610(a1->unk0[i]); + lair_func_8038C610(a1->unk0[i]); a1->unk9 = 1; func_803208C0(a0 - FF_QNF_CNT, TRUE); } -void func_8038C6BC(void) +void lair_func_8038C6BC(void) { s32 s1, s3; @@ -202,7 +202,7 @@ void func_8038C6BC(void) if (ptr->unk9 == s3) { ptr->unk10 = 0.95f; - func_8038C640(s1, ptr); + lair_func_8038C640(s1, ptr); } else { @@ -260,7 +260,7 @@ void func_8038CC10(void) func_8030E2C4(D_8037DCB8->UNK_18); } -void func_8038CC9C(void) +void lair_func_8038CC9C(void) { if (!D_8037DCB8->UNK_18) return; @@ -283,7 +283,7 @@ void func_8038CCEC(void) func_802C5994(); } -void func_8038CD48(void) +void lair_func_8038CD48(void) { if (D_8037DCB8 == NULL) return; @@ -301,7 +301,7 @@ void func_8038CD48(void) D_8037DCB8->unk20 = NULL; if (D_8037DCB8->UNK_18) - func_8038CC9C(); + lair_func_8038CC9C(); if (!func_803203FC(1) && !func_803203FC(2)) func_803204E4(0, FALSE); @@ -344,7 +344,7 @@ void func_8038CE28(void) func_8038BC24(); } -void func_8038CF18(void) +void lair_func_8038CF18(void) { s32 i; @@ -368,7 +368,7 @@ void func_8038CF18(void) func_803463F4(ITEM_27_JOKER_CARD, func_80345FA0(ITEM_27_JOKER_CARD) * -1); } - func_8038C6BC(); + lair_func_8038C6BC(); ptr = D_8037DCB8->unk48->data; @@ -576,10 +576,10 @@ void func_8038D548(s32 a0) s32 s0; for (s0 = FF_QNF_START; s0 != FF_QNF_END; s0++) - func_8038C610(s0); + lair_func_8038C610(s0); if (a0) - func_8038C610(296); + lair_func_8038C610(296); } void func_8038D5A0(void) @@ -589,7 +589,7 @@ void func_8038D5A0(void) for (s0 = FF_QNF_START; s0 != FF_QNF_END; s0++, ptr++) { - func_8038C610(s0); + lair_func_8038C610(s0); ptr->unk9 = 1; @@ -679,10 +679,10 @@ void func_8038D670(enum FF_Action next_state) { case FFA_6_TRIGGER_QUESTION_POST_EFFECTS: //L8038D940 func_8038D48C(); if (D_8037DCB8->unkF == 1) { - func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); - func_8038C338(D_8037DCB8->ffQuestionType, D_8037DCB8->unkC, 1); + lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); + lair_func_8038C338(D_8037DCB8->ffQuestionType, D_8037DCB8->unkC, 1); D_8037DCB8->unk3C[D_8037DCB8->ffQuestionType]++; - if (func_8038C2C0(D_8037DCB8->ffQuestionType) == D_8037DCB8->unk3C[D_8037DCB8->ffQuestionType]) { + if (lair_func_8038C2C0(D_8037DCB8->ffQuestionType) == D_8037DCB8->unk3C[D_8037DCB8->ffQuestionType]) { D_8037DCB8->unk3C[D_8037DCB8->ffQuestionType] = 0; func_8038C2D4(D_8037DCB8->ffQuestionType); } @@ -723,7 +723,7 @@ void func_8038D670(enum FF_Action next_state) { } if (D_8037DCB8->unk4->unk8 >= 7) { func_803208C0(func_8038D60C(D_8037DCB8->unk8), TRUE); - func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); + lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); } if (func_803203FC(0xA3)) { func_80356540(0xA4); @@ -816,10 +816,10 @@ void func_8038DE34(enum ff_question_type_e type) do { // Generate random question index in the valid range for the type - randQuestionIdx = randi2(0, func_8038C2C0(type)); + randQuestionIdx = randi2(0, lair_func_8038C2C0(type)); // Try again if question already asked - } while (func_8038C370(type, randQuestionIdx)); + } while (lair_func_8038C370(type, randQuestionIdx)); // Save to storage struct D_8037DCB8->unkC = randQuestionIdx; @@ -850,7 +850,7 @@ void func_8038DE34(enum ff_question_type_e type) } // Try again if question already asked - } while (func_8038C370(type, D_8037DCB8->unkC)); + } while (lair_func_8038C370(type, D_8037DCB8->unkC)); } } @@ -866,7 +866,7 @@ void func_8038DFBC(void) timed_playSfx(0.75f, 0x51, 0.5f, 32760); timedFunc_set_0(1.0f, func_8038CC10); - timedFunc_set_0(2.2f, func_8038CC9C); + timedFunc_set_0(2.2f, lair_func_8038CC9C); } void func_8038E070(void) @@ -876,7 +876,7 @@ void func_8038E070(void) func_8028F918(2); } -void func_8038E0B0(void) { +void lair_func_8038E0B0(void) { s32 sp48[6]; //buttons s32 temp_v0; s32 sp3C[2]; //joystick @@ -900,7 +900,7 @@ void func_8038E0B0(void) { } } D_8037DCB8->unk8 = temp_v0; - D_8037DCB8->unk4 = func_8038C5B8(D_8037DCB8->unk8); + D_8037DCB8->unk4 = lair_func_8038C5B8(D_8037DCB8->unk8); } sp38 = MIN((D_8037DCB8->unk8 != 0) ? D_8037DCB8->unk4->unk8 : -1, FFTT_7_JOKER); if ((D_8037DCB8->unk8 != 0) && (D_8037DCB8->unk4->unk9 == 0) && func_8028F20C()) { @@ -983,7 +983,7 @@ void func_8038E0B0(void) { } if (func_8028EFC8() && (sp48[FACE_BUTTON(BUTTON_B)] == 1)) { if ((item_getCount(ITEM_27_JOKER_CARD) > 0) && (sp28 < 0x5B)) { - func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); + lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); item_dec(ITEM_27_JOKER_CARD); func_8030E6D4(SFX_3EA_UNKNOWN); func_80356540(0xA9); @@ -997,7 +997,7 @@ void func_8038E0B0(void) { } } else { if (D_8037DCB8->unk4->unk9 == 2) { - func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); + lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); } } break; @@ -1053,7 +1053,7 @@ void func_8038E0B0(void) { } } -void func_8038E768(Gfx **dl, Mtx **m, Vtx **v) +void lair_func_8038E768(Gfx **dl, Mtx **m, Vtx **v) { if (map_get() != MAP_8E_GL_FURNACE_FUN) return; diff --git a/src/lair/code_86F0.c b/src/lair/code_86F0.c index d5024df2..dcc42ba1 100644 --- a/src/lair/code_86F0.c +++ b/src/lair/code_86F0.c @@ -22,11 +22,11 @@ typedef struct { }Struct_lair_86F0_0; void func_8038F350(Actor *this, s32 next_state); -void func_8038F924(Actor *this); +void lair_func_8038F924(Actor *this); /* .data */ -ActorInfo D_803947B0 = { 0x1EB, 0x3B7, 0x48B, 0x1, NULL, func_8038F924, func_80326224, func_80325888, 0, 0, 0.0f, 0}; -ActorInfo D_803947D4 = { 0x1EB, 0x3BC, 0x538, 0x1, NULL, func_8038F924, func_80326224, func_80325888, 0, 0, 0.0f, 0}; +ActorInfo D_803947B0 = { 0x1EB, 0x3B7, 0x48B, 0x1, NULL, lair_func_8038F924, func_80326224, func_80325888, 0, 0, 0.0f, 0}; +ActorInfo D_803947D4 = { 0x1EB, 0x3BC, 0x538, 0x1, NULL, lair_func_8038F924, func_80326224, func_80325888, 0, 0, 0.0f, 0}; Struct_lair_86F0_0 D_803947F8[0xb] ={ {0x01, 0x1, 0x5D}, {0x02, 0x2, 0x5E}, @@ -373,7 +373,7 @@ void func_8038F350(Actor *this, s32 next_state){ } -void func_8038F800(Actor *this) { +void lair_func_8038F800(Actor *this) { s32 temp_v0; s32 phi_s0; @@ -385,7 +385,7 @@ void func_8038F800(Actor *this) { } } -void func_8038F894(Actor *this, s32 arg1) { +void lair_func_8038F894(Actor *this, s32 arg1) { if (item_getCount(ITEM_26_JIGGY_TOTAL) > 0) { func_8038F350(this, arg1); return; @@ -399,7 +399,7 @@ void func_8038F894(Actor *this, s32 arg1) { func_80320004(0xDE, 1); } -void func_8038F924(Actor *this) { +void lair_func_8038F924(Actor *this) { ActorLocal_lair_86F0 *local; s32 sp7C[6]; //buttons s32 phi_v1; @@ -426,7 +426,7 @@ void func_8038F924(Actor *this) { local->unk4++; local->unk0 |= (1 << func_8038F0EC(this)); } - func_8038F800(this); + lair_func_8038F800(this); marker_setCollisionScripts(this->marker, func_8038EC94, NULL, NULL); this->marker->propPtr->unk8_3 = TRUE; this->unk16C_4 = TRUE; @@ -494,11 +494,11 @@ void func_8038F924(Actor *this) { case 4: //L8038FE28 if ((func_803114C4() != 0xF7C) && (func_803114C4() != 0xF7D)) { if (sp7C[FACE_BUTTON(BUTTON_A)] == 1) { - func_8038F894(this, 5); + lair_func_8038F894(this, 5); } else if (sp7C[FACE_BUTTON(BUTTON_B)] == 1) { func_8038F350(this, 1); } else if ((sp6C[0] == 1) && func_8031FF1C(0xE0)) { - func_8038F894(this, 6); + lair_func_8038F894(this, 6); } else if (sp7C[FACE_BUTTON(BUTTON_C_DOWN)] == 1) { if (local->unk4) { func_8038F350(this, 8); diff --git a/src/lair/code_9C40.c b/src/lair/code_9C40.c index fad4dc00..690495e9 100644 --- a/src/lair/code_9C40.c +++ b/src/lair/code_9C40.c @@ -35,7 +35,7 @@ s32 func_80390084(void) { return phi_s1; } -void func_803900DC(ActorMarker *marker, enum asset_e text_id, s32 arg2){ +void lair_func_803900DC(ActorMarker *marker, enum asset_e text_id, s32 arg2){ } @@ -64,10 +64,10 @@ void func_80390174(ActorMarker *marker, s32 arg1) { sp28 = this->marker->unk14_20 - 0x16D; func_8028F94C(2, this->position); if (func_8031FF1C(sp28 + 0xAD)) { - func_80311480(sp28 + 0xF83, 0xE, this->position, this->marker, func_803900EC, func_803900DC); + func_80311480(sp28 + 0xF83, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC); return; } - func_80311174(func_80390084() + 0xFA5, 0xE, this->position, this->marker, func_803900EC, func_803900DC, func_80390158); + func_80311174(func_80390084() + 0xFA5, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC, func_80390158); } void func_8039024C(Actor *this){ diff --git a/src/lair/code_AD70.c b/src/lair/code_AD70.c index b9eb12b6..5e998ad6 100644 --- a/src/lair/code_AD70.c +++ b/src/lair/code_AD70.c @@ -72,7 +72,7 @@ void func_80391160(f32 pos[3], u32 count) particleEmitter_emitN(p, count); } -void func_80391254(f32 pos[3], u32 count, enum asset_e sprite) +void lair_func_80391254(f32 pos[3], u32 count, enum asset_e sprite) { ParticleEmitter *p = partEmitList_pushNew(count); particleEmitter_setSprite(p, sprite); @@ -189,8 +189,8 @@ void func_80391810(Actor *this, s32 next_state) { break; case 2: FUNC_8030E8B4(SFX_148_GRUNTY_SPELL_LANDING, 1.0f, 20000, this->position, 1500, 3000); - func_80391254(this->position, 2, 0x4A0); - func_80391254(this->position, 2, 0x6C1); + lair_func_80391254(this->position, 2, 0x4A0); + lair_func_80391254(this->position, 2, 0x6C1); func_80391160(this->position, 4); func_8039137C(this->position, 4, 0x711); func_8039137C(this->position, 4, 0x712); diff --git a/symbol_addrs.core1.us.v10.txt b/symbol_addrs.core1.us.v10.txt index d78ba8cb..94fba6d6 100644 --- a/symbol_addrs.core1.us.v10.txt +++ b/symbol_addrs.core1.us.v10.txt @@ -136,21 +136,21 @@ alCSPPlay = 0x8025F380; alCSPSetVol = 0x8025F3B0; alCSPSetTempo = 0x8025F430; alCSPGetTempo = 0x8025F4D0; -n_alEnvmixerResampleParam = 0x802607C0; +n_alEnvmixerParam = 0x802607C0; __postNextSeqEvent = 0x80261210; -__setInstChanState = 0x802612EC; -__initFromBank = 0x802613DC; -__vsDelta = 0x80261498; -__vsVol = 0x802614BC; -__seqpReleaseVoice = 0x80261560; -__voiceNeedsNoteKill = 0x80261688; -__unmapVoice = 0x80261730; -__vsPan = 0x80261818; -__lookupVoice = 0x80261868; -__mapVoice = 0x802618DC; -__lookupSoundQuick = 0x8026194C; -__seqpStopOsc = 0x80262A88; -__initChanState = 0x80262B8C; +__n_setInstChanState = 0x802612EC; +__n_initFromBank = 0x802613DC; +__n_vsDelta = 0x80261498; +__n_vsVol = 0x802614BC; +__n_seqpReleaseVoice = 0x80261560; +__n_voiceNeedsNoteKill = 0x80261688; +__n_unmapVoice = 0x80261730; +__n_vsPan = 0x80261818; +__n_lookupVoice = 0x80261868; +__n_mapVoice = 0x802618DC; +__n_lookupSoundQuick = 0x8026194C; +__n_seqpStopOsc = 0x80262A88; +__n_initChanState = 0x80262B8C; n_alSynStartVoiceParams = 0x80262D80; n_alLoadParam = 0x80262EE0; _n_decodeChunk = 0x802630A0; @@ -189,8 +189,8 @@ osSetEventMesg = 0x80265E60; osCreateViManager = 0x80265ED0; osViSwapBuffer = 0x802663F0; osViSetEvent = 0x80266440; -osViGetNextFrameBuffer = 0x802664B0; -osViGetCurrFrameBuffer = 0x80265880; +osViGetNextFramebuffer = 0x802664B0; +osViGetCurrentFramebuffer = 0x80265880; osSetIntMask = 0x802654D0; osViBlack = 0x802664F0; guOrthoF = 0x80266560; @@ -417,7 +417,7 @@ osLeoDiskInit = 0x8026B790; LeoDiskHandle = 0x80285C60; __osDiskHandle = 0x80285CD4; __osAiDeviceBusy = 0x8026B4E0; -osAiSetNextBuf = 0x80264720; +osAiSetNextBuffer = 0x80264720; osAiSetFrequency = 0x802642D0; osViClock = 0x80277128; __osProbeTLB = 0x8026B420; diff --git a/symbol_addrs.global.us.v10.txt b/symbol_addrs.global.us.v10.txt index 1c64af3c..a0b4fc07 100644 --- a/symbol_addrs.global.us.v10.txt +++ b/symbol_addrs.global.us.v10.txt @@ -27,8 +27,8 @@ D_8037536C = 0x8037536C; __freePVoice = 0x8026AD90; __heap_align = 0x80254470; -osViGetNextFrameBuffer = 0x802664B0; -osViGetCurrFrameBuffer = 0x80265880; +osViGetNextFramebuffer = 0x802664B0; +osViGetCurrentFramebuffer = 0x80265880; __osEnqueueAndYield = 0x8026A90C; __osEnqueueThread = 0x8026AA0C; __osPopThread = 0x8026AA54; @@ -65,4 +65,8 @@ D_80392DC8 = 0x80392DC8; D_803923E4 = 0x803923E4; D_80392914 = 0x80392914; D_80394D50 = 0x80394D50; -D_803907B0 = 0x803907B0; \ No newline at end of file +D_803907B0 = 0x803907B0; +core2_TEXT_START = 0x80286F90; +ml_min_w = 0x80258948; +guLookAtReflect = 0x8024128C; +D_80392D90 = 0x80392D90; // defined:false rom:0x108A9D0 \ No newline at end of file diff --git a/undefined_syms.libultra.txt b/undefined_syms.libultra.txt index d660374c..dbbfcf74 100644 --- a/undefined_syms.libultra.txt +++ b/undefined_syms.libultra.txt @@ -5,3 +5,30 @@ osAppNMIBuffer = 0x8000031C; D_8023DA20 = 0x8023DA20; gOverlayTable = 0x803FFE10; func_8023DA20 = 0x8023DA20; + +boot_osTvType = 0x80000300; +boot_osRomBase = 0x80000308; +boot_osResetType = 0x8000030C; +boot_osAppNMIBuffer = 0x8000031C; +boot_D_8002D500 = D_8002D500; +boot_func_8023DA20 = func_8023DA20; +boot_D_8023DA20 = core1_VRAM; +boot_gOverlayTable = gOverlayTable; +boot_D_803FBE00 = D_803FBE00; +boot_D_803FFE00 = 0x803FFE00; + +boot_D_A430000C = 0xA430000C; +boot_D_A4300008 = 0xA4300008; +boot_D_A4300008 = 0xA4300008; +boot_D_A4040010 = 0xA4040010; +boot_D_A4040010 = 0xA4040010; +boot_D_A4040010 = 0xA4040010; +boot_D_A4040010 = 0xA4040010; +boot_D_A4400010 = 0xA4400010; +boot_D_A4400010 = 0xA4400010; +boot_D_A450000C = 0xA450000C; +boot_D_A450000C = 0xA450000C; +boot_D_A4800018 = 0xA4800018; +boot_D_A4800018 = 0xA4800018; +boot_D_A4600010 = 0xA4600010; +boot_D_A4600010 = 0xA4600010; diff --git a/undefined_syms.us.v10.txt b/undefined_syms.us.v10.txt index 95aff725..a018fd2e 100644 --- a/undefined_syms.us.v10.txt +++ b/undefined_syms.us.v10.txt @@ -119,11 +119,7 @@ chlmonkeyInfo = 0x80389A38; chgrublinInfo = 0x80389AB8; chjujuhitboxInfo = 0x80389AE0; chjujuInfo = 0x80389B10; -D_80389B8C = 0x80389B8C; -D_8037C38E = 0x8037C38E; - -D_80390854 = 0x80390854; bgs_D_803907B8 = 0x803907B8; bgs_D_80391190 = 0x80391190; bgs_D_80391220 = 0x80391220; @@ -142,12 +138,6 @@ D_80389A5C = 0x80389A5C; D_00001050 = 0x00001050; -n_alSynDelete = 0x8025F610; - -func_8025C29C = 0x8025C29C; -func_80324E60 = 0x80324E60; -func_80324EE4 = 0x80324EE4; -func_803298AC = 0x803298AC; func_8032886C = 0x8032886C; func_8034A754 = 0x8034A754; func_8034A7BC = 0x8034A7BC; @@ -169,4 +159,24 @@ D_80395168 = 0x80395168; D_80395170 = 0x80395170; D_80395180 = 0x80395180; D_80395118 = 0x80395118; +boot_D_80005270 = 0x80005270; +D_80392EB0 = 0x80392EB0; +D_80392E20 = 0x80392E20; +lair_D_80392D90 = 0x80392D90; +MMM_D_8038C510 = 0x8038C510; +func_803863F0 = 0x803863F0; +D_8038D6A0 = 0x8038D6A0; + +D_8038D378 = 0x8038D378; +D_8038D4DC = 0x8038D4DC; +D_8038D534 = 0x8038D534; +D_8038D590 = 0x8038D590; +D_8038D6DC = 0x8038D6DC; +D_8038D844 = 0x8038D844; +fight_D_80391A10 = 0x80391A10; +D_80392D90 = 0x80392D90; +FP_D_80392840 = 0x80392840; +core1_D_803727F4 = 0x803727F4; +__osBaseTimer = 0x80285D00; +FP_D_80392864 = 0x80392864;