diff --git a/Dockerfile b/Dockerfile index 70deb0ea4d..131ed20f1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ -FROM ubuntu:22.04 as build +FROM ubuntu:24.04 AS build + ENV TZ=UTC +ENV LANG=C.UTF-8 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \ apt-get update && \ @@ -19,15 +21,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone & apt-get clean && \ rm -rf /var/lib/apt/lists/* -RUN python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein "mapfile-parser>=1.2.1,<2.0.0" "rabbitizer>=1.0.0,<2.0.0" -RUN python3 -m pip install --upgrade attrs pycparser - -ENV LANG C.UTF-8 -RUN mkdir /oot WORKDIR /oot - RUN git config --global --add safe.directory /oot -CMD ["/bin/sh", "-c", \ - "echo 'usage:\n docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc) setup\n docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc)'"] +CMD make -j $(nproc) setup && make -j $(nproc) && tail -f /dev/null diff --git a/INSTALLATION.md b/INSTALLATION.md index 2ed24c9d49..566d24ef06 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -32,18 +32,21 @@ The build process has the following package requirements: * git * build-essential * binutils-mips-linux-gnu +* curl * python3 * python3-pip * python3-venv * libpng-dev -* gcc-mips-linux-gnu * libxml2-dev +* gcc-mips-linux-gnu + +Note: you can use another GCC as long as it target MIPS. Under Debian / Ubuntu (which we recommend using), you can install them with the following commands: ```bash sudo apt-get update -sudo apt-get install git build-essential binutils-mips-linux-gnu python3 python3-pip python3-venv libpng-dev gcc-mips-linux-gnu libxml2-dev +sudo apt-get install git build-essential binutils-mips-linux-gnu curl python3 python3-pip python3-venv libpng-dev libxml2-dev gcc-mips-linux-gnu ``` #### 2. Clone the repository diff --git a/Makefile b/Makefile index 006b59f684..6a4dac1e9f 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,8 @@ VERSION ?= hackeroot-mq N_THREADS ?= $(shell nproc) # Check code syntax with host compiler. RUN_CC_CHECK ?= 1 +# If DEBUG_OBJECTS is 1, produce additional debugging files such as objdump output or raw binaries for assets +DEBUG_OBJECTS ?= 0 # Set prefix to mips binutils binaries (mips-linux-gnu-ld => 'mips-linux-gnu-') - Change at your own risk! # In nearly all cases, not having 'mips-linux-gnu-*' binaries on the PATH indicates missing dependencies. MIPS_BINUTILS_PREFIX ?= mips-linux-gnu- @@ -70,62 +72,133 @@ ifeq ($(VERSION),ntsc-1.0) REGION ?= JP PLATFORM := N64 DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd44 + BUILD_DATE := 98-10-21 + BUILD_TIME := 04:56:31 + REVISION := 0 else ifeq ($(VERSION),ntsc-1.1) REGIONAL_CHECKSUM := 1 REGION ?= JP PLATFORM := N64 DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd44 + BUILD_DATE := 98-10-26 + BUILD_TIME := 10:58:45 + REVISION := 1 else ifeq ($(VERSION),pal-1.0) REGION ?= EU PLATFORM := N64 DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd44 + BUILD_DATE := 98-11-10 + BUILD_TIME := 14:34:22 + REVISION := 0 else ifeq ($(VERSION),ntsc-1.2) REGIONAL_CHECKSUM := 1 REGION ?= JP PLATFORM := N64 DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd44 + BUILD_DATE := 98-11-12 + BUILD_TIME := 18:17:03 + REVISION := 2 else ifeq ($(VERSION),pal-1.1) REGION ?= EU PLATFORM := N64 DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd44 + BUILD_DATE := 98-11-18 + BUILD_TIME := 17:36:49 + REVISION := 1 else ifeq ($(VERSION),gc-jp) REGION ?= JP PLATFORM := GC DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd022j + BUILD_DATE := 02-10-29 + BUILD_TIME := 23:49:53 + REVISION := 15 else ifeq ($(VERSION),gc-jp-mq) REGION ?= JP PLATFORM := GC DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd022j + BUILD_DATE := 02-10-30 + BUILD_TIME := 00:15:15 + REVISION := 15 else ifeq ($(VERSION),gc-us) REGION ?= US PLATFORM := GC DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd022j + BUILD_DATE := 02-12-19 + BUILD_TIME := 13:28:09 + REVISION := 15 else ifeq ($(VERSION),gc-us-mq) REGION ?= US PLATFORM := GC DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd022j + BUILD_DATE := 02-12-19 + BUILD_TIME := 14:05:42 + REVISION := 15 else ifeq ($(VERSION),gc-eu-mq-dbg) REGION ?= EU PLATFORM := GC DEBUG_FEATURES ?= 1 + BUILD_CREATOR := zelda@srd022j + BUILD_DATE := 03-02-21 + BUILD_TIME := 00:16:31 + REVISION := 15 else ifeq ($(VERSION),gc-eu) REGION ?= EU PLATFORM := GC DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd022j + BUILD_DATE := 03-02-21 + BUILD_TIME := 20:12:23 + REVISION := 15 else ifeq ($(VERSION),gc-eu-mq) REGION ?= EU PLATFORM := GC DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd022j + BUILD_DATE := 03-02-21 + BUILD_TIME := 20:37:19 + REVISION := 15 else ifeq ($(VERSION),gc-jp-ce) REGION ?= JP PLATFORM := GC DEBUG := 0 DEBUG_FEATURES ?= 0 + BUILD_CREATOR := zelda@srd022j + BUILD_DATE := 03-10-08 + BUILD_TIME := 21:53:00 + REVISION := 15 +else ifeq ($(VERSION),ique-cn) + COMPARE := 0 + REGION ?= US + PLATFORM := IQUE + DEBUG_FEATURES ?= 0 + BUILD_CREATOR := build@toad.routefree.com + BUILD_DATE := 03-10-22 + BUILD_TIME := 16:23:19 + REVISION := 0 else ifeq ($(VERSION),hackeroot-mq) REGION := NULL PLATFORM := GC DEBUG := 1 DEBUG_FEATURES ?= 1 + BUILD_CREATOR := none + BUILD_DATE := none + BUILD_TIME := none +ifeq ($(TARGET),iso) + REVISION := 0 +else ifeq ($(TARGET),wad) + REVISION := 0 +else + REVISION := 15 +endif else $(error Unsupported version $(VERSION)) endif @@ -150,7 +223,22 @@ EXTRACTED_DIR := extracted/$(VERSION) VENV := .venv MAKE = make -CPPFLAGS += -P -xc -fno-dollars-in-identifiers + +ifeq ($(PLATFORM),N64) + CPP_DEFINES += -DPLATFORM_N64=1 -DPLATFORM_GC=0 -DPLATFORM_IQUE=0 + LIBULTRA_VERSION := I + LIBULTRA_PATCH := 1 +else ifeq ($(PLATFORM),GC) + CPP_DEFINES += -DPLATFORM_N64=0 -DPLATFORM_GC=1 -DPLATFORM_IQUE=0 + LIBULTRA_VERSION := L + LIBULTRA_PATCH := 0 +else ifeq ($(PLATFORM),IQUE) + CPP_DEFINES += -DPLATFORM_N64=0 -DPLATFORM_GC=0 -DPLATFORM_IQUE=1 -DBBPLAYER + LIBULTRA_VERSION := L + LIBULTRA_PATCH := 0 +else +$(error Unsupported platform $(PLATFORM)) +endif # Set PACKAGE_NAME define for printing commit name ifeq ($(origin PACKAGE_NAME), undefined) @@ -186,19 +274,17 @@ endif # Converts e.g. ntsc-1.0 to NTSC_1_0 ifeq ($(VERSION),hackeroot-mq) -CPP_DEFINES += -DOOT_VERSION=GC_EU_MQ_DBG +CPP_DEFINES += -DOOT_VERSION=GC_EU_MQ_DBG -DOOT_REVISION=$(REVISION) else VERSION_MACRO := $(shell echo $(VERSION) | tr a-z-. A-Z__) -CPP_DEFINES += -DOOT_VERSION=$(VERSION_MACRO) +CPP_DEFINES += -DOOT_VERSION=$(VERSION_MACRO) -DOOT_REVISION=$(REVISION) endif CPP_DEFINES += -DOOT_REGION=REGION_$(REGION) - -ifeq ($(PLATFORM),N64) - CPP_DEFINES += -DPLATFORM_N64=1 -DPLATFORM_GC=0 -else ifeq ($(PLATFORM),GC) - CPP_DEFINES += -DPLATFORM_N64=0 -DPLATFORM_GC=1 -else - $(error Unsupported platform $(PLATFORM)) +CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\"" +CPP_DEFINES += -DLIBULTRA_VERSION=LIBULTRA_VERSION_$(LIBULTRA_VERSION) +CPP_DEFINES += -DLIBULTRA_PATCH=$(LIBULTRA_PATCH) +ifeq ($(PLATFORM),IQUE) + CPP_DEFINES += -DBBPLAYER endif ifeq ($(VERSION),hackeroot-mq) @@ -222,6 +308,7 @@ else CPP_DEFINES += -DENABLE_HACKEROOT=0 endif +ASOPTFLAGS := -O1 # Override optimization flags if using GDB @@ -255,15 +342,32 @@ endif # Detect compiler and set variables appropriately. ifeq ($(COMPILER),gcc) CC := $(MIPS_BINUTILS_PREFIX)gcc + CCAS := $(CC) -x assembler-with-cpp else $(error Unsupported compiler. Please use gcc as the COMPILER variable.) endif +# EGCS Compiler +EGCS_PREFIX := tools/egcs/$(DETECTED_OS)/ +EGCS_CC := $(EGCS_PREFIX)gcc -B $(EGCS_PREFIX) +EGCS_CCAS := $(EGCS_CC) -x assembler-with-cpp + AS := $(MIPS_BINUTILS_PREFIX)as LD := $(MIPS_BINUTILS_PREFIX)ld OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump NM := $(MIPS_BINUTILS_PREFIX)nm +STRIP := $(MIPS_BINUTILS_PREFIX)strip + +# Command to patch certain object files after they are built +POSTPROCESS_OBJ := @: + +# The default iconv on macOS has some differences from GNU iconv, so we use the Homebrew version instead +ifeq ($(UNAME_S),Darwin) + ICONV := $(shell brew --prefix)/opt/libiconv/bin/iconv +else + ICONV := iconv +endif INC := -Iinclude -Iinclude/libc -Isrc -I$(BUILD_DIR) -I. -I$(EXTRACTED_DIR) @@ -282,19 +386,19 @@ FADO := tools/fado/fado.elf PYTHON ?= $(VENV)/bin/python3 FLIPS := tools/Flips/flips GZINJECT := tools/gzinject/gzinject -CC_IDO := tools/ido_recomp/linux/5.3/cc +CC_IDO := tools/ido_recomp/$(DETECTED_OS)/5.3/cc # Command to replace $(BUILD_DIR) in some files with the build path. # We can't use the C preprocessor for this because it won't substitute inside string literals. BUILD_DIR_REPLACE := sed -e 's|$$(BUILD_DIR)|$(BUILD_DIR)|g' # Audio tools -AUDIO_EXTRACT := $(PYTHON) tools/audio_extraction.py SAMPLECONV := tools/audio/sampleconv/sampleconv SBC := tools/audio/sbc SFC := tools/audio/sfc SFPATCH := tools/audio/sfpatch ATBLGEN := tools/audio/atblgen +AFILE_SIZES := tools/audio/afile_sizes # We want linemarkers in sequence assembly files for better assembler error messages SEQ_CPP := $(CPP) -x assembler-with-cpp -fno-dollars-in-identifiers SEQ_CPPFLAGS := -D_LANGUAGE_ASEQ -DMML_VERSION=MML_VERSION_OOT $(CPP_DEFINES) -I include -I include/audio -I include/tables/sfx -I $(BUILD_DIR)/assets/audio/soundfonts @@ -306,20 +410,29 @@ CFLAGS += $(CPP_DEFINES) CPPFLAGS += $(CPP_DEFINES) CFLAGS_IDO += $(CPP_DEFINES) +# Extra debugging steps +ifeq ($(DEBUG_OBJECTS),1) + OBJDUMP_CMD = @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) + OBJCOPY_CMD = @$(OBJCOPY) -O binary $@ $(@:.o=.bin) +else + OBJDUMP_CMD = @: + OBJCOPY_CMD = @: +endif + GBI_DEFINES := -DF3DEX_GBI_2 -ifeq ($(PLATFORM),GC) +ifneq ($(PLATFORM),N64) GBI_DEFINES += -DF3DEX_GBI_PL -DGBI_DOWHILE endif ifeq ($(DEBUG_FEATURES),1) GBI_DEFINES += -DGBI_DEBUG endif -CFLAGS += $(GBI_DEFINES) - -ASFLAGS := -march=vr4300 -32 -no-pad-sections -Iinclude -I$(EXTRACTED_DIR) +CPPFLAGS += -P -xc -fno-dollars-in-identifiers $(CPP_DEFINES) +ASFLAGS += -march=vr4300 -32 -no-pad-sections -Iinclude -I$(EXTRACTED_DIR) ifeq ($(COMPILER),gcc) - CFLAGS += -G 0 -nostdinc $(INC) -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -mdivide-breaks -fno-PIC -fno-common -ffreestanding -fbuiltin -fno-builtin-sinf -fno-builtin-cosf $(CHECK_WARNINGS) -funsigned-char + CFLAGS += $(CPP_DEFINES) $(GBI_DEFINES) -G 0 -nostdinc $(INC) -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -mdivide-breaks -fno-PIC -fno-common -ffreestanding -funsigned-char -fbuiltin -fno-builtin-sinf -fno-builtin-cosf $(CHECK_WARNINGS) + CCASFLAGS += $(CPP_DEFINES) $(GBI_DEFINES) -G 0 -nostdinc $(INC) -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -fno-PIC -fno-common -Wa,-no-pad-sections MIPS_VERSION := -mips3 RUN_CC_CHECK := 0 endif @@ -443,7 +556,8 @@ O_FILES := $(foreach f,$(S_FILES:.s=.o),$(BUILD_DIR)/$f) \ $(foreach f,$(ASSET_C_FILES_EXTRACTED:.c=.o),$(f:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)) \ $(foreach f,$(ASSET_C_FILES_COMMITTED:.c=.o),$(BUILD_DIR)/$f) \ $(foreach f,$(BASEROM_BIN_FILES),$(BUILD_DIR)/baserom/$(notdir $f).o) \ - $(BUILD_DIR)/src/code/z_message_z_game_over.o + $(BUILD_DIR)/src/code/z_message_z_game_over.o \ + $(BUILD_DIR)/src/makerom/ipl3.o UCODE_PATCHES := $(wildcard F3DEX3/*.bps) UCODE_FILES := $(foreach f,$(UCODE_PATCHES:.bps=),$f) @@ -467,7 +581,8 @@ TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_PNG_EXTRACTED:.png=.inc.c),$(f: # create build directories $(shell mkdir -p $(BUILD_DIR)/baserom \ - $(BUILD_DIR)/assets/text) + $(BUILD_DIR)/assets/text \ + $(BUILD_DIR)/linker_scripts) $(shell mkdir -p $(foreach dir, \ $(SRC_DIRS) \ $(UNDECOMPILED_DATA_DIRS) \ @@ -594,10 +709,6 @@ venv: $(V)$(PYTHON) -m pip install -U -r requirements.txt $(call print,Success!) -# TODO this is a temporary rule for testing audio, to be removed -setup-audio: - $(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml - setup: venv $(call print,Setup in progress...) $(V)$(MAKE) -C tools @@ -606,9 +717,9 @@ setup: venv $(call print,Decompressing baserom: Done!) $(V)$(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom -v $(VERSION) $(V)$(PYTHON) tools/extract_incbins.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/incbin -v $(VERSION) - $(V)$(PYTHON) tools/msgdis.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION) - $(V)$(PYTHON) extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -v $(VERSION) -j$(N_THREADS) - $(V)$(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml + $(V)$(PYTHON) tools/extract_text.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION) + $(V)$(PYTHON) tools/extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -v $(VERSION) -j$(N_THREADS) + $(V)$(PYTHON) tools/extract_audio.py -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml $(call print,Extracting files: Done!) run: rom @@ -660,19 +771,30 @@ $(ROM): $(ELF) @$(PRINT) "${GREEN}OoT Version: $(BLUE)$(VERSION)$(NO_COL)\n" @$(PRINT) "${GREEN}Code Version: $(BLUE)$(PACKAGE_VERSION)$(NO_COL)\n" +ifeq ($(PLATFORM),IQUE) + COMPRESS_ARGS := --format gzip --pad-to 0x4000 + CIC = 6102 +else + COMPRESS_ARGS := --format yaz0 --pad-to 0x800000 --fill-padding-bytes + CIC = 6105 +endif + $(ROMC): $(ROM) $(ELF) $(BUILD_DIR)/compress_ranges.txt ifeq ($(COMPRESSION),yaz) - $(V)$(PYTHON) tools/compress.py --in $(ROM) --out $@ --dmadata-start `./tools/dmadata_start.sh $(NM) $(ELF)` --compress `cat $(BUILD_DIR)/compress_ranges.txt` --threads $(N_THREADS) + $(V)$(PYTHON) tools/compress.py --in $(ROM) --out $@ --dmadata-start `./tools/dmadata_start.sh $(NM) $(ELF)` --compress `cat $(BUILD_DIR)/compress_ranges.txt` --threads $(N_THREADS) $(COMPRESS_ARGS) else $(V)$(PYTHON) tools/z64compress_wrapper.py --codec $(COMPRESSION) --cache $(BUILD_DIR)/cache --threads $(N_THREADS) $< $@ $(ELF) $(BUILD_DIR)/$(SPEC) endif - $(V)$(PYTHON) -m ipl3checksum sum --cic 6105 --update $@ + $(V)$(PYTHON) -m ipl3checksum sum --cic $(CIC) --update $@ -$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(UCODE_O_FILES) $(LDSCRIPT) $(BUILD_DIR)/undefined_syms.txt \ +$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(UCODE_O_FILES) $(LDSCRIPT) $(BUILD_DIR)/linker_scripts/makerom.ld $(BUILD_DIR)/undefined_syms.txt \ $(SAMPLEBANK_O_FILES) $(SOUNDFONT_O_FILES) $(SEQUENCE_O_FILES) \ $(BUILD_DIR)/assets/audio/sequence_font_table.o $(BUILD_DIR)/assets/audio/audiobank_padding.o $(call print,Linking:,,$@) - $(V)$(LD) -T $(LDSCRIPT) -T $(BUILD_DIR)/undefined_syms.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map $(MAP) -o $@ + $(V)$(LD) -T $(LDSCRIPT) -T $(BUILD_DIR)/linker_scripts/makerom.ld -T $(BUILD_DIR)/undefined_syms.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map $(MAP) -o $@ + +$(BUILD_DIR)/linker_scripts/makerom.ld: linker_scripts/makerom.ld + $(V)$(CPP) -I include $(CPPFLAGS) $< > $@ ## Order-only prerequisites # These ensure e.g. the O_FILES are built before the OVL_RELOC_FILES. @@ -711,13 +833,19 @@ $(BUILD_DIR)/data/%.o: data/%.s $(call print,Assembling:,$<,$@) $(V)$(CPP) $(CPPFLAGS) -Iinclude $< | $(AS) $(ASFLAGS) -o $@ -$(BUILD_DIR)/assets/text/%.enc.jpn.h: assets/text/%.h $(EXTRACTED_DIR)/text/%.h assets/text/charmap.txt +ifeq ($(PLATFORM),IQUE) + NES_CHARMAP := assets/text/charmap.chn.txt +else + NES_CHARMAP := assets/text/charmap.nes.txt +endif + +$(BUILD_DIR)/assets/text/%.enc.nes.h: assets/text/%.h $(EXTRACTED_DIR)/text/%.h $(NES_CHARMAP) $(call print,Encoding:,$<,$@) - $(V)$(CPP) $(CPPFLAGS) -I$(EXTRACTED_DIR) $< | $(PYTHON) tools/msgenc.py --encoding jpn --charmap assets/text/charmap.txt - $@ + $(V)$(CPP) $(CPPFLAGS) -I$(EXTRACTED_DIR) $< | $(PYTHON) tools/msgenc.py --encoding utf-8 --charmap $(NES_CHARMAP) - $@ -$(BUILD_DIR)/assets/text/%.enc.nes.h: assets/text/%.h $(EXTRACTED_DIR)/text/%.h assets/text/charmap.txt +$(BUILD_DIR)/assets/text/%.enc.jpn.h: assets/text/%.h $(EXTRACTED_DIR)/text/%.h assets/text/charmap.jpn.txt $(call print,Encoding:,$<,$@) - $(V)$(CPP) $(CPPFLAGS) -I$(EXTRACTED_DIR) $< | $(PYTHON) tools/msgenc.py --encoding nes --charmap assets/text/charmap.txt - $@ + $(V)$(CPP) $(CPPFLAGS) -I$(EXTRACTED_DIR) $< | $(PYTHON) tools/msgenc.py --encoding SHIFT-JIS --wchar --charmap assets/text/charmap.jpn.txt - $@ # Dependencies for files including message data headers # TODO remove when full header dependencies are used. @@ -734,21 +862,34 @@ $(BUILD_DIR)/assets/text/%.o: assets/text/%.c $(V)$(OBJCOPY) -O binary --only-section .rodata $@ $@.bin $(BUILD_DIR)/assets/%.o: assets/%.c - $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< - $(OBJCOPY) -O binary $@ $@.bin + $(call print,Compiling:,$<,$@) + $(V)$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< + $(V)$(OBJCOPY_CMD) $(BUILD_DIR)/assets/%.o: $(EXTRACTED_DIR)/assets/%.c $(call print,Compiling:,$<,$@) $(V)$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< - $(V)$(OBJCOPY) -O binary $@ $@.bin + $(V)$(OBJCOPY_CMD) + +# Assemble the ROM header with GNU AS always +$(BUILD_DIR)/src/makerom/rom_header.o: src/makerom/rom_header.s + $(call print,Compiling:,$<,$@) + $(V)$(CCAS) -c $(CCASFLAGS) $(MIPS_VERSION) $(ASOPTFLAGS) -o $@ $< + $(V)$(OBJDUMP_CMD) + +$(BUILD_DIR)/src/makerom/ipl3.o: $(EXTRACTED_DIR)/incbin/ipl3 + $(call print,Compiling:,$<,$@) + $(V)$(OBJCOPY) -I binary -O elf32-big --rename-section .data=.text $< $@ $(BUILD_DIR)/src/%.o: src/%.s $(call print,Compiling:,$<,$@) - $(V)$(CPP) $(CPPFLAGS) -Iinclude $< | $(AS) $(ASFLAGS) -o $@ + $(V)$(CCAS) -c $(CCASFLAGS) $(MIPS_VERSION) $(ASOPTFLAGS) -o $@ $< + $(V)$(POSTPROCESS_OBJ) $@ + $(V)$(OBJDUMP_CMD) # Incremental link to move z_message and z_game_over data into rodata $(BUILD_DIR)/src/code/z_message_z_game_over.o: $(BUILD_DIR)/src/code/z_message.o $(BUILD_DIR)/src/code/z_game_over.o - $(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $^ + $(V)$(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $^ $(BUILD_DIR)/dmadata_table_spec.h $(BUILD_DIR)/compress_ranges.txt: $(BUILD_DIR)/$(SPEC) $(V)$(MKDMADATA) $< $(BUILD_DIR)/dmadata_table_spec.h $(BUILD_DIR)/compress_ranges.txt @@ -775,25 +916,17 @@ ifneq ($(RUN_CC_CHECK),0) endif $(call print,Compiling:,$<,$@) $(V)$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< - $(V)@$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) - -$(BUILD_DIR)/src/libultra/libc/ll.o: src/libultra/libc/ll.c -ifneq ($(RUN_CC_CHECK),0) - $(V)$(CC_CHECK) $< -endif - $(call print,Compiling:,$<,$@) - $(V)$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< - $(V)$(PYTHON) tools/set_o32abi_bit.py $@ - $(V)@$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) + $(V)$(POSTPROCESS_OBJ) $@ + $(V)$(OBJDUMP_CMD) -$(BUILD_DIR)/src/libultra/libc/llcvt.o: src/libultra/libc/llcvt.c +$(BUILD_DIR)/src/audio/session_init.o: src/audio/session_init.c $(BUILD_DIR)/assets/audio/soundfont_sizes.h $(BUILD_DIR)/assets/audio/sequence_sizes.h ifneq ($(RUN_CC_CHECK),0) $(V)$(CC_CHECK) $< endif $(call print,Compiling:,$<,$@) - $(V)$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< - $(V)$(PYTHON) tools/set_o32abi_bit.py $@ - $(V)@$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) + $(V)$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $(@:.o=.tmp) $< + $(V)$(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $(@:.o=.tmp) + $(V)$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) $(BUILD_DIR)/src/overlays/%_reloc.o: $(BUILD_DIR)/$(SPEC) $(call print,Generating Relocation:,$<,$@) @@ -801,19 +934,19 @@ $(BUILD_DIR)/src/overlays/%_reloc.o: $(BUILD_DIR)/$(SPEC) $(V)$(AS) $(ASFLAGS) $(@:.o=.s) -o $@ $(BUILD_DIR)/assets/%.inc.c: assets/%.png - $(ZAPD) btex -eh -tt $(subst .,,$(suffix $*)) -i $< -o $@ + $(V)$(ZAPD) btex -eh -tt $(subst .,,$(suffix $*)) -i $< -o $@ $(BUILD_DIR)/assets/%.inc.c: $(EXTRACTED_DIR)/assets/%.png $(V)$(ZAPD) btex -eh -tt $(subst .,,$(suffix $*)) -i $< -o $@ $(BUILD_DIR)/assets/%.bin.inc.c: assets/%.bin - $(ZAPD) bblb -eh -i $< -o $@ + $(V)$(ZAPD) bblb -eh -i $< -o $@ $(BUILD_DIR)/assets/%.bin.inc.c: $(EXTRACTED_DIR)/assets/%.bin $(V)$(ZAPD) bblb -eh -i $< -o $@ $(BUILD_DIR)/assets/%.jpg.inc.c: assets/%.jpg - $(ZAPD) bren -eh -i $< -o $@ + $(V)$(ZAPD) bren -eh -i $< -o $@ $(BUILD_DIR)/assets/%.jpg.inc.c: $(EXTRACTED_DIR)/assets/%.jpg $(V)$(ZAPD) bren -eh -i $< -o $@ @@ -915,7 +1048,8 @@ $(BUILD_DIR)/assets/audio/soundfonts/%.o: $(BUILD_DIR)/assets/audio/soundfonts/% # patch defined symbols to be ABS symbols so that they remain file-relative offsets forever $(SFPATCH) $(@:.o=.tmp2) $(@:.o=.tmp2) # write start and size symbols afterwards, filename != symbolic name so source symbolic name from the .name file written by sfc - $(OBJCOPY) --add-symbol $$(cat $(<:.c=.name))_Start=.rodata:0,global --redefine-sym __LEN__=$$(cat $(<:.c=.name))_Size $(@:.o=.tmp2) $@ +# also write a .note.name section containing the symbolic name of the soundfont + $(OBJCOPY) --add-symbol $$(cat $(<:.c=.name) | tr -d '\0')_Start=.rodata:0,global --redefine-sym __LEN__=$$(cat $(<:.c=.name) | tr -d '\0')_Size --add-section .note.name=$(<:.c=.name) $(@:.o=.tmp2) $@ # cleanup temp files @$(RM) $(@:.o=.tmp) $(@:.o=.tmp2) ifeq ($(AUDIO_BUILD_DEBUG),1) @@ -975,6 +1109,14 @@ endif $(BUILD_DIR)/assets/audio/sequence_font_table.o: $(BUILD_DIR)/assets/audio/sequence_font_table.s $(AS) $(ASFLAGS) $< -o $@ +# make headers with file sizes and amounts + +$(BUILD_DIR)/assets/audio/soundfont_sizes.h: $(SOUNDFONT_O_FILES) + $(AFILE_SIZES) $@ NUM_SOUNDFONTS SOUNDFONT_SIZES .rodata $^ + +$(BUILD_DIR)/assets/audio/sequence_sizes.h: $(SEQUENCE_O_FILES) + $(AFILE_SIZES) $@ NUM_SEQUENCES SEQUENCE_SIZES .data $^ + # Extra audiobank padding that doesn't belong to any soundfont file $(BUILD_DIR)/assets/audio/audiobank_padding.o: echo ".section .rodata; .fill 0x20" | $(AS) $(ASFLAGS) -o $@ diff --git a/assets/audio/sequences/seq_109.prg.seq b/assets/audio/sequences/seq_109.prg.seq index 49b0dfb606..ee3e8e0aa4 100644 --- a/assets/audio/sequences/seq_109.prg.seq +++ b/assets/audio/sequences/seq_109.prg.seq @@ -1149,7 +1149,7 @@ ENVELOPE_08BA: point 20, 20000 hang -#if OOT_VERSION == NTSC_1_2 || PLATFORM_GC +#if OOT_VERSION == NTSC_1_2 || !PLATFORM_N64 .filter FILTER_0932 filter 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/assets/text/charmap.chn.txt b/assets/text/charmap.chn.txt new file mode 100644 index 0000000000..08d4d451df --- /dev/null +++ b/assets/text/charmap.chn.txt @@ -0,0 +1,1823 @@ +# Determines how certain text sequences should be encoded for the CHN text encoding. +{ + '\n' : 0x01, + + '[A]' : 0xAA9F, + '[B]' : 0xAAA0, + '[C]' : 0xAAA1, + '[L]' : 0xAAA2, + '[R]' : 0xAAA3, + '[Z]' : 0xAAA4, + '[C-Up]' : 0xAAA5, + '[C-Down]' : 0xAAA6, + '[C-Left]' : 0xAAA7, + '[C-Right]' : 0xAAA8, + '▼' : 0xAAA9, + '[Control-Pad]' : 0xAAAA, + + 'À' : 0x80, + 'î' : 0x81, + 'Â' : 0x82, + 'Ä' : 0x83, + 'Ç' : 0x84, + 'È' : 0x85, + 'É' : 0x86, + 'Ê' : 0x87, + 'Ë' : 0x88, + 'Ï' : 0x89, + 'Ô' : 0x8A, + 'Ö' : 0x8B, + 'Ù' : 0x8C, + 'Û' : 0x8D, + 'Ü' : 0x8E, + 'ß' : 0x8F, + 'à' : 0x90, + 'á' : 0x91, + 'â' : 0x92, + 'ä' : 0x93, + 'ç' : 0x94, + 'è' : 0x95, + 'é' : 0x96, + 'ê' : 0x97, + 'ë' : 0x98, + 'ï' : 0x99, + 'ô' : 0x9A, + 'ö' : 0x9B, + 'ù' : 0x9C, + 'û' : 0x9D, + 'ü' : 0x9E, + + # Unfortunately the CN codepoint map does not correspond to any standard encoding, + # characters were added in the order they were needed in the text. The order is + # reproduced here. + '你' : 0xA08C, + '借' : 0xA08D, + '到' : 0xA08E, + '了' : 0xA08F, + '一' : 0xA090, + '颗' : 0xA091, + '口' : 0xA092, + '袋' : 0xA093, + '鸡' : 0xA094, + '蛋' : 0xA095, + '过' : 0xA096, + '夜' : 0xA097, + '后' : 0xA098, + '就' : 0xA099, + '会' : 0xA09A, + '孵' : 0xA09B, + '出' : 0xA09C, + '只' : 0xA09D, + '，' : 0xA09E, + '用' : 0xA09F, + '完' : 0xA0A0, + '别' : 0xA0A1, + '忘' : 0xA0A2, + '记' : 0xA0A3, + '把' : 0xA0A4, + '它' : 0xA0A5, + '还' : 0xA0A6, + '回' : 0xA0A7, + '去' : 0xA0A8, + '。' : 0xA0A9, + '归' : 0xA0AA, + '得' : 0xA0AB, + '克' : 0xA0AC, + '洛' : 0xA0AD, + '！' : 0xA0AE, + '与' : 0xA0AF, + '不' : 0xA0B0, + '同' : 0xA0B1, + '很' : 0xA0B2, + '少' : 0xA0B3, + '啼' : 0xA0B4, + '叫' : 0xA0B5, + '个' : 0xA0B6, + '奇' : 0xA0B7, + '异' : 0xA0B8, + '蘑' : 0xA0B9, + '菇' : 0xA0BA, + '新' : 0xA0BB, + '鲜' : 0xA0BC, + '的' : 0xA0BD, + '都' : 0xA0BE, + '容' : 0xA0BF, + '易' : 0xA0C0, + '变' : 0xA0C1, + '质' : 0xA0C2, + '快' : 0xA0C3, + '拿' : 0xA0C4, + '卡' : 0xA0C5, + '利' : 0xA0C6, + '科' : 0xA0C7, + '药' : 0xA0C8, + '店' : 0xA0C9, + '吧' : 0xA0CA, + '之' : 0xA0CB, + '知' : 0xA0CC, + '道' : 0xA0CD, + '这' : 0xA0CE, + '两' : 0xA0CF, + '人' : 0xA0D0, + '间' : 0xA0D1, + '发' : 0xA0D2, + '生' : 0xA0D3, + '什' : 0xA0D4, + '么' : 0xA0D5, + '事' : 0xA0D6, + '但' : 0xA0D7, + '带' : 0xA0D8, + '迷' : 0xA0D9, + '失' : 0xA0DA, + '森' : 0xA0DB, + '林' : 0xA0DC, + '物' : 0xA0DD, + '原' : 0xA0DE, + '主' : 0xA0DF, + '偷' : 0xA0E0, + '猎' : 0xA0E1, + '者' : 0xA0E2, + '锯' : 0xA0E3, + '定' : 0xA0E4, + '是' : 0xA0E5, + '那' : 0xA0E6, + '年' : 0xA0E7, + '轻' : 0xA0E8, + '留' : 0xA0E9, + '下' : 0xA0EA, + '炸' : 0xA0EB, + '弹' : 0xA0EC, + '枚' : 0xA0ED, + '卢' : 0xA0EE, + '比' : 0xA0EF, + '买' : 0xA0F0, + '德' : 0xA0F1, + '库' : 0xA0F2, + '子' : 0xA0F3, + '可' : 0xA0F4, + '以' : 0xA0F5, + '装' : 0xA0F6, + '弓' : 0xA0F7, + '换' : 0xA0F8, + '破' : 0xA0F9, + '损' : 0xA0FA, + '格' : 0xA0FB, + '雷' : 0xA0FC, + '剑' : 0xA0FD, + '大' : 0xA0FE, + '城' : 0xA0FF, + '修' : 0xA100, + '好' : 0xA101, + '交' : 0xA102, + '处' : 0xA103, + '方' : 0xA104, + '见' : 0xA105, + '卓' : 0xA106, + '拉' : 0xA107, + '王' : 0xA108, + '⋯' : 0xA109, # TODO this isn't quite the same width as everything else.. + '兑' : 0xA10A, + '券' : 0xA10B, + '急' : 0xA10C, + '切' : 0xA10D, + '地' : 0xA10E, + '希' : 0xA10F, + '望' : 0xA110, + '点' : 0xA111, + '铸' : 0xA112, + '卖' : 0xA113, + '掉' : 0xA114, + '巨' : 0xA115, + '刀' : 0xA116, + '铁' : 0xA117, + '匠' : 0xA118, + '师' : 0xA119, + '所' : 0xA11A, + '造' : 0xA11B, + '坚' : 0xA11C, + '摧' : 0xA11D, + '卷' : 0xA11E, + '眼' : 0xA11F, + '青' : 0xA120, + '蛙' : 0xA121, + '趁' : 0xA122, + '凉' : 0xA123, + '海' : 0xA124, + '鲁' : 0xA125, + '湖' : 0xA126, + '世' : 0xA127, + '上' : 0xA128, + '最' : 0xA129, + '水' : 0xA12A, + '在' : 0xA12B, + '前' : 0xA12C, + '送' : 0xA12D, + '蠃' : 0xA12E, + '啦' : 0xA12F, + '骷' : 0xA130, + '髅' : 0xA131, + '面' : 0xA132, + '具' : 0xA133, + '按' : 0xA134, + '戴' : 0xA135, + '试' : 0xA136, + '看' : 0xA137, + '着' : 0xA138, + '真' : 0xA139, + '像' : 0xA13A, + '怪' : 0xA13B, + '恐' : 0xA13C, + '怖' : 0xA13D, + '吓' : 0xA13E, + '基' : 0xA13F, + '顿' : 0xA140, + '受' : 0xA141, + '欢' : 0xA142, + '迎' : 0xA143, + '哦' : 0xA144, + '兔' : 0xA145, + '兜' : 0xA146, + '帽' : 0xA147, + '长' : 0xA148, + '耳' : 0xA149, + '朵' : 0xA14A, + '太' : 0xA14B, + '爱' : 0xA14C, + '让' : 0xA14D, + '头' : 0xA14E, + '起' : 0xA14F, + '来' : 0xA150, + '有' : 0xA151, + '女' : 0xA152, + '孩' : 0xA153, + '？' : 0xA154, + '理' : 0xA155, + '更' : 0xA156, + '多' : 0xA157, + '我' : 0xA158, + '们' : 0xA159, + '娱' : 0xA15A, + '乐' : 0xA15B, + '中' : 0xA15C, + '心' : 0xA15D, + '：' : 0xA15E, + '保' : 0xA15F, + '龄' : 0xA160, + '球' : 0xA161, + '场' : 0xA162, + '想' : 0xA163, + '奖' : 0xA164, + '品' : 0xA165, + '吗' : 0xA166, + '秘' : 0xA167, + '密' : 0xA168, + '付' : 0xA169, + '钱' : 0xA16A, + '才' : 0xA16B, + '告' : 0xA16C, + '诉' : 0xA16D, + '玩' : 0xA16E, + '次' : 0xA16F, + '要' : 0xA170, + '瞄' : 0xA171, + '准' : 0xA172, + '洞' : 0xA173, + '放' : 0xA174, + '鼠' : 0xA175, + '十' : 0xA176, + '机' : 0xA177, + '预' : 0xA178, + '备' : 0xA179, + '开' : 0xA17A, + '始' : 0xA17B, + '再' : 0xA17C, + '差' : 0xA17D, + '（' : 0xA17E, + '）' : 0xA17F, + '捡' : 0xA180, + '扔' : 0xA181, + '没' : 0xA182, + '能' : 0xA183, + '恢' : 0xA184, + '复' : 0xA185, + '正' : 0xA186, + '常' : 0xA187, + '请' : 0xA188, + '救' : 0xA189, + '其' : 0xA18A, + '他' : 0xA18B, + '兄' : 0xA18C, + '弟' : 0xA18D, + '给' : 0xA18E, + '励' : 0xA18F, + '诅' : 0xA190, + '咒' : 0xA191, + '解' : 0xA192, + '除' : 0xA193, + '谢' : 0xA194, + '报' : 0xA195, + '呀' : 0xA196, + '啊' : 0xA197, + '被' : 0xA198, + '小' : 0xA199, + '消' : 0xA19A, + '灭' : 0xA19B, + '蜘' : 0xA19C, + '蛛' : 0xA19D, + '已' : 0xA19E, + '经' : 0xA19F, + '减' : 0xA1A0, + '弱' : 0xA1A1, + '富' : 0xA1A2, + '办' : 0xA1A3, + '法' : 0xA1A4, + '越' : 0xA1A5, + '些' : 0xA1A6, + '验' : 0xA1A7, + '帮' : 0xA1A8, + '助' : 0xA1A9, + '寻' : 0xA1AA, + '找' : 0xA1AB, + '首' : 0xA1AC, + '先' : 0xA1AD, + '晚' : 0xA1AE, + '行' : 0xA1AF, + '动' : 0xA1B0, + '第' : 0xA1B1, + '二' : 0xA1B2, + '住' : 0xA1B3, + '喜' : 0xA1B4, + '松' : 0xA1B5, + '柔' : 0xA1B6, + '土' : 0xA1B7, + '壤' : 0xA1B8, + '仔' : 0xA1B9, + '细' : 0xA1BA, + '观' : 0xA1BB, + '察' : 0xA1BC, + '周' : 0xA1BD, + '围' : 0xA1BE, + '全' : 0xA1BF, + '靠' : 0xA1C0, + '成' : 0xA1C1, + '样' : 0xA1C2, + '因' : 0xA1C3, + '为' : 0xA1C4, + '种' : 0xA1C5, + '界' : 0xA1C6, + '每' : 0xA1C7, + '现' : 0xA1C8, + '徽' : 0xA1C9, + '章' : 0xA1CA, + '收' : 0xA1CB, + '集' : 0xA1CC, + '作' : 0xA1CD, + '战' : 0xA1CE, + '绩' : 0xA1CF, + '证' : 0xA1D0, + '明' : 0xA1D1, + '征' : 0xA1D2, + '途' : 0xA1D3, + '状' : 0xA1D4, + '态' : 0xA1D5, + '窗' : 0xA1D6, + '此' : 0xA1D7, + '图' : 0xA1D8, + '标' : 0xA1D9, + '旁' : 0xA1DA, + '边' : 0xA1DB, + '数' : 0xA1DC, + '字' : 0xA1DD, + '显' : 0xA1DE, + '示' : 0xA1DF, + '目' : 0xA1E0, + '量' : 0xA1E1, + '如' : 0xA1E2, + '果' : 0xA1E3, + '区' : 0xA1E4, + '名' : 0xA1E5, + '说' : 0xA1E6, + '里' : 0xA1E7, + '家' : 0xA1E8, + '族' : 0xA1E9, + '身' : 0xA1EA, + '感' : 0xA1EB, + '止' : 0xA1EC, + '错' : 0xA1ED, + '担' : 0xA1EE, + '需' : 0xA1EF, + '箭' : 0xA1F0, + '关' : 0xA1F1, + '系' : 0xA1F2, + '强' : 0xA1F3, + '迫' : 0xA1F4, + '游' : 0xA1F5, + '戏' : 0xA1F6, + '著' : 0xA1F7, + '射' : 0xA1F8, + '击' : 0xA1F9, + '从' : 0xA1FA, + '台' : 0xA1FB, + '够' : 0xA1FC, + '五' : 0xA1FD, + '支' : 0xA1FE, + '武' : 0xA1FF, + '器' : 0xA200, + '争' : 0xA201, + '取' : 0xA202, + '祝' : 0xA203, + '运' : 0xA204, + '堆' : 0xA205, + '软' : 0xA206, + '泥' : 0xA207, + '精' : 0xA208, + '灵' : 0xA209, + '选' : 0xA20A, + '择' : 0xA20B, + '或' : 0xA20C, + '键' : 0xA20D, + '并' : 0xA20E, + '立' : 0xA20F, + '即' : 0xA210, + '时' : 0xA211, + '举' : 0xA212, + '置' : 0xA213, + '跑' : 0xA214, + '投' : 0xA215, + '掷' : 0xA216, + '疑' : 0xA217, + '型' : 0xA218, + '甚' : 0xA219, + '至' : 0xA21A, + '飞' : 0xA21B, + '檐' : 0xA21C, + '走' : 0xA21D, + '壁' : 0xA21E, + '闪' : 0xA21F, + '光' : 0xA220, + '使' : 0xA221, + '敌' : 0xA222, + '眩' : 0xA223, + '晕' : 0xA224, + '旋' : 0xA225, + '镖' : 0xA226, + '攻' : 0xA227, + '远' : 0xA228, + '短' : 0xA229, + '钩' : 0xA22A, + '条' : 0xA22B, + '力' : 0xA22C, + '链' : 0xA22D, + '勾' : 0xA22E, + '体' : 0xA22F, + '获' : 0xA230, + '自' : 0xA231, + '己' : 0xA232, + '根' : 0xA233, + '木' : 0xA234, + '棒' : 0xA235, + '挥' : 0xA236, + '舞' : 0xA237, + '站' : 0xA238, + '携' : 0xA239, + '浪' : 0xA23A, + '费' : 0xA23B, + '锤' : 0xA23C, + '砸' : 0xA23D, + '碎' : 0xA23E, + '废' : 0xA23F, + '沉' : 0xA240, + '双' : 0xA241, + '手' : 0xA242, + '镜' : 0xA243, + '神' : 0xA244, + '井' : 0xA245, + '外' : 0xA246, + '也' : 0xA247, + '耗' : 0xA248, + '魔' : 0xA249, + '停' : 0xA24A, + '笛' : 0xA24B, + '塞' : 0xA24C, + '尔' : 0xA24D, + '达' : 0xA24E, + '宝' : 0xA24F, + '散' : 0xA250, + '芒' : 0xA251, + '施' : 0xA252, + '展' : 0xA253, + '花' : 0xA254, + '风' : 0xA255, + '返' : 0xA256, + '避' : 0xA257, + '退' : 0xA258, + '火' : 0xA259, + '勋' : 0xA25A, + '圣' : 0xA25B, + '尼' : 0xA25C, + '亚' : 0xA25D, + '觉' : 0xA25E, + '醒' : 0xA25F, + '将' : 0xA260, + '赐' : 0xA261, + '予' : 0xA262, + '茹' : 0xA263, + '特' : 0xA264, + '她' : 0xA265, + '萨' : 0xA266, + '莉' : 0xA267, + '娅' : 0xA268, + '魂' : 0xA269, + '纳' : 0xA26A, + '波' : 0xA26B, + '若' : 0xA26C, + '暗' : 0xA26D, + '英' : 0xA26E, + '帕' : 0xA26F, + '空' : 0xA270, + '瓶' : 0xA271, + '红' : 0xA272, + '色' : 0xA273, + '命' : 0xA274, + '份' : 0xA275, + '绿' : 0xA276, + '蓝' : 0xA277, + '和' : 0xA278, + '抓' : 0xA279, + '伙' : 0xA27A, + '伴' : 0xA27B, + '活' : 0xA27C, + '随' : 0xA27D, + '呼' : 0xA27E, + '唤' : 0xA27F, + '鱼' : 0xA280, + '非' : 0xA281, + '美' : 0xA282, + '豆' : 0xA283, + '园' : 0xA284, + '合' : 0xA285, + '适' : 0xA286, + '趣' : 0xA287, + '对' : 0xA288, + '纪' : 0xA289, + '念' : 0xA28A, + '演' : 0xA28B, + '奏' : 0xA28C, + '各' : 0xA28D, + '律' : 0xA28E, + '重' : 0xA28F, + '握' : 0xA290, + '盾' : 0xA291, + '蹲' : 0xA292, + '防' : 0xA293, + '御' : 0xA294, + '移' : 0xA295, + '表' : 0xA296, + '滑' : 0xA297, + '反' : 0xA298, + '升' : 0xA299, + '级' : 0xA29A, + '延' : 0xA29B, + '伸' : 0xA29C, + '距' : 0xA29D, + '离' : 0xA29E, + '倍' : 0xA29F, + '套' : 0xA2A0, + '件' : 0xA2A1, + '隔' : 0xA2A2, + '热' : 0xA2A3, + '穿' : 0xA2A4, + '潜' : 0xA2A5, + '服' : 0xA2A6, + '淹' : 0xA2A7, + '死' : 0xA2A8, + '坛' : 0xA2A9, + '充' : 0xA2AA, + '满' : 0xA2AB, + '靴' : 0xA2AC, + '浮' : 0xA2AD, + '悬' : 0xA2AE, + '缺' : 0xA2AF, + '摩' : 0xA2B0, + '擦' : 0xA2B1, + '段' : 0xA2B2, + '勇' : 0xA2B3, + '敢' : 0xA2B4, + '相' : 0xA2B5, + '信' : 0xA2B6, + '超' : 0xA2B7, + '东' : 0xA2B8, + '哥' : 0xA2B9, + '猛' : 0xA2BA, + '龙' : 0xA2BB, + '胃' : 0xA2BC, + '做' : 0xA2BD, + '幸' : 0xA2BE, + '银' : 0xA2BF, + '臂' : 0xA2C0, + '答' : 0xA2C1, + '应' : 0xA2C2, + '遵' : 0xA2C3, + '守' : 0xA2C4, + '诺' : 0xA2C5, + '言' : 0xA2C6, + '金' : 0xA2C7, + '焰' : 0xA2C8, + '入' : 0xA2C9, + '冷' : 0xA2CA, + '艳' : 0xA2CB, + '包' : 0xA2CC, + '钥' : 0xA2CD, + '匙' : 0xA2CE, + '打' : 0xA2CF, + '锁' : 0xA2D0, + '门' : 0xA2D1, + '限' : 0xA2D2, + '于' : 0xA2D3, + '宫' : 0xA2D4, + '内' : 0xA2D5, + '老' : 0xA2D6, + '却' : 0xA2D7, + '驱' : 0xA2D8, + '喝' : 0xA2D9, + '进' : 0xA2DA, + '然' : 0xA2DB, + '域' : 0xA2DC, + '烁' : 0xA2DD, + '当' : 0xA2DE, + '位' : 0xA2DF, + '拨' : 0xA2E0, + '查' : 0xA2E1, + '某' : 0xA2E2, + '层' : 0xA2E3, + '罗' : 0xA2E4, + '盘' : 0xA2E5, + '隐' : 0xA2E6, + '藏' : 0xA2E7, + '振' : 0xA2E8, + '石' : 0xA2E9, + '继' : 0xA2EA, + '续' : 0xA2EB, + '努' : 0xA2EC, + '哇' : 0xA2ED, + '公' : 0xA2EE, + '签' : 0xA2EF, + '临' : 0xA2F0, + '西' : 0xA2F1, + '便' : 0xA2F2, + '箱' : 0xA2F3, + '意' : 0xA2F4, + '惊' : 0xA2F5, + '话' : 0xA2F6, + '左' : 0xA2F7, + '右' : 0xA2F8, + '赌' : 0xA2F9, + '徒' : 0xA2FA, + '值' : 0xA2FB, + '威' : 0xA2FC, + '增' : 0xA2FD, + '冰' : 0xA2FE, + '结' : 0xA2FF, + '授' : 0xA300, + '艰' : 0xA301, + '苦' : 0xA302, + '训' : 0xA303, + '练' : 0xA304, + '该' : 0xA305, + '拥' : 0xA306, + '而' : 0xA307, + '荣' : 0xA308, + '义' : 0xA309, + '邪' : 0xA30A, + '恶' : 0xA30B, + '学' : 0xA30C, + '步' : 0xA30D, + '曲' : 0xA30E, + '烈' : 0xA30F, + '安' : 0xA310, + '影' : 0xA311, + '梦' : 0xA312, + '幻' : 0xA313, + '镯' : 0xA314, + '拔' : 0xA315, + '虫' : 0xA316, + '员' : 0xA317, + '张' : 0xA318, + '据' : 0xA319, + '翡' : 0xA31A, + '翠' : 0xA31B, + '伟' : 0xA31C, + '树' : 0xA31D, + '托' : 0xA31E, + '代' : 0xA31F, + '传' : 0xA320, + '碧' : 0xA321, + '商' : 0xA322, + '讲' : 0xA323, + '妖' : 0xA324, + '婆' : 0xA325, + '堡' : 0xA326, + '男' : 0xA327, + '情' : 0xA328, + '隆' : 0xA329, + '牛' : 0xA32A, + '奶' : 0xA32B, + '营' : 0xA32C, + '养' : 0xA32D, + '排' : 0xA32E, + '销' : 0xA32F, + '售' : 0xA330, + '榜' : 0xA331, + '朋' : 0xA332, + '友' : 0xA333, + '搬' : 0xA334, + '日' : 0xA335, + '客' : 0xA336, + '碰' : 0xA337, + '烧' : 0xA338, + '毁' : 0xA339, + '折' : 0xA33A, + '断' : 0xA33B, + '斗' : 0xA33C, + '习' : 0xA33D, + '骑' : 0xA33E, + '士' : 0xA33F, + '又' : 0xA340, + '承' : 0xA341, + '制' : 0xA342, + '尺' : 0xA343, + '码' : 0xA344, + '护' : 0xA345, + '炙' : 0xA346, + '侵' : 0xA347, + '害' : 0xA348, + '底' : 0xA349, + '溺' : 0xA34A, + '掌' : 0xA34B, + '丁' : 0xA34C, + '妮' : 0xA34D, + '席' : 0xA34E, + '性' : 0xA34F, + '危' : 0xA350, + '往' : 0xA351, + '创' : 0xA352, + '建' : 0xA353, + '娜' : 0xA354, + '产' : 0xA355, + '罩' : 0xA356, + '刚' : 0xA357, + '清' : 0xA358, + '舒' : 0xA359, + '爽' : 0xA35A, + '般' : 0xA35B, + '暂' : 0xA35C, + '脱' : 0xA35D, + '参' : 0xA35E, + '加' : 0xA35F, + '嗯' : 0xA360, + '顾' : 0xA361, + '片' : 0xA362, + '四' : 0xA363, + '整' : 0xA364, + '三' : 0xA365, + '房' : 0xA366, + '干' : 0xA367, + '稍' : 0xA368, + '候' : 0xA369, + '赛' : 0xA36A, + '鳞' : 0xA36B, + '跳' : 0xA36C, + '深' : 0xA36D, + '歌' : 0xA36E, + '伊' : 0xA36F, + '阳' : 0xA370, + '摇' : 0xA371, + '篮' : 0xA372, + '雪' : 0xA373, + '壮' : 0xA374, + '管' : 0xA375, + '术' : 0xA376, + '接' : 0xA377, + '智' : 0xA378, + '慧' : 0xA379, + '气' : 0xA37A, + '疲' : 0xA37B, + '惫' : 0xA37C, + '治' : 0xA37D, + '疗' : 0xA37E, + '伤' : 0xA37F, + '且' : 0xA380, + '硬' : 0xA381, + '技' : 0xA382, + '斩' : 0xA383, + '积' : 0xA384, + '蓄' : 0xA385, + '直' : 0xA386, + '释' : 0xA387, + '转' : 0xA388, + '效' : 0xA389, + '谈' : 0xA38A, + '听' : 0xA38B, + '束' : 0xA38C, + '刻' : 0xA38D, + '注' : 0xA38E, + '嗨' : 0xA38F, + '皇' : 0xA390, + '探' : 0xA391, + '儿' : 0xA392, + '附' : 0xA393, + '近' : 0xA394, + '半' : 0xA395, + '思' : 0xA396, + '仅' : 0xA397, + '燃' : 0xA398, + '紫' : 0xA399, + '价' : 0xA39A, + '高' : 0xA39B, + '百' : 0xA39C, + '索' : 0xA39D, + '何' : 0xA39E, + '输' : 0xA39F, + '虽' : 0xA3A0, + '惜' : 0xA3A1, + '幽' : 0xA3A2, + '妙' : 0xA3A3, + '愿' : 0xA3A4, + '勉' : 0xA3A5, + '网' : 0xA3A6, + '墙' : 0xA3A7, + '布' : 0xA3A8, + '藤' : 0xA3A9, + '蔓' : 0xA3AA, + '平' : 0xA3AB, + '爬' : 0xA3AC, + '屏' : 0xA3AD, + '幕' : 0xA3AE, + '顶' : 0xA3AF, + '端' : 0xA3B0, + '挂' : 0xA3B1, + '旧' : 0xA3B2, + '梯' : 0xA3B3, + '嘿' : 0xA3B4, + '饰' : 0xA3B5, + '熄' : 0xA3B6, + '久' : 0xA3B7, + '通' : 0xA3B8, + '狭' : 0xA3B9, + '路' : 0xA3BA, + '慢' : 0xA3BB, + '躲' : 0xA3BC, + '调' : 0xA3BD, + '视' : 0xA3BE, + '角' : 0xA3BF, + '弯' : 0xA3C0, + '旦' : 0xA3C1, + '侧' : 0xA3C2, + '落' : 0xA3C3, + '块' : 0xA3C4, + '推' : 0xA3C5, + '向' : 0xA3C6, + '兴' : 0xA3C7, + '引' : 0xA3C8, + '爆' : 0xA3C9, + '呢' : 0xA3CA, + '山' : 0xA3CB, + '坑' : 0xA3CC, + '楼' : 0xA3CD, + '绝' : 0xA3CE, + '总' : 0xA3CF, + '巧' : 0xA3D0, + '脸' : 0xA3D1, + '私' : 0xA3D2, + '语' : 0xA3D3, + '足' : 0xA3D4, + '导' : 0xA3D5, + '写' : 0xA3D6, + '险' : 0xA3D7, + '雕' : 0xA3D8, + '流' : 0xA3D9, + '粘' : 0xA3DA, + '浑' : 0xA3DB, + '电' : 0xA3DC, + '尾' : 0xA3DD, + '巴' : 0xA3DE, + '几' : 0xA3DF, + '瞧' : 0xA3E0, + '旗' : 0xA3E1, + '哪' : 0xA3E2, + '召' : 0xA3E3, + '跟' : 0xA3E4, + '拜' : 0xA3E5, + '访' : 0xA3E6, + '牧' : 0xA3E7, + '爸' : 0xA3E8, + '拯' : 0xA3E9, + '窟' : 0xA3EA, + '卜' : 0xA3EB, + '肚' : 0xA3EC, + '白' : 0xA3ED, + '马' : 0xA3EE, + '丢' : 0xA3EF, + '河' : 0xA3F0, + '殿' : 0xA3F1, + '村' : 0xA3F2, + '云' : 0xA3F3, + '吹' : 0xA3F4, + '寒' : 0xA3F5, + '庄' : 0xA3F6, + '谁' : 0xA3F7, + '教' : 0xA3F8, + '沙' : 0xA3F9, + '漠' : 0xA3FA, + '盖' : 0xA3FB, + '侬' : 0xA3FC, + '夫' : 0xA3FD, + '等' : 0xA3FE, + '介' : 0xA3FF, + '联' : 0xA400, + '声' : 0xA401, + '嘻' : 0xA402, + '曾' : 0xA403, + '领' : 0xA404, + '统' : 0xA405, + '疆' : 0xA406, + '怕' : 0xA407, + '鸟' : 0xA408, + '黑' : 0xA409, + '睛' : 0xA40A, + '暴' : 0xA40B, + '雨' : 0xA40C, + '息' : 0xA40D, + '初' : 0xA40E, + '六' : 0xA40F, + '聚' : 0xA410, + '封' : 0xA411, + '印' : 0xA412, + '七' : 0xA413, + '认' : 0xA414, + '识' : 0xA415, + '必' : 0xA416, + '须' : 0xA417, + '未' : 0xA418, + '梭' : 0xA419, + '另' : 0xA41A, + '渡' : 0xA41B, + '船' : 0xA41C, + '乘' : 0xA41D, + '艘' : 0xA41E, + '咯' : 0xA41F, + '扇' : 0xA420, + '许' : 0xA421, + '鬼' : 0xA422, + '板' : 0xA423, + '画' : 0xA424, + '廊' : 0xA425, + '扭' : 0xA426, + '天' : 0xA427, + '味' : 0xA428, + '冻' : 0xA429, + '音' : 0xA42A, + '座' : 0xA42B, + '锈' : 0xA42C, + '漩' : 0xA42D, + '涡' : 0xA42E, + '吞' : 0xA42F, + '嘛' : 0xA430, + '牢' : 0xA431, + '固' : 0xA432, + '殊' : 0xA433, + '静' : 0xA434, + '墓' : 0xA435, + '培' : 0xA436, + '睡' : 0xA437, + '掘' : 0xA438, + '阅' : 0xA439, + '读' : 0xA43A, + '式' : 0xA43B, + '租' : 0xA43C, + '货' : 0xA43D, + '款' : 0xA43E, + '仍' : 0xA43F, + '；' : 0xA440, + '载' : 0xA441, + '贪' : 0xA442, + '婪' : 0xA443, + '仇' : 0xA444, + '恨' : 0xA445, + '血' : 0xA446, + '腥' : 0xA447, + '历' : 0xA448, + '史' : 0xA449, + '诡' : 0xA44A, + '计' : 0xA44B, + '谜' : 0xA44C, + '题' : 0xA44D, + '亡' : 0xA44E, + '闭' : 0xA44F, + '今' : 0xA450, + '业' : 0xA451, + '早' : 0xA452, + '招' : 0xA453, + '聘' : 0xA454, + '兼' : 0xA455, + '职' : 0xA456, + '杂' : 0xA457, + '指' : 0xA458, + '启' : 0xA459, + '遗' : 0xA45A, + '极' : 0xA45B, + '亮' : 0xA45C, + '照' : 0xA45D, + '闯' : 0xA45E, + '穴' : 0xA45F, + '伏' : 0xA460, + '阻' : 0xA461, + '拦' : 0xA462, + '朝' : 0xA463, + '囚' : 0xA464, + '室' : 0xA465, + '贝' : 0xA466, + '泊' : 0xA467, + '泉' : 0xA468, + '黎' : 0xA469, + '童' : 0xA46A, + '纯' : 0xA46B, + '洁' : 0xA46C, + '翻' : 0xA46D, + '嘴' : 0xA46E, + '陷' : 0xA46F, + '野' : 0xA470, + '研' : 0xA471, + '究' : 0xA472, + '考' : 0xA473, + '坏' : 0xA474, + '竟' : 0xA475, + '坐' : 0xA476, + '玛' : 0xA477, + '录' : 0xA478, + '钓' : 0xA479, + '磅' : 0xA47A, + '分' : 0xA47B, + '纹' : 0xA47C, + '誓' : 0xA47D, + '忠' : 0xA47E, + '哈' : 0xA47F, + '眠' : 0xA480, + '瀑' : 0xA481, + '国' : 0xA482, + '务' : 0xA483, + '盯' : 0xA484, + '毯' : 0xA485, + '踩' : 0xA486, + '资' : 0xA487, + '瞎' : 0xA488, + '难' : 0xA489, + '倒' : 0xA48A, + '阱' : 0xA48B, + '塘' : 0xA48C, + '屈' : 0xA48D, + '镇' : 0xA48E, + '径' : 0xA48F, + '窄' : 0xA490, + '慌' : 0xA491, + '允' : 0xA492, + '禁' : 0xA493, + '激' : 0xA494, + '颁' : 0xA495, + '喷' : 0xA496, + '扰' : 0xA497, + '砍' : 0xA498, + '持' : 0xA499, + '草' : 0xA49A, + '泰' : 0xA49B, + '沿' : 0xA49C, + '实' : 0xA49D, + '峡' : 0xA49E, + '谷' : 0xA49F, + '册' : 0xA4A0, + '追' : 0xA4A1, + '赶' : 0xA4A2, + '市' : 0xA4A3, + '蜃' : 0xA4A4, + '崖' : 0xA4A5, + '灼' : 0xA4A6, + '宣' : 0xA4A7, + '疯' : 0xA4A8, + '狂' : 0xA4A9, + '滚' : 0xA4AA, + '伞' : 0xA4AB, + '脚' : 0xA4AC, + '共' : 0xA4AD, + '部' : 0xA4AE, + '免' : 0xA4AF, + '规' : 0xA4B0, + '递' : 0xA4B1, + '登' : 0xA4B2, + '补' : 0xA4B3, + '肉' : 0xA4B4, + '歉' : 0xA4B5, + '刺' : 0xA4B6, + '杀' : 0xA4B7, + '节' : 0xA4B8, + '横' : 0xA4B9, + '纵' : 0xA4BA, + '礼' : 0xA4BB, + '貌' : 0xA4BC, + '米' : 0xA4BD, + '无' : 0xA4BE, + '孪' : 0xA4BF, + '姐' : 0xA4C0, + '妹' : 0xA4C1, + '改' : 0xA4C2, + '池' : 0xA4C3, + '胆' : 0xA4C4, + '跃' : 0xA4C5, + '任' : 0xA4C6, + '句' : 0xA4C7, + '线' : 0xA4C8, + '范' : 0xA4C9, + '逃' : 0xA4CA, + '期' : 0xA4CB, + '待' : 0xA4CC, + '丽' : 0xA4CD, + '问' : 0xA4CE, + '闲' : 0xA4CF, + '泳' : 0xA4D0, + '连' : 0xA4D1, + '北' : 0xA4D2, + '棵' : 0xA4D3, + '锐' : 0xA4D4, + '虑' : 0xA4D5, + '挤' : 0xA4D6, + '障' : 0xA4D7, + '碍' : 0xA4D8, + '盔' : 0xA4D9, + '甲' : 0xA4DA, + '假' : 0xA4DB, + '设' : 0xA4DC, + '温' : 0xA4DD, + '际' : 0xA4DE, + '顽' : 0xA4DF, + '皮' : 0xA4E0, + '姆' : 0xA4E1, + '违' : 0xA4E2, + '盗' : 0xA4E3, + '贼' : 0xA4E4, + '蝴' : 0xA4E5, + '蝶' : 0xA4E6, + '崇' : 0xA4E7, + '象' : 0xA4E8, + '猫' : 0xA4E9, + '鹰' : 0xA4EA, + '凯' : 0xA4EB, + '普' : 0xA4EC, + '・' : 0xA4ED, + '博' : 0xA4EE, + '古' : 0xA4EF, + '化' : 0xA4F0, + '笨' : 0xA4F1, + '朗' : 0xA4F2, + '匹' : 0xA4F3, + '雄' : 0xA4F4, + '赚' : 0xA4F5, + '寄' : 0xA4F6, + '卵' : 0xA4F7, + '幼' : 0xA4F8, + '突' : 0xA4F9, + '袭' : 0xA4FA, + '腹' : 0xA4FB, + '绦' : 0xA4FC, + '食' : 0xA4FD, + '笔' : 0xA4FE, + '竖' : 0xA4FF, + '枯' : 0xA500, + '矮' : 0xA501, + '丛' : 0xA502, + '吃' : 0xA503, + '震' : 0xA504, + '撼' : 0xA505, + '吸' : 0xA506, + '败' : 0xA507, + '蜥' : 0xA508, + '蜴' : 0xA509, + '蝙' : 0xA50A, + '蝠' : 0xA50B, + '否' : 0xA50C, + '则' : 0xA50D, + '阿' : 0xA50E, + '莫' : 0xA50F, + '斯' : 0xA510, + '母' : 0xA511, + '绕' : 0xA512, + '触' : 0xA513, + '傻' : 0xA514, + '遭' : 0xA515, + '汀' : 0xA516, + '幅' : 0xA517, + '敬' : 0xA518, + '诱' : 0xA519, + '泡' : 0xA51A, + '挡' : 0xA51B, + '沃' : 0xA51C, + '衣' : 0xA51D, + '炬' : 0xA51E, + '黏' : 0xA51F, + '背' : 0xA520, + '抵' : 0xA521, + '权' : 0xA522, + '核' : 0xA523, + '挑' : 0xA524, + '壳' : 0xA525, + '肌' : 0xA526, + '缩' : 0xA527, + '邦' : 0xA528, + '苏' : 0xA529, + '透' : 0xA52A, + '僵' : 0xA52B, + '尸' : 0xA52C, + '麻' : 0xA52D, + '痹' : 0xA52E, + '咬' : 0xA52F, + '吉' : 0xA530, + '乃' : 0xA531, + '穷' : 0xA532, + '尽' : 0xA533, + '裂' : 0xA534, + '拢' : 0xA535, + '娃' : 0xA536, + '傀' : 0xA537, + '儡' : 0xA538, + '亲' : 0xA539, + '巫' : 0xA53A, + '低' : 0xA53B, + '骨' : 0xA53C, + '斧' : 0xA53D, + '漏' : 0xA53E, + '莱' : 0xA53F, + '彼' : 0xA540, + '塔' : 0xA541, + '扫' : 0xA542, + '描' : 0xA543, + '烟' : 0xA544, + '蛇' : 0xA545, + '弗' : 0xA546, + '扎' : 0xA547, + '挺' : 0xA548, + '八' : 0xA549, + '爪' : 0xA54A, + '迪' : 0xA54B, + '困' : 0xA54C, + '陆' : 0xA54D, + '嗜' : 0xA54E, + '仙' : 0xA54F, + '狼' : 0xA550, + '懈' : 0xA551, + '贩' : 0xA552, + '麦' : 0xA553, + '判' : 0xA554, + '乔' : 0xA555, + '绽' : 0xA556, + '速' : 0xA557, + '嗄' : 0xA558, + '羞' : 0xA559, + '永' : 0xA55A, + '稻' : 0xA55B, + '终' : 0xA55C, + '薇' : 0xA55D, + '呵' : 0xA55E, + '父' : 0xA55F, + '程' : 0xA560, + '工' : 0xA561, + '存' : 0xA562, + '氛' : 0xA563, + '笼' : 0xA564, + '令' : 0xA565, + '敏' : 0xA566, + '项' : 0xA567, + '欧' : 0xA568, + '谅' : 0xA569, + '众' : 0xA56A, + '悍' : 0xA56B, + '怎' : 0xA56C, + '亏' : 0xA56D, + '掏' : 0xA56E, + '毕' : 0xA56F, + '缓' : 0xA570, + '冲' : 0xA571, + '酷' : 0xA572, + '俯' : 0xA573, + '瞰' : 0xA574, + '哼' : 0xA575, + '蚀' : 0xA576, + '功' : 0xA577, + '糟' : 0xA578, + '呸' : 0xA579, + '黄' : 0xA57A, + '类' : 0xA57B, + '篇' : 0xA57C, + '论' : 0xA57D, + '控' : 0xA57E, + '括' : 0xA57F, + '冒' : 0xA580, + '度' : 0xA581, + '检' : 0xA582, + '单' : 0xA583, + '懂' : 0xA584, + '屋' : 0xA585, + '户' : 0xA586, + '致' : 0xA587, + '腾' : 0xA588, + '模' : 0xA589, + '嗒' : 0xA58A, + '咔' : 0xA58B, + '咋' : 0xA58C, + '萎' : 0xA58D, + '紧' : 0xA58E, + '决' : 0xA58F, + '呆' : 0xA590, + '闷' : 0xA591, + '畏' : 0xA592, + '骗' : 0xA593, + '苗' : 0xA594, + '茁' : 0xA595, + '算' : 0xA596, + '猜' : 0xA597, + '残' : 0xA598, + '妇' : 0xA599, + '婴' : 0xA59A, + '蔽' : 0xA59B, + '唯' : 0xA59C, + '响' : 0xA59D, + '抚' : 0xA59E, + '吵' : 0xA59F, + '境' : 0xA5A0, + '隙' : 0xA5A1, + '逝' : 0xA5A2, + '忆' : 0xA5A3, + '喂' : 0xA5A4, + '辈' : 0xA5A5, + '肩' : 0xA5A6, + '洋' : 0xA5A7, + '溢' : 0xA5A8, + '确' : 0xA5A9, + '迹' : 0xA5AA, + '凝' : 0xA5AB, + '髓' : 0xA5AC, + '混' : 0xA5AD, + '沌' : 0xA5AE, + '降' : 0xA5AF, + '健' : 0xA5B0, + '耕' : 0xA5B1, + '耘' : 0xA5B2, + '星' : 0xA5B3, + '倾' : 0xA5B4, + '沛' : 0xA5B5, + '础' : 0xA5B6, + '堂' : 0xA5B7, + '万' : 0xA5B8, + '宗' : 0xA5B9, + '源' : 0xA5BA, + '本' : 0xA5BB, + '替' : 0xA5BC, + '缝' : 0xA5BD, + '惩' : 0xA5BE, + '罚' : 0xA5BF, + '遇' : 0xA5C0, + '懒' : 0xA5C1, + '惰' : 0xA5C2, + '衷' : 0xA5C3, + '势' : 0xA5C4, + '维' : 0xA5C5, + '秩' : 0xA5C6, + '序' : 0xA5C7, + '抗' : 0xA5C8, + '衡' : 0xA5C9, + '旅' : 0xA5CA, + '顺' : 0xA5CB, + '叛' : 0xA5CC, + '愤' : 0xA5CD, + '辽' : 0xA5CE, + '阔' : 0xA5CF, + '茂' : 0xA5D0, + '称' : 0xA5D1, + '讨' : 0xA5D2, + '厌' : 0xA5D3, + '靶' : 0xA5D4, + '饲' : 0xA5D5, + '求' : 0xA5D6, + '材' : 0xA5D7, + '耶' : 0xA5D8, + '谊' : 0xA5D9, + '噓' : 0xA5DA, + '遍' : 0xA5DB, + '谱' : 0xA5DC, + '议' : 0xA5DD, + '吼' : 0xA5DE, + '薄' : 0xA5DF, + '饶' : 0xA5E0, + '稽' : 0xA5E1, + '齐' : 0xA5E2, + '懦' : 0xA5E3, + '抱' : 0xA5E4, + '千' : 0xA5E5, + '辛' : 0xA5E6, + '漂' : 0xA5E7, + '环' : 0xA5E8, + '配' : 0xA5E9, + '帝' : 0xA5EA, + '焦' : 0xA5EB, + '乎' : 0xA5EC, + '欠' : 0xA5ED, + '驯' : 0xA5EE, + '圈' : 0xA5EF, + '局' : 0xA5F0, + '咩' : 0xA5F1, + '既' : 0xA5F2, + '劳' : 0xA5F3, + '祭' : 0xA5F4, + '伪' : 0xA5F5, + '弃' : 0xA5F6, + '耐' : 0xA5F7, + '岗' : 0xA5F8, + '唔' : 0xA5F9, + '佳' : 0xA5FA, + '搭' : 0xA5FB, + '档' : 0xA5FC, + '负' : 0xA5FD, + '责' : 0xA5FE, + '攀' : 0xA5FF, + '绍' : 0xA600, + '忙' : 0xA601, + '提' : 0xA602, + '缠' : 0xA603, + '唉' : 0xA604, + '亳' : 0xA605, + '毛' : 0xA606, + '笑' : 0xA607, + '欣' : 0xA608, + '赏' : 0xA609, + '怜' : 0xA60A, + '瓜' : 0xA60B, + '奔' : 0xA60C, + '啧' : 0xA60D, + '踢' : 0xA60E, + '志' : 0xA60F, + '宜' : 0xA610, + '仿' : 0xA611, + '楚' : 0xA612, + '挖' : 0xA613, + '由' : 0xA614, + '捕' : 0xA615, + '播' : 0xA616, + '谣' : 0xA617, + '勤' : 0xA618, + '陌' : 0xA619, + '杰' : 0xA61A, + '骏' : 0xA61B, + '鞭' : 0xA61C, + '抽' : 0xA61D, + '享' : 0xA61E, + '栏' : 0xA61F, + '逛' : 0xA620, + '汊' : 0xA621, + '烦' : 0xA622, + '匆' : 0xA623, + '妈' : 0xA624, + '唱' : 0xA625, + '墟' : 0xA626, + '粗' : 0xA627, + '虐' : 0xA628, + '乡' : 0xA629, + '彻' : 0xA62A, + '咕' : 0xA62B, + '哝' : 0xA62C, + '简' : 0xA62D, + '优' : 0xA62E, + '惠' : 0xA62F, + '民' : 0xA630, + '灰' : 0xA631, + '聪' : 0xA632, + '南' : 0xA633, + '澈' : 0xA634, + '卫' : 0xA635, + '熟' : 0xA636, + '悉' : 0xA637, + '故' : 0xA638, + '乌' : 0xA639, + '兆' : 0xA63A, + '企' : 0xA63B, + '抢' : 0xA63C, + '夺' : 0xA63D, + '拼' : 0xA63E, + '粉' : 0xA63F, + '番' : 0xA640, + '群' : 0xA641, + '秒' : 0xA642, + '料' : 0xA643, + '肯' : 0xA644, + '赋' : 0xA645, + '婚' : 0xA646, + '诚' : 0xA647, + '邀' : 0xA648, + '斜' : 0xA649, + '诞' : 0xA64A, + '及' : 0xA64B, + '盛' : 0xA64C, + '典' : 0xA64D, + '拍' : 0xA64E, + '轰' : 0xA64F, + '植' : 0xA650, + '矿' : 0xA651, + '采' : 0xA652, + '阴' : 0xA653, + '罕' : 0xA654, + '昏' : 0xA655, + '压' : 0xA656, + '悦' : 0xA657, + '饿' : 0xA658, + '忍' : 0xA659, + '咳' : 0xA65A, + '弄' : 0xA65B, + '舔' : 0xA65C, + '醉' : 0xA65D, + '怀' : 0xA65E, + '尊' : 0xA65F, + '严' : 0xA660, + '滋' : 0xA661, + '农' : 0xA662, + '饥' : 0xA663, + '沮' : 0xA664, + '丧' : 0xA665, + '奋' : 0xA666, + '省' : 0xA667, + '撑' : 0xA668, + '脑' : 0xA669, + '灯' : 0xA66A, + '隧' : 0xA66B, + '派' : 0xA66C, + '狗' : 0xA66D, + '呜' : 0xA66E, + '咣' : 0xA66F, + '警' : 0xA670, + '挪' : 0xA671, + '窜' : 0xA672, + '峙' : 0xA673, + '含' : 0xA674, + '痛' : 0xA675, + '夸' : 0xA676, + '艺' : 0xA677, + '撒' : 0xA678, + '谎' : 0xA679, + '昨' : 0xA67A, + '炎' : 0xA67B, + '痒' : 0xA67C, + '泪' : 0xA67D, + '稳' : 0xA67E, + '况' : 0xA67F, + '磨' : 0xA680, + '休' : 0xA681, + '柱' : 0xA682, + '敲' : 0xA683, + '油' : 0xA684, + '菜' : 0xA685, + '盟' : 0xA686, + '骄' : 0xA687, + '傲' : 0xA688, + '献' : 0xA689, + '噢' : 0xA68A, + '窒' : 0xA68B, + '医' : 0xA68C, + '甜' : 0xA68D, + '鰓' : 0xA68E, + '恼' : 0xA68F, + '耽' : 0xA690, + '搁' : 0xA691, + '孤' : 0xA692, + '丈' : 0xA693, + '订' : 0xA694, + '戒' : 0xA695, + '贵' : 0xA696, + '财' : 0xA697, + '惹' : 0xA698, + '腐' : 0xA699, + '剂' : 0xA69A, + '融' : 0xA69B, + '厚' : 0xA69C, + '映' : 0xA69D, + '妻' : 0xA69E, + '狠' : 0xA69F, + '泄' : 0xA6A0, + '咿' : 0xA6A1, + '瞒' : 0xA6A2, + '咽' : 0xA6A3, + '恭' : 0xA6A4, + '涨' : 0xA6A5, + '嘎' : 0xA6A6, + '悔' : 0xA6A7, + '犹' : 0xA6A8, + '豫' : 0xA6A9, + '呃' : 0xA6AA, + '糕' : 0xA6AB, + '埃' : 0xA6AC, + '荡' : 0xA6AD, + '漾' : 0xA6AE, + '饵' : 0xA6AF, + '晃' : 0xA6B0, + '约' : 0xA6B1, + '专' : 0xA6B2, + '剔' : 0xA6B3, + '窍' : 0xA6B4, + '．' : 0xA6B5, + '乱' : 0xA6B6, + '甩' : 0xA6B7, + '鳅' : 0xA6B8, + '剧' : 0xA6B9, + '竿' : 0xA6BA, + '杆' : 0xA6BB, + '符' : 0xA6BC, + '呱' : 0xA6BD, + '团' : 0xA6BE, + '饱' : 0xA6BF, + '犯' : 0xA6C0, + '肃' : 0xA6C1, + '啵' : 0xA6C2, + '吟' : 0xA6C3, + '月' : 0xA6C4, + '诗' : 0xA6C5, + '碑' : 0xA6C6, + '奥' : 0xA6C7, + '扬' : 0xA6C8, + '舍' : 0xA6C9, + '副' : 0xA6CA, + '袖' : 0xA6CB, + '夏' : 0xA6CC, + '赖' : 0xA6CD, + '仆' : 0xA6CE, + '摆' : 0xA6CF, + '雇' : 0xA6D0, + '疙' : 0xA6D1, + '瘩' : 0xA6D2, + '居' : 0xA6D3, + '簧' : 0xA6D4, + '车' : 0xA6D5, + '剩' : 0xA6D6, + '玻' : 0xA6D7, + '璃' : 0xA6D8, + '赔' : 0xA6D9, + '欺' : 0xA6DA, + '育' : 0xA6DB, + '珍' : 0xA6DC, + '床' : 0xA6DD, + '蛮' : 0xA6DE, + '啄' : 0xA6DF, + '、' : 0xA6E0, + '稀' : 0xA6E1, + '栋' : 0xA6E2, + '柜' : 0xA6E3, + '鼻' : 0xA6E4, + '厉' : 0xA6E5, + '乏' : 0xA6E6, + '饭' : 0xA6E7, + '胡' : 0xA6E8, + '叮' : 0xA6E9, + '咚' : 0xA6EA, + '兵' : 0xA6EB, + '勃' : 0xA6EC, + '苛' : 0xA6ED, + '薪' : 0xA6EE, + '痴' : 0xA6EF, + '挣' : 0xA6F0, + '馊' : 0xA6F1, + '扑' : 0xA6F2, + '良' : 0xA6F3, + '竭' : 0xA6F4, + '慷' : 0xA6F5, + '慨' : 0xA6F6, + '欲' : 0xA6F7, + '愚' : 0xA6F8, + '蠢' : 0xA6F9, + '嘉' : 0xA6FA, + '监' : 0xA6FB, + '狱' : 0xA6FC, + '喔' : 0xA6FD, + '港' : 0xA6FE, + '逆' : 0xA6FF, + '误' : 0xA700, + '独' : 0xA701, + '划' : 0xA702, + '措' : 0xA703, + '颜' : 0xA704, + '奴' : 0xA705, + '罢' : 0xA706, + '洗' : 0xA707, + '俊' : 0xA708, + '罪' : 0xA709, + '偿' : 0xA70A, + '牺' : 0xA70B, + '牲' : 0xA70C, + '劲' : 0xA70D, + '岁' : 0xA70E, + '恩' : 0xA70F, + '账' : 0xA710, + '珂' : 0xA711, + '艾' : 0xA712, + '组' : 0xA713, + '织' : 0xA714, + '伯' : 0xA715, + '社' : 0xA716, + '架' : 0xA717, + '桥' : 0xA718, + '碟' : 0xA719, + '卑' : 0xA71A, + '鄙' : 0xA71B, + '臭' : 0xA71C, + '占' : 0xA71D, + '讶' : 0xA71E, + '兽' : 0xA71F, + '刷' : 0xA720, + '竞' : 0xA721, + '帐' : 0xA722, + '篷' : 0xA723, + '迟' : 0xA724, + '繁' : 0xA725, + '倦' : 0xA726, + '罐' : 0xA727, + '牌' : 0xA728, + '晨' : 0xA729, + '景' : 0xA72A, + '田' : 0xA72B, + '孔' : 0xA72C, + '钻' : 0xA72D, + '浓' : 0xA72E, + '盒' : 0xA72F, + '溜' : 0xA730, + '街' : 0xA731, + '概' : 0xA732, + '盹' : 0xA733, + '敞' : 0xA734, + '扉' : 0xA735, + '文' : 0xA736, + '撞' : 0xA737, + '姑' : 0xA738, + '娘' : 0xA739, + '糊' : 0xA73A, + '涂' : 0xA73B, + '依' : 0xA73C, + '辐' : 0xA73D, + '微' : 0xA73E, + '汇' : 0xA73F, + '缚' : 0xA740, + '宰' : 0xA741, + '摸' : 0xA742, + '侍' : 0xA743, + '垒' : 0xA744, + '扮' : 0xA745, + '惕' : 0xA746, + '估' : 0xA747, + '执' : 0xA748, + '悲' : 0xA749, + '拖' : 0xA74A, + '累' : 0xA74B, + '弥' : 0xA74C, + '渴' : 0xA74D, + '班' : 0xA74E, + '搞' : 0xA74F, + '谛' : 0xA750, + '哀' : 0xA751, + '圆' : 0xA752, + '鸣' : 0xA753, + '俩' : 0xA754, + '善' : 0xA755, + '塌' : 0xA756, + '埋' : 0xA757, + '孙' : 0xA758, + '凶' : 0xA759, + '聊' : 0xA75A, + '寃' : 0xA75B, + '怨' : 0xA75C, + '购' : 0xA75D, + '涌' : 0xA75E, + '劈' : 0xA75F, + '狐' : 0xA760, + '狸' : 0xA761, + '票' : 0xA762, + '闻' : 0xA763, + '哟' : 0xA764, + '唬' : 0xA765, + '摘' : 0xA766, + '愉' : 0xA767, + '呦' : 0xA768, + '棺' : 0xA769, + '溶' : 0xA76A, + '褐' : 0xA76B, + '肤' : 0xA76C, + '颤' : 0xA76D, + '逗' : 0xA76E, + '娶' : 0xA76F, + '逼' : 0xA770, + '悠' : 0xA771, + '蒙' : 0xA772, + '漆' : 0xA773, + '彩' : 0xA774, + '丰' : 0xA775, +} diff --git a/assets/text/charmap.jpn.txt b/assets/text/charmap.jpn.txt new file mode 100644 index 0000000000..f615e8807f --- /dev/null +++ b/assets/text/charmap.jpn.txt @@ -0,0 +1,20 @@ +# Determines how certain text sequences should be encoded for the JPN text encoding. +{ + '\n' : 0x000A, + + '[A]' : 0x839F, + '[B]' : 0x83A0, + '[C]' : 0x83A1, + '[L]' : 0x83A2, + '[R]' : 0x83A3, + '[Z]' : 0x83A4, + '[C-Up]' : 0x83A5, + '[C-Down]' : 0x83A6, + '[C-Left]' : 0x83A7, + '[C-Right]' : 0x83A8, + '▼' : 0x83A9, + '[Control-Pad]' : 0x83AA, + + # Possibly from a SHIFT-JIS extension, python doesn't have builtin support + '┯' : 0x86D3, +} diff --git a/assets/text/charmap.nes.txt b/assets/text/charmap.nes.txt new file mode 100644 index 0000000000..1dd6445712 --- /dev/null +++ b/assets/text/charmap.nes.txt @@ -0,0 +1,50 @@ +# Determines how certain text sequences should be encoded for the NES text encoding. +{ + '\n' : 0x01, + + '[A]' : 0x9F, + '[B]' : 0xA0, + '[C]' : 0xA1, + '[L]' : 0xA2, + '[R]' : 0xA3, + '[Z]' : 0xA4, + '[C-Up]' : 0xA5, + '[C-Down]' : 0xA6, + '[C-Left]' : 0xA7, + '[C-Right]' : 0xA8, + '▼' : 0xA9, + '[Control-Pad]' : 0xAA, + '[D-Pad]' : 0xAB, + + 'À' : 0x80, + 'î' : 0x81, + 'Â' : 0x82, + 'Ä' : 0x83, + 'Ç' : 0x84, + 'È' : 0x85, + 'É' : 0x86, + 'Ê' : 0x87, + 'Ë' : 0x88, + 'Ï' : 0x89, + 'Ô' : 0x8A, + 'Ö' : 0x8B, + 'Ù' : 0x8C, + 'Û' : 0x8D, + 'Ü' : 0x8E, + 'ß' : 0x8F, + 'à' : 0x90, + 'á' : 0x91, + 'â' : 0x92, + 'ä' : 0x93, + 'ç' : 0x94, + 'è' : 0x95, + 'é' : 0x96, + 'ê' : 0x97, + 'ë' : 0x98, + 'ï' : 0x99, + 'ô' : 0x9A, + 'ö' : 0x9B, + 'ù' : 0x9C, + 'û' : 0x9D, + 'ü' : 0x9E, +} diff --git a/assets/text/charmap.txt b/assets/text/charmap.txt deleted file mode 100644 index a6c94bee28..0000000000 --- a/assets/text/charmap.txt +++ /dev/null @@ -1,58 +0,0 @@ -# Determines how certain text sequences should be encoded. The text sequence is -# converted to either the first or second tuple element based on whether the -# target encoding is the "wide" encoding. The first element is for the non-wide -# encoding, used for all languages besides JP, while the second element is for -# the wide encoding, used for JP. -{ - '\n' : (0x01, 0x000A), - - '[A]' : (0x9F, 0x839F), - '[B]' : (0xA0, 0x83A0), - '[C]' : (0xA1, 0x83A1), - '[L]' : (0xA2, 0x83A2), - '[R]' : (0xA3, 0x83A3), - '[Z]' : (0xA4, 0x83A4), - '[C-Up]' : (0xA5, 0x83A5), - '[C-Down]' : (0xA6, 0x83A6), - '[C-Left]' : (0xA7, 0x83A7), - '[C-Right]' : (0xA8, 0x83A8), - '▼' : (0xA9, 0x83A9), - '[Control-Pad]' : (0xAA, 0x83AA), - '[D-Pad]' : (0xAB, None), - - # Possibly from a SHIFT-JIS extension, python doesn't have builtin support - '┯' : (None, 0x86D3), - - '‾' : (0x7F, None), - 'À' : (0x80, None), - 'î' : (0x81, None), - 'Â' : (0x82, None), - 'Ä' : (0x83, None), - 'Ç' : (0x84, None), - 'È' : (0x85, None), - 'É' : (0x86, None), - 'Ê' : (0x87, None), - 'Ë' : (0x88, None), - 'Ï' : (0x89, None), - 'Ô' : (0x8A, None), - 'Ö' : (0x8B, None), - 'Ù' : (0x8C, None), - 'Û' : (0x8D, None), - 'Ü' : (0x8E, None), - 'ß' : (0x8F, None), - 'à' : (0x90, None), - 'á' : (0x91, None), - 'â' : (0x92, None), - 'ä' : (0x93, None), - 'ç' : (0x94, None), - 'è' : (0x95, None), - 'é' : (0x96, None), - 'ê' : (0x97, None), - 'ë' : (0x98, None), - 'ï' : (0x99, None), - 'ô' : (0x9A, None), - 'ö' : (0x9B, None), - 'ù' : (0x9C, None), - 'û' : (0x9D, None), - 'ü' : (0x9E, None), -} diff --git a/assets/xml/objects/object_mag_ique.xml b/assets/xml/objects/object_mag_ique.xml new file mode 100644 index 0000000000..03b1a8b193 --- /dev/null +++ b/assets/xml/objects/object_mag_ique.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_md.xml b/assets/xml/objects/object_md.xml index 717443537a..45527ca1b9 100644 --- a/assets/xml/objects/object_md.xml +++ b/assets/xml/objects/object_md.xml @@ -71,17 +71,17 @@ - - - - - - - - - - + + + + + + + + + + - + diff --git a/assets/xml/overlays/ovl_End_Title_ique.xml b/assets/xml/overlays/ovl_End_Title_ique.xml new file mode 100644 index 0000000000..300448cabf --- /dev/null +++ b/assets/xml/overlays/ovl_End_Title_ique.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/scenes/dungeons/bdan.xml b/assets/xml/scenes/dungeons/bdan.xml index c4edc9bea4..ceee898fb5 100644 --- a/assets/xml/scenes/dungeons/bdan.xml +++ b/assets/xml/scenes/dungeons/bdan.xml @@ -1,6 +1,7 @@ - + + diff --git a/assets/xml/scenes/dungeons/bdan_mq.xml b/assets/xml/scenes/dungeons/bdan_mq.xml index 0aee687a80..8f73efde9b 100644 --- a/assets/xml/scenes/dungeons/bdan_mq.xml +++ b/assets/xml/scenes/dungeons/bdan_mq.xml @@ -1,6 +1,7 @@ - + + diff --git a/assets/xml/scenes/dungeons/ganon_demo.xml b/assets/xml/scenes/dungeons/ganon_demo.xml index 779cb9335a..d1a41b6c43 100644 --- a/assets/xml/scenes/dungeons/ganon_demo.xml +++ b/assets/xml/scenes/dungeons/ganon_demo.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/scenes/dungeons/jyasinboss.xml b/assets/xml/scenes/dungeons/jyasinboss.xml index 0f81c26fbc..28abd03612 100644 --- a/assets/xml/scenes/dungeons/jyasinboss.xml +++ b/assets/xml/scenes/dungeons/jyasinboss.xml @@ -2,6 +2,7 @@ + diff --git a/assets/xml/scenes/dungeons/jyasinzou.xml b/assets/xml/scenes/dungeons/jyasinzou.xml index 07f7944f9b..1a44e14d72 100644 --- a/assets/xml/scenes/dungeons/jyasinzou.xml +++ b/assets/xml/scenes/dungeons/jyasinzou.xml @@ -6,6 +6,10 @@ + + + + diff --git a/assets/xml/scenes/dungeons/jyasinzou_mq.xml b/assets/xml/scenes/dungeons/jyasinzou_mq.xml index 5614bc8936..6a99888abb 100644 --- a/assets/xml/scenes/dungeons/jyasinzou_mq.xml +++ b/assets/xml/scenes/dungeons/jyasinzou_mq.xml @@ -6,6 +6,10 @@ + + + + diff --git a/assets/xml/scenes/indoors/kenjyanoma.xml b/assets/xml/scenes/indoors/kenjyanoma.xml index e6bcef90a0..7252a5a2c3 100644 --- a/assets/xml/scenes/indoors/kenjyanoma.xml +++ b/assets/xml/scenes/indoors/kenjyanoma.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/scenes/indoors/link_home.xml b/assets/xml/scenes/indoors/link_home.xml index 2fb88ae347..7eabae43f3 100644 --- a/assets/xml/scenes/indoors/link_home.xml +++ b/assets/xml/scenes/indoors/link_home.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/scenes/indoors/nakaniwa.xml b/assets/xml/scenes/indoors/nakaniwa.xml index 49ff4a29cb..d606bdc335 100644 --- a/assets/xml/scenes/indoors/nakaniwa.xml +++ b/assets/xml/scenes/indoors/nakaniwa.xml @@ -4,6 +4,8 @@ + + diff --git a/assets/xml/scenes/indoors/syatekijyou.xml b/assets/xml/scenes/indoors/syatekijyou.xml index 5490e84f13..78ce084bb7 100644 --- a/assets/xml/scenes/indoors/syatekijyou.xml +++ b/assets/xml/scenes/indoors/syatekijyou.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/scenes/indoors/tokinoma.xml b/assets/xml/scenes/indoors/tokinoma.xml index e43f0a9339..4d83fe3908 100644 --- a/assets/xml/scenes/indoors/tokinoma.xml +++ b/assets/xml/scenes/indoors/tokinoma.xml @@ -1,8 +1,18 @@ - - + + + + + + + + + + + + diff --git a/assets/xml/scenes/indoors/tokinoma_pal_n64.xml b/assets/xml/scenes/indoors/tokinoma_pal_n64.xml index f3d250415c..eb98a321af 100644 --- a/assets/xml/scenes/indoors/tokinoma_pal_n64.xml +++ b/assets/xml/scenes/indoors/tokinoma_pal_n64.xml @@ -1,8 +1,17 @@ - - + + + + + + + + + + + diff --git a/assets/xml/scenes/misc/hiral_demo.xml b/assets/xml/scenes/misc/hiral_demo.xml index 32c55fac4b..47cf353d4c 100644 --- a/assets/xml/scenes/misc/hiral_demo.xml +++ b/assets/xml/scenes/misc/hiral_demo.xml @@ -4,6 +4,16 @@ + + + + + + + + + + diff --git a/assets/xml/scenes/misc/hiral_demo_pal_n64.xml b/assets/xml/scenes/misc/hiral_demo_pal_n64.xml index 88d347899a..26c0287300 100644 --- a/assets/xml/scenes/misc/hiral_demo_pal_n64.xml +++ b/assets/xml/scenes/misc/hiral_demo_pal_n64.xml @@ -4,6 +4,16 @@ + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot00.xml b/assets/xml/scenes/overworld/spot00.xml index 0ffdc18871..dd78fc86ab 100644 --- a/assets/xml/scenes/overworld/spot00.xml +++ b/assets/xml/scenes/overworld/spot00.xml @@ -7,6 +7,15 @@ + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot00_pal_n64.xml b/assets/xml/scenes/overworld/spot00_pal_n64.xml index 6eb609adac..d1641fe360 100644 --- a/assets/xml/scenes/overworld/spot00_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot00_pal_n64.xml @@ -7,6 +7,15 @@ + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot01.xml b/assets/xml/scenes/overworld/spot01.xml index 205da509c3..0074733cc4 100644 --- a/assets/xml/scenes/overworld/spot01.xml +++ b/assets/xml/scenes/overworld/spot01.xml @@ -2,6 +2,11 @@ + + + + + diff --git a/assets/xml/scenes/overworld/spot01_pal_n64.xml b/assets/xml/scenes/overworld/spot01_pal_n64.xml index a0e653dd43..8b2651c1ff 100644 --- a/assets/xml/scenes/overworld/spot01_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot01_pal_n64.xml @@ -2,6 +2,11 @@ + + + + + diff --git a/assets/xml/scenes/overworld/spot02.xml b/assets/xml/scenes/overworld/spot02.xml index 45708dd3ac..23037c742b 100644 --- a/assets/xml/scenes/overworld/spot02.xml +++ b/assets/xml/scenes/overworld/spot02.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/assets/xml/scenes/overworld/spot04.xml b/assets/xml/scenes/overworld/spot04.xml index c861d45278..5a3e3079fc 100644 --- a/assets/xml/scenes/overworld/spot04.xml +++ b/assets/xml/scenes/overworld/spot04.xml @@ -2,8 +2,20 @@ - - + + + + + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot04_pal_n64.xml b/assets/xml/scenes/overworld/spot04_pal_n64.xml index c8e8776a7a..c9054cca4e 100644 --- a/assets/xml/scenes/overworld/spot04_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot04_pal_n64.xml @@ -2,8 +2,20 @@ - - + + + + + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot05.xml b/assets/xml/scenes/overworld/spot05.xml index b799f21d1e..53ee4a5125 100644 --- a/assets/xml/scenes/overworld/spot05.xml +++ b/assets/xml/scenes/overworld/spot05.xml @@ -1,8 +1,7 @@ - - - + + diff --git a/assets/xml/scenes/overworld/spot05_pal_n64.xml b/assets/xml/scenes/overworld/spot05_pal_n64.xml index 6458ad63f5..eba27fbc44 100644 --- a/assets/xml/scenes/overworld/spot05_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot05_pal_n64.xml @@ -1,8 +1,7 @@ - - - + + diff --git a/assets/xml/scenes/overworld/spot06.xml b/assets/xml/scenes/overworld/spot06.xml index 0c5ccea251..77226b2ce5 100644 --- a/assets/xml/scenes/overworld/spot06.xml +++ b/assets/xml/scenes/overworld/spot06.xml @@ -2,8 +2,11 @@ - + + + + diff --git a/assets/xml/scenes/overworld/spot06_pal_n64.xml b/assets/xml/scenes/overworld/spot06_pal_n64.xml index 308858ff74..df16711d4e 100644 --- a/assets/xml/scenes/overworld/spot06_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot06_pal_n64.xml @@ -2,8 +2,11 @@ - + + + + diff --git a/assets/xml/scenes/overworld/spot07.xml b/assets/xml/scenes/overworld/spot07.xml index 9b9b5ac667..857cab9f01 100644 --- a/assets/xml/scenes/overworld/spot07.xml +++ b/assets/xml/scenes/overworld/spot07.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/scenes/overworld/spot07_pal_n64.xml b/assets/xml/scenes/overworld/spot07_pal_n64.xml index 38070fd780..f856e54438 100644 --- a/assets/xml/scenes/overworld/spot07_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot07_pal_n64.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/scenes/overworld/spot08.xml b/assets/xml/scenes/overworld/spot08.xml index 136727c6d3..1ec02bc693 100644 --- a/assets/xml/scenes/overworld/spot08.xml +++ b/assets/xml/scenes/overworld/spot08.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/scenes/overworld/spot09.xml b/assets/xml/scenes/overworld/spot09.xml index 7b7ec2ce5e..641ab8b7aa 100644 --- a/assets/xml/scenes/overworld/spot09.xml +++ b/assets/xml/scenes/overworld/spot09.xml @@ -3,6 +3,10 @@ + + + + diff --git a/assets/xml/scenes/overworld/spot09_pal_n64.xml b/assets/xml/scenes/overworld/spot09_pal_n64.xml index a75774bf68..7bb06c8a8f 100644 --- a/assets/xml/scenes/overworld/spot09_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot09_pal_n64.xml @@ -3,6 +3,10 @@ + + + + diff --git a/assets/xml/scenes/overworld/spot10.xml b/assets/xml/scenes/overworld/spot10.xml index 58080b9c0c..b8c77cc2af 100644 --- a/assets/xml/scenes/overworld/spot10.xml +++ b/assets/xml/scenes/overworld/spot10.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/scenes/overworld/spot11.xml b/assets/xml/scenes/overworld/spot11.xml index 99bf24c829..96677d60fd 100644 --- a/assets/xml/scenes/overworld/spot11.xml +++ b/assets/xml/scenes/overworld/spot11.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/scenes/overworld/spot11_pal_n64.xml b/assets/xml/scenes/overworld/spot11_pal_n64.xml index b66cd8f294..67b662bfb5 100644 --- a/assets/xml/scenes/overworld/spot11_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot11_pal_n64.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/scenes/overworld/spot12.xml b/assets/xml/scenes/overworld/spot12.xml index 9f4efd31e8..e4b38cbe88 100644 --- a/assets/xml/scenes/overworld/spot12.xml +++ b/assets/xml/scenes/overworld/spot12.xml @@ -2,6 +2,8 @@ + + diff --git a/assets/xml/scenes/overworld/spot12_pal_n64.xml b/assets/xml/scenes/overworld/spot12_pal_n64.xml index c771c2e825..d1f94eb6b4 100644 --- a/assets/xml/scenes/overworld/spot12_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot12_pal_n64.xml @@ -2,6 +2,8 @@ + + diff --git a/assets/xml/scenes/overworld/spot16.xml b/assets/xml/scenes/overworld/spot16.xml index f3d92c8fe7..6f48610c8b 100644 --- a/assets/xml/scenes/overworld/spot16.xml +++ b/assets/xml/scenes/overworld/spot16.xml @@ -2,6 +2,11 @@ + + + + + diff --git a/assets/xml/scenes/overworld/spot16_pal_n64.xml b/assets/xml/scenes/overworld/spot16_pal_n64.xml index aff784ab9f..070a8a2d7e 100644 --- a/assets/xml/scenes/overworld/spot16_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot16_pal_n64.xml @@ -2,6 +2,11 @@ + + + + + diff --git a/assets/xml/scenes/overworld/spot16_v2.xml b/assets/xml/scenes/overworld/spot16_v2.xml index 57a64323b2..b254e7f983 100644 --- a/assets/xml/scenes/overworld/spot16_v2.xml +++ b/assets/xml/scenes/overworld/spot16_v2.xml @@ -2,6 +2,11 @@ + + + + + diff --git a/assets/xml/scenes/overworld/spot17.xml b/assets/xml/scenes/overworld/spot17.xml index 3aecc15a60..926eeb3e10 100644 --- a/assets/xml/scenes/overworld/spot17.xml +++ b/assets/xml/scenes/overworld/spot17.xml @@ -2,6 +2,7 @@ + diff --git a/assets/xml/scenes/overworld/spot17_pal_n64.xml b/assets/xml/scenes/overworld/spot17_pal_n64.xml index 6aca94ff73..046da9144c 100644 --- a/assets/xml/scenes/overworld/spot17_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot17_pal_n64.xml @@ -2,6 +2,7 @@ + diff --git a/assets/xml/scenes/overworld/spot18.xml b/assets/xml/scenes/overworld/spot18.xml index 513e67cbc9..affece84b7 100644 --- a/assets/xml/scenes/overworld/spot18.xml +++ b/assets/xml/scenes/overworld/spot18.xml @@ -1,9 +1,14 @@ - - - + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot18_pal_n64.xml b/assets/xml/scenes/overworld/spot18_pal_n64.xml index adbbc51121..809e099cfc 100644 --- a/assets/xml/scenes/overworld/spot18_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot18_pal_n64.xml @@ -1,9 +1,14 @@ - - - + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot20.xml b/assets/xml/scenes/overworld/spot20.xml index 6e09a5de82..3d305508ad 100644 --- a/assets/xml/scenes/overworld/spot20.xml +++ b/assets/xml/scenes/overworld/spot20.xml @@ -1,6 +1,16 @@ + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot20_pal.xml b/assets/xml/scenes/overworld/spot20_pal.xml index cc94f8443c..0ba9380e13 100644 --- a/assets/xml/scenes/overworld/spot20_pal.xml +++ b/assets/xml/scenes/overworld/spot20_pal.xml @@ -1,6 +1,16 @@ + + + + + + + + + + diff --git a/assets/xml/textures/nes_font_static_ique_cn.xml b/assets/xml/textures/nes_font_static_ique_cn.xml new file mode 100644 index 0000000000..484707b05d --- /dev/null +++ b/assets/xml/textures/nes_font_static_ique_cn.xml @@ -0,0 +1,1919 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/baseroms/gc-eu-mq-dbg/config.yml b/baseroms/gc-eu-mq-dbg/config.yml index 84a6d3b6c7..09abaaf67a 100644 --- a/baseroms/gc-eu-mq-dbg/config.yml +++ b/baseroms/gc-eu-mq-dbg/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x12F70 -text_lang_pal: true +text_lang: PAL incbins: - name: ipl3 segment: makerom diff --git a/baseroms/gc-eu-mq/config.yml b/baseroms/gc-eu-mq/config.yml index f29e904e85..62925ab3b4 100644 --- a/baseroms/gc-eu-mq/config.yml +++ b/baseroms/gc-eu-mq/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7170 -text_lang_pal: true +text_lang: PAL incbins: - name: ipl3 segment: makerom diff --git a/baseroms/gc-eu/config.yml b/baseroms/gc-eu/config.yml index de1d26194c..278badfb80 100644 --- a/baseroms/gc-eu/config.yml +++ b/baseroms/gc-eu/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7170 -text_lang_pal: true +text_lang: PAL incbins: - name: ipl3 segment: makerom diff --git a/baseroms/gc-jp-ce/config.yml b/baseroms/gc-jp-ce/config.yml index 3a3de8c818..f73344d892 100644 --- a/baseroms/gc-jp-ce/config.yml +++ b/baseroms/gc-jp-ce/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7170 -text_lang_pal: false +text_lang: NTSC incbins: - name: ipl3 segment: makerom diff --git a/baseroms/gc-jp-mq/config.yml b/baseroms/gc-jp-mq/config.yml index 6e1ab6b0ef..81927277bd 100644 --- a/baseroms/gc-jp-mq/config.yml +++ b/baseroms/gc-jp-mq/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7170 -text_lang_pal: false +text_lang: NTSC incbins: - name: ipl3 segment: makerom diff --git a/baseroms/gc-jp/config.yml b/baseroms/gc-jp/config.yml index 08df45e6ae..26e407d8c4 100644 --- a/baseroms/gc-jp/config.yml +++ b/baseroms/gc-jp/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7170 -text_lang_pal: false +text_lang: NTSC incbins: - name: ipl3 segment: makerom diff --git a/baseroms/gc-us-mq/config.yml b/baseroms/gc-us-mq/config.yml index df026951f4..77f12ba8bd 100644 --- a/baseroms/gc-us-mq/config.yml +++ b/baseroms/gc-us-mq/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7170 -text_lang_pal: false +text_lang: NTSC incbins: - name: ipl3 segment: makerom diff --git a/baseroms/gc-us/config.yml b/baseroms/gc-us/config.yml index 60050cb7ec..c53cd1841a 100644 --- a/baseroms/gc-us/config.yml +++ b/baseroms/gc-us/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7170 -text_lang_pal: false +text_lang: NTSC incbins: - name: ipl3 segment: makerom diff --git a/baseroms/hackeroot-mq/config.yml b/baseroms/hackeroot-mq/config.yml index 84a6d3b6c7..09abaaf67a 100644 --- a/baseroms/hackeroot-mq/config.yml +++ b/baseroms/hackeroot-mq/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x12F70 -text_lang_pal: true +text_lang: PAL incbins: - name: ipl3 segment: makerom diff --git a/baseroms/ique-cn/checksum-compressed.md5 b/baseroms/ique-cn/checksum-compressed.md5 new file mode 100644 index 0000000000..ba4e5e57bf --- /dev/null +++ b/baseroms/ique-cn/checksum-compressed.md5 @@ -0,0 +1 @@ +0ab48b2d44a74b3bb2d384f6170c2742 build/ique-cn/oot-ique-cn-compressed.z64 diff --git a/baseroms/ique-cn/checksum.md5 b/baseroms/ique-cn/checksum.md5 new file mode 100644 index 0000000000..82dfff85bf --- /dev/null +++ b/baseroms/ique-cn/checksum.md5 @@ -0,0 +1 @@ +17a9f30d722c29e6912bd4b66713d2b0 build/ique-cn/oot-ique-cn.z64 diff --git a/baseroms/ique-cn/config.yml b/baseroms/ique-cn/config.yml new file mode 100644 index 0000000000..02fcba20a4 --- /dev/null +++ b/baseroms/ique-cn/config.yml @@ -0,0 +1,1212 @@ +dmadata_start: 0xB7A0 +text_lang: CN +incbins: # TODO: fix these + - name: ipl3 + segment: makerom + vram: 0x80000040 + size: 0xFC0 + - name: rspbootText + segment: boot + vram: 0x800065C0 + size: 0x160 + - name: aspMainText + segment: code + vram: 0x800E3600 + size: 0xFB0 + - name: gspF3DZEX2_NoN_PosLight_fifoText + segment: code + vram: 0x800E45B0 + size: 0x1390 + - name: gspS2DEX2d_fifoText + segment: code + vram: 0x800E5940 + size: 0x18C0 + - name: njpgdspMainText + segment: code + vram: 0x800E7200 + size: 0xAF0 + - name: aspMainData + segment: code + vram: 0x80114990 + size: 0x2E0 + - name: gspF3DZEX2_NoN_PosLight_fifoData + segment: code + vram: 0x80114C70 + size: 0x420 + - name: gspS2DEX2d_fifoData + segment: code + vram: 0x80115090 + size: 0x390 + - name: njpgdspMainData + segment: code + vram: 0x80115420 + size: 0x60 +variables: + gMtxClear: 0x80106980 + sJpnMessageEntryTable: 0x80115838 + sNesMessageEntryTable: 0x80119978 + sStaffMessageEntryTable: 0x8011DB98 + gSoundFontTable: 0x8011F280 + gSequenceFontTable: 0x8011F4F0 + gSequenceTable: 0x8011F6B0 + gSampleBankTable: 0x8011FDA0 + sShadowTex: 0x80AE0B10 +assets: +- name: code/fbdemo_circle + xml_path: assets/xml/code/fbdemo_circle.xml + start_offset: 0xEBD88 + end_offset: 0xECFA8 +- name: code/fbdemo_triforce + xml_path: assets/xml/code/fbdemo_triforce.xml + start_offset: 0xEB210 + end_offset: 0xEB2E0 +- name: code/fbdemo_wipe1 + xml_path: assets/xml/code/fbdemo_wipe1.xml + start_offset: 0xEB2E0 + end_offset: 0xEBC70 +- name: misc/link_animetion + xml_path: assets/xml/misc/link_animetion.xml +- name: misc/z_select_static + xml_path: assets/xml/misc/z_select_static.xml +- name: objects/gameplay_dangeon_keep + xml_path: assets/xml/objects/gameplay_dangeon_keep.xml +- name: objects/gameplay_field_keep + xml_path: assets/xml/objects/gameplay_field_keep.xml +- name: objects/gameplay_keep + xml_path: assets/xml/objects/gameplay_keep.xml +- name: objects/object_ahg + xml_path: assets/xml/objects/object_ahg.xml +- name: objects/object_am + xml_path: assets/xml/objects/object_am.xml +- name: objects/object_ane + xml_path: assets/xml/objects/object_ane.xml +- name: objects/object_ani + xml_path: assets/xml/objects/object_ani.xml +- name: objects/object_anubice + xml_path: assets/xml/objects/object_anubice.xml +- name: objects/object_aob + xml_path: assets/xml/objects/object_aob.xml +- name: objects/object_b_heart + xml_path: assets/xml/objects/object_b_heart.xml +- name: objects/object_Bb + xml_path: assets/xml/objects/object_Bb.xml +- name: objects/object_bba + xml_path: assets/xml/objects/object_bba.xml +- name: objects/object_bdan_objects + xml_path: assets/xml/objects/object_bdan_objects.xml +- name: objects/object_bdoor + xml_path: assets/xml/objects/object_bdoor.xml +- name: objects/object_bg + xml_path: assets/xml/objects/object_bg.xml +- name: objects/object_bigokuta + xml_path: assets/xml/objects/object_bigokuta.xml +- name: objects/object_bird + xml_path: assets/xml/objects/object_bird.xml +- name: objects/object_bji + xml_path: assets/xml/objects/object_bji.xml +- name: objects/object_bl + xml_path: assets/xml/objects/object_bl.xml +- name: objects/object_blkobj + xml_path: assets/xml/objects/object_blkobj.xml +- name: objects/object_bob + xml_path: assets/xml/objects/object_bob.xml +- name: objects/object_boj + xml_path: assets/xml/objects/object_boj.xml +- name: objects/object_bombf + xml_path: assets/xml/objects/object_bombf.xml +- name: objects/object_bombiwa + xml_path: assets/xml/objects/object_bombiwa.xml +- name: objects/object_bowl + xml_path: assets/xml/objects/object_bowl.xml +- name: objects/object_box + xml_path: assets/xml/objects/object_box.xml +- name: objects/object_brob + xml_path: assets/xml/objects/object_brob.xml +- name: objects/object_bubble + xml_path: assets/xml/objects/object_bubble.xml +- name: objects/object_bv + xml_path: assets/xml/objects/object_bv.xml +- name: objects/object_bw + xml_path: assets/xml/objects/object_bw.xml +- name: objects/object_bwall + xml_path: assets/xml/objects/object_bwall.xml +- name: objects/object_bxa + xml_path: assets/xml/objects/object_bxa.xml +- name: objects/object_cne + xml_path: assets/xml/objects/object_cne.xml +- name: objects/object_cob + xml_path: assets/xml/objects/object_cob.xml +- name: objects/object_cow + xml_path: assets/xml/objects/object_cow.xml +- name: objects/object_crow + xml_path: assets/xml/objects/object_crow.xml +- name: objects/object_cs + xml_path: assets/xml/objects/object_cs.xml +- name: objects/object_d_elevator + xml_path: assets/xml/objects/object_d_elevator.xml +- name: objects/object_d_hsblock + xml_path: assets/xml/objects/object_d_hsblock.xml +- name: objects/object_d_lift + xml_path: assets/xml/objects/object_d_lift.xml +- name: objects/object_daiku + xml_path: assets/xml/objects/object_daiku.xml +- name: objects/object_ddan_objects + xml_path: assets/xml/objects/object_ddan_objects.xml +- name: objects/object_dekubaba + xml_path: assets/xml/objects/object_dekubaba.xml +- name: objects/object_dekujr + xml_path: assets/xml/objects/object_dekujr.xml +- name: objects/object_dekunuts + xml_path: assets/xml/objects/object_dekunuts.xml +- name: objects/object_demo_6k + xml_path: assets/xml/objects/object_demo_6k.xml +- name: objects/object_demo_kekkai + xml_path: assets/xml/objects/object_demo_kekkai.xml +- name: objects/object_demo_tre_lgt + xml_path: assets/xml/objects/object_demo_tre_lgt.xml +- name: objects/object_dh + xml_path: assets/xml/objects/object_dh.xml +- name: objects/object_dnk + xml_path: assets/xml/objects/object_dnk.xml +- name: objects/object_dns + xml_path: assets/xml/objects/object_dns.xml +- name: objects/object_dodojr + xml_path: assets/xml/objects/object_dodojr.xml +- name: objects/object_dodongo + xml_path: assets/xml/objects/object_dodongo.xml +- name: objects/object_dog + xml_path: assets/xml/objects/object_dog.xml +- name: objects/object_door_gerudo + xml_path: assets/xml/objects/object_door_gerudo.xml +- name: objects/object_door_killer + xml_path: assets/xml/objects/object_door_killer.xml +- name: objects/object_ds + xml_path: assets/xml/objects/object_ds.xml +- name: objects/object_ds2 + xml_path: assets/xml/objects/object_ds2.xml +- name: objects/object_du + xml_path: assets/xml/objects/object_du.xml +- name: objects/object_dy_obj + xml_path: assets/xml/objects/object_dy_obj.xml +- name: objects/object_ec + xml_path: assets/xml/objects/object_ec.xml +- name: objects/object_efc_crystal_light + xml_path: assets/xml/objects/object_efc_crystal_light.xml +- name: objects/object_efc_doughnut + xml_path: assets/xml/objects/object_efc_doughnut.xml +- name: objects/object_efc_erupc + xml_path: assets/xml/objects/object_efc_erupc.xml +- name: objects/object_efc_fire_ball + xml_path: assets/xml/objects/object_efc_fire_ball.xml +- name: objects/object_efc_flash + xml_path: assets/xml/objects/object_efc_flash.xml +- name: objects/object_efc_lgt_shower + xml_path: assets/xml/objects/object_efc_lgt_shower.xml +- name: objects/object_efc_star_field + xml_path: assets/xml/objects/object_efc_star_field.xml +- name: objects/object_efc_tw + xml_path: assets/xml/objects/object_efc_tw.xml +- name: objects/object_ei + xml_path: assets/xml/objects/object_ei.xml +- name: objects/object_fa + xml_path: assets/xml/objects/object_fa.xml +- name: objects/object_fd + xml_path: assets/xml/objects/object_fd.xml +- name: objects/object_fd2 + xml_path: assets/xml/objects/object_fd2.xml +- name: objects/object_fhg + xml_path: assets/xml/objects/object_fhg.xml +- name: objects/object_fire + xml_path: assets/xml/objects/object_fire.xml +- name: objects/object_firefly + xml_path: assets/xml/objects/object_firefly.xml +- name: objects/object_fish + xml_path: assets/xml/objects/object_fish.xml +- name: objects/object_fr + xml_path: assets/xml/objects/object_fr.xml +- name: objects/object_fu + xml_path: assets/xml/objects/object_fu.xml +- name: objects/object_fw + xml_path: assets/xml/objects/object_fw.xml +- name: objects/object_fz + xml_path: assets/xml/objects/object_fz.xml +- name: objects/object_ganon + xml_path: assets/xml/objects/object_ganon.xml +- name: objects/object_ganon2 + xml_path: assets/xml/objects/object_ganon2.xml +- name: objects/object_ganon_anime1 + xml_path: assets/xml/objects/object_ganon_anime1.xml +- name: objects/object_ganon_anime2 + xml_path: assets/xml/objects/object_ganon_anime2.xml +- name: objects/object_ganon_anime3 + xml_path: assets/xml/objects/object_ganon_anime3.xml +- name: objects/object_ganon_objects + xml_path: assets/xml/objects/object_ganon_objects.xml +- name: objects/object_ge1 + xml_path: assets/xml/objects/object_ge1.xml +- name: objects/object_geff + xml_path: assets/xml/objects/object_geff.xml +- name: objects/object_geldb + xml_path: assets/xml/objects/object_geldb.xml +- name: objects/object_gi_arrow + xml_path: assets/xml/objects/object_gi_arrow.xml +- name: objects/object_gi_arrowcase + xml_path: assets/xml/objects/object_gi_arrowcase.xml +- name: objects/object_gi_bean + xml_path: assets/xml/objects/object_gi_bean.xml +- name: objects/object_gi_bomb_1 + xml_path: assets/xml/objects/object_gi_bomb_1.xml +- name: objects/object_gi_bomb_2 + xml_path: assets/xml/objects/object_gi_bomb_2.xml +- name: objects/object_gi_bombpouch + xml_path: assets/xml/objects/object_gi_bombpouch.xml +- name: objects/object_gi_boomerang + xml_path: assets/xml/objects/object_gi_boomerang.xml +- name: objects/object_gi_boots_2 + xml_path: assets/xml/objects/object_gi_boots_2.xml +- name: objects/object_gi_bosskey + xml_path: assets/xml/objects/object_gi_bosskey.xml +- name: objects/object_gi_bottle + xml_path: assets/xml/objects/object_gi_bottle.xml +- name: objects/object_gi_bottle_letter + xml_path: assets/xml/objects/object_gi_bottle_letter.xml +- name: objects/object_gi_bow + xml_path: assets/xml/objects/object_gi_bow.xml +- name: objects/object_gi_bracelet + xml_path: assets/xml/objects/object_gi_bracelet.xml +- name: objects/object_gi_brokensword + xml_path: assets/xml/objects/object_gi_brokensword.xml +- name: objects/object_gi_butterfly + xml_path: assets/xml/objects/object_gi_butterfly.xml +- name: objects/object_gi_clothes + xml_path: assets/xml/objects/object_gi_clothes.xml +- name: objects/object_gi_coin + xml_path: assets/xml/objects/object_gi_coin.xml +- name: objects/object_gi_compass + xml_path: assets/xml/objects/object_gi_compass.xml +- name: objects/object_gi_dekupouch + xml_path: assets/xml/objects/object_gi_dekupouch.xml +- name: objects/object_gi_egg + xml_path: assets/xml/objects/object_gi_egg.xml +- name: objects/object_gi_eye_lotion + xml_path: assets/xml/objects/object_gi_eye_lotion.xml +- name: objects/object_gi_fire + xml_path: assets/xml/objects/object_gi_fire.xml +- name: objects/object_gi_fish + xml_path: assets/xml/objects/object_gi_fish.xml +- name: objects/object_gi_frog + xml_path: assets/xml/objects/object_gi_frog.xml +- name: objects/object_gi_gerudo + xml_path: assets/xml/objects/object_gi_gerudo.xml +- name: objects/object_gi_gerudomask + xml_path: assets/xml/objects/object_gi_gerudomask.xml +- name: objects/object_gi_ghost + xml_path: assets/xml/objects/object_gi_ghost.xml +- name: objects/object_gi_glasses + xml_path: assets/xml/objects/object_gi_glasses.xml +- name: objects/object_gi_gloves + xml_path: assets/xml/objects/object_gi_gloves.xml +- name: objects/object_gi_goddess + xml_path: assets/xml/objects/object_gi_goddess.xml +- name: objects/object_gi_golonmask + xml_path: assets/xml/objects/object_gi_golonmask.xml +- name: objects/object_gi_grass + xml_path: assets/xml/objects/object_gi_grass.xml +- name: objects/object_gi_hammer + xml_path: assets/xml/objects/object_gi_hammer.xml +- name: objects/object_gi_heart + xml_path: assets/xml/objects/object_gi_heart.xml +- name: objects/object_gi_hearts + xml_path: assets/xml/objects/object_gi_hearts.xml +- name: objects/object_gi_hookshot + xml_path: assets/xml/objects/object_gi_hookshot.xml +- name: objects/object_gi_hoverboots + xml_path: assets/xml/objects/object_gi_hoverboots.xml +- name: objects/object_gi_insect + xml_path: assets/xml/objects/object_gi_insect.xml +- name: objects/object_gi_jewel + xml_path: assets/xml/objects/object_gi_jewel.xml +- name: objects/object_gi_key + xml_path: assets/xml/objects/object_gi_key.xml +- name: objects/object_gi_ki_tan_mask + xml_path: assets/xml/objects/object_gi_ki_tan_mask.xml +- name: objects/object_gi_letter + xml_path: assets/xml/objects/object_gi_letter.xml +- name: objects/object_gi_liquid + xml_path: assets/xml/objects/object_gi_liquid.xml +- name: objects/object_gi_longsword + xml_path: assets/xml/objects/object_gi_longsword.xml +- name: objects/object_gi_m_arrow + xml_path: assets/xml/objects/object_gi_m_arrow.xml +- name: objects/object_gi_magicpot + xml_path: assets/xml/objects/object_gi_magicpot.xml +- name: objects/object_gi_map + xml_path: assets/xml/objects/object_gi_map.xml +- name: objects/object_gi_medal + xml_path: assets/xml/objects/object_gi_medal.xml +- name: objects/object_gi_melody + xml_path: assets/xml/objects/object_gi_melody.xml +- name: objects/object_gi_milk + xml_path: assets/xml/objects/object_gi_milk.xml +- name: objects/object_gi_mushroom + xml_path: assets/xml/objects/object_gi_mushroom.xml +- name: objects/object_gi_niwatori + xml_path: assets/xml/objects/object_gi_niwatori.xml +- name: objects/object_gi_nuts + xml_path: assets/xml/objects/object_gi_nuts.xml +- name: objects/object_gi_ocarina + xml_path: assets/xml/objects/object_gi_ocarina.xml +- name: objects/object_gi_ocarina_0 + xml_path: assets/xml/objects/object_gi_ocarina_0.xml +- name: objects/object_gi_pachinko + xml_path: assets/xml/objects/object_gi_pachinko.xml +- name: objects/object_gi_powder + xml_path: assets/xml/objects/object_gi_powder.xml +- name: objects/object_gi_prescription + xml_path: assets/xml/objects/object_gi_prescription.xml +- name: objects/object_gi_purse + xml_path: assets/xml/objects/object_gi_purse.xml +- name: objects/object_gi_rabit_mask + xml_path: assets/xml/objects/object_gi_rabit_mask.xml +- name: objects/object_gi_redead_mask + xml_path: assets/xml/objects/object_gi_redead_mask.xml +- name: objects/object_gi_rupy + xml_path: assets/xml/objects/object_gi_rupy.xml +- name: objects/object_gi_saw + xml_path: assets/xml/objects/object_gi_saw.xml +- name: objects/object_gi_scale + xml_path: assets/xml/objects/object_gi_scale.xml +- name: objects/object_gi_seed + xml_path: assets/xml/objects/object_gi_seed.xml +- name: objects/object_gi_shield_1 + xml_path: assets/xml/objects/object_gi_shield_1.xml +- name: objects/object_gi_shield_2 + xml_path: assets/xml/objects/object_gi_shield_2.xml +- name: objects/object_gi_shield_3 + xml_path: assets/xml/objects/object_gi_shield_3.xml +- name: objects/object_gi_skj_mask + xml_path: assets/xml/objects/object_gi_skj_mask.xml +- name: objects/object_gi_soldout + xml_path: assets/xml/objects/object_gi_soldout.xml +- name: objects/object_gi_soul + xml_path: assets/xml/objects/object_gi_soul.xml +- name: objects/object_gi_stick + xml_path: assets/xml/objects/object_gi_stick.xml +- name: objects/object_gi_sutaru + xml_path: assets/xml/objects/object_gi_sutaru.xml +- name: objects/object_gi_sword_1 + xml_path: assets/xml/objects/object_gi_sword_1.xml +- name: objects/object_gi_ticketstone + xml_path: assets/xml/objects/object_gi_ticketstone.xml +- name: objects/object_gi_truth_mask + xml_path: assets/xml/objects/object_gi_truth_mask.xml +- name: objects/object_gi_zoramask + xml_path: assets/xml/objects/object_gi_zoramask.xml +- name: objects/object_gj + xml_path: assets/xml/objects/object_gj.xml +- name: objects/object_gjyo_objects + xml_path: assets/xml/objects/object_gjyo_objects.xml +- name: objects/object_gla + xml_path: assets/xml/objects/object_gla.xml +- name: objects/object_gm + xml_path: assets/xml/objects/object_gm.xml +- name: objects/object_gnd + xml_path: assets/xml/objects/object_gnd.xml +- name: objects/object_gnd_magic + xml_path: assets/xml/objects/object_gnd_magic.xml +- name: objects/object_gndd + xml_path: assets/xml/objects/object_gndd.xml +- name: objects/object_god_lgt + xml_path: assets/xml/objects/object_god_lgt.xml +- name: objects/object_gol + xml_path: assets/xml/objects/object_gol.xml +- name: objects/object_goma + xml_path: assets/xml/objects/object_goma.xml +- name: objects/object_goroiwa + xml_path: assets/xml/objects/object_goroiwa.xml +- name: objects/object_gr + xml_path: assets/xml/objects/object_gr.xml +- name: objects/object_gs + xml_path: assets/xml/objects/object_gs.xml +- name: objects/object_gt + xml_path: assets/xml/objects/object_gt.xml +- name: objects/object_haka + xml_path: assets/xml/objects/object_haka.xml +- name: objects/object_haka_door + xml_path: assets/xml/objects/object_haka_door.xml +- name: objects/object_haka_objects + xml_path: assets/xml/objects/object_haka_objects.xml +- name: objects/object_hakach_objects + xml_path: assets/xml/objects/object_hakach_objects.xml +- name: objects/object_hata + xml_path: assets/xml/objects/object_hata.xml +- name: objects/object_heavy_object + xml_path: assets/xml/objects/object_heavy_object.xml +- name: objects/object_hidan_objects + xml_path: assets/xml/objects/object_hidan_objects.xml +- name: objects/object_hintnuts + xml_path: assets/xml/objects/object_hintnuts.xml +- name: objects/object_hni + xml_path: assets/xml/objects/object_hni.xml +- name: objects/object_horse + xml_path: assets/xml/objects/object_horse.xml +- name: objects/object_horse_ganon + xml_path: assets/xml/objects/object_horse_ganon.xml +- name: objects/object_horse_link_child + xml_path: assets/xml/objects/object_horse_link_child.xml +- name: objects/object_horse_normal + xml_path: assets/xml/objects/object_horse_normal.xml +- name: objects/object_horse_zelda + xml_path: assets/xml/objects/object_horse_zelda.xml +- name: objects/object_hs + xml_path: assets/xml/objects/object_hs.xml +- name: objects/object_human + xml_path: assets/xml/objects/object_human.xml +- name: objects/object_ice_objects + xml_path: assets/xml/objects/object_ice_objects.xml +- name: objects/object_ik + xml_path: assets/xml/objects/object_ik.xml +- name: objects/object_im + xml_path: assets/xml/objects/object_im.xml +- name: objects/object_in + xml_path: assets/xml/objects/object_in.xml +- name: objects/object_ingate + xml_path: assets/xml/objects/object_ingate.xml +- name: objects/object_jj + xml_path: assets/xml/objects/object_jj.xml +- name: objects/object_js + xml_path: assets/xml/objects/object_js.xml +- name: objects/object_jya_door + xml_path: assets/xml/objects/object_jya_door.xml +- name: objects/object_jya_iron + xml_path: assets/xml/objects/object_jya_iron.xml +- name: objects/object_jya_obj + xml_path: assets/xml/objects/object_jya_obj.xml +- name: objects/object_ka + xml_path: assets/xml/objects/object_ka.xml +- name: objects/object_kanban + xml_path: assets/xml/objects/object_kanban.xml +- name: objects/object_kibako2 + xml_path: assets/xml/objects/object_kibako2.xml +- name: objects/object_kingdodongo + xml_path: assets/xml/objects/object_kingdodongo.xml +- name: objects/object_km1 + xml_path: assets/xml/objects/object_km1.xml +- name: objects/object_kusa + xml_path: assets/xml/objects/object_kusa.xml +- name: objects/object_kw1 + xml_path: assets/xml/objects/object_kw1.xml +- name: objects/object_kz + xml_path: assets/xml/objects/object_kz.xml +- name: objects/object_light_ring + xml_path: assets/xml/objects/object_light_ring.xml +- name: objects/object_lightbox + xml_path: assets/xml/objects/object_lightbox.xml +- name: objects/object_lightswitch + xml_path: assets/xml/objects/object_lightswitch.xml +- name: objects/object_link_boy + xml_path: assets/xml/objects/object_link_boy.xml +- name: objects/object_link_child + xml_path: assets/xml/objects/object_link_child.xml +- name: objects/object_ma1 + xml_path: assets/xml/objects/object_ma1.xml +- name: objects/object_ma2 + xml_path: assets/xml/objects/object_ma2.xml +- name: objects/object_mag + xml_path: assets/xml/objects/object_mag_ique.xml +- name: objects/object_mamenoki + xml_path: assets/xml/objects/object_mamenoki.xml +- name: objects/object_mastergolon + xml_path: assets/xml/objects/object_mastergolon.xml +- name: objects/object_masterkokiri + xml_path: assets/xml/objects/object_masterkokiri.xml +- name: objects/object_masterkokirihead + xml_path: assets/xml/objects/object_masterkokirihead.xml +- name: objects/object_masterzoora + xml_path: assets/xml/objects/object_masterzoora.xml +- name: objects/object_mb + xml_path: assets/xml/objects/object_mb.xml +- name: objects/object_md + xml_path: assets/xml/objects/object_md.xml +- name: objects/object_medal + xml_path: assets/xml/objects/object_medal.xml +- name: objects/object_menkuri_objects + xml_path: assets/xml/objects/object_menkuri_objects.xml +- name: objects/object_mir_ray + xml_path: assets/xml/objects/object_mir_ray.xml +- name: objects/object_mizu_objects + xml_path: assets/xml/objects/object_mizu_objects.xml +- name: objects/object_mjin + xml_path: assets/xml/objects/object_mjin.xml +- name: objects/object_mjin_dark + xml_path: assets/xml/objects/object_mjin_dark.xml +- name: objects/object_mjin_flame + xml_path: assets/xml/objects/object_mjin_flame.xml +- name: objects/object_mjin_flash + xml_path: assets/xml/objects/object_mjin_flash.xml +- name: objects/object_mjin_ice + xml_path: assets/xml/objects/object_mjin_ice.xml +- name: objects/object_mjin_oka + xml_path: assets/xml/objects/object_mjin_oka.xml +- name: objects/object_mjin_soul + xml_path: assets/xml/objects/object_mjin_soul.xml +- name: objects/object_mjin_wind + xml_path: assets/xml/objects/object_mjin_wind.xml +- name: objects/object_mk + xml_path: assets/xml/objects/object_mk.xml +- name: objects/object_mm + xml_path: assets/xml/objects/object_mm.xml +- name: objects/object_mo + xml_path: assets/xml/objects/object_mo.xml +- name: objects/object_mori_hineri1 + xml_path: assets/xml/objects/object_mori_hineri1.xml +- name: objects/object_mori_hineri1a + xml_path: assets/xml/objects/object_mori_hineri1a.xml +- name: objects/object_mori_hineri2 + xml_path: assets/xml/objects/object_mori_hineri2.xml +- name: objects/object_mori_hineri2a + xml_path: assets/xml/objects/object_mori_hineri2a.xml +- name: objects/object_mori_objects + xml_path: assets/xml/objects/object_mori_objects.xml +- name: objects/object_mori_tex + xml_path: assets/xml/objects/object_mori_tex.xml +- name: objects/object_ms + xml_path: assets/xml/objects/object_ms.xml +- name: objects/object_mu + xml_path: assets/xml/objects/object_mu.xml +- name: objects/object_nb + xml_path: assets/xml/objects/object_nb.xml +- name: objects/object_niw + xml_path: assets/xml/objects/object_niw.xml +- name: objects/object_nwc + xml_path: assets/xml/objects/object_nwc.xml +- name: objects/object_ny + xml_path: assets/xml/objects/object_ny.xml +- name: objects/object_o_anime + xml_path: assets/xml/objects/object_o_anime.xml +- name: objects/object_oA1 + xml_path: assets/xml/objects/object_oA1.xml +- name: objects/object_oA2 + xml_path: assets/xml/objects/object_oA2.xml +- name: objects/object_oA3 + xml_path: assets/xml/objects/object_oA3.xml +- name: objects/object_oA4 + xml_path: assets/xml/objects/object_oA4.xml +- name: objects/object_oA5 + xml_path: assets/xml/objects/object_oA5.xml +- name: objects/object_oA6 + xml_path: assets/xml/objects/object_oA6.xml +- name: objects/object_oA7 + xml_path: assets/xml/objects/object_oA7.xml +- name: objects/object_oA8 + xml_path: assets/xml/objects/object_oA8.xml +- name: objects/object_oA9 + xml_path: assets/xml/objects/object_oA9.xml +- name: objects/object_oA10 + xml_path: assets/xml/objects/object_oA10.xml +- name: objects/object_oA11 + xml_path: assets/xml/objects/object_oA11.xml +- name: objects/object_oB1 + xml_path: assets/xml/objects/object_oB1.xml +- name: objects/object_oB2 + xml_path: assets/xml/objects/object_oB2.xml +- name: objects/object_oB3 + xml_path: assets/xml/objects/object_oB3.xml +- name: objects/object_oB4 + xml_path: assets/xml/objects/object_oB4.xml +- name: objects/object_oE1 + xml_path: assets/xml/objects/object_oE1.xml +- name: objects/object_oE1s + xml_path: assets/xml/objects/object_oE1s.xml +- name: objects/object_oE2 + xml_path: assets/xml/objects/object_oE2.xml +- name: objects/object_oE3 + xml_path: assets/xml/objects/object_oE3.xml +- name: objects/object_oE4 + xml_path: assets/xml/objects/object_oE4.xml +- name: objects/object_oE4s + xml_path: assets/xml/objects/object_oE4s.xml +- name: objects/object_oE5 + xml_path: assets/xml/objects/object_oE5.xml +- name: objects/object_oE6 + xml_path: assets/xml/objects/object_oE6.xml +- name: objects/object_oE7 + xml_path: assets/xml/objects/object_oE7.xml +- name: objects/object_oE8 + xml_path: assets/xml/objects/object_oE8.xml +- name: objects/object_oE9 + xml_path: assets/xml/objects/object_oE9.xml +- name: objects/object_oE10 + xml_path: assets/xml/objects/object_oE10.xml +- name: objects/object_oE11 + xml_path: assets/xml/objects/object_oE11.xml +- name: objects/object_oE12 + xml_path: assets/xml/objects/object_oE12.xml +- name: objects/object_oE_anime + xml_path: assets/xml/objects/object_oE_anime.xml +- name: objects/object_oF1d_map + xml_path: assets/xml/objects/object_oF1d_map.xml +- name: objects/object_oF1s + xml_path: assets/xml/objects/object_oF1s.xml +- name: objects/object_okuta + xml_path: assets/xml/objects/object_okuta.xml +- name: objects/object_opening_demo1 + xml_path: assets/xml/objects/object_opening_demo1.xml +- name: objects/object_os + xml_path: assets/xml/objects/object_os.xml +- name: objects/object_os_anime + xml_path: assets/xml/objects/object_os_anime.xml +- name: objects/object_ossan + xml_path: assets/xml/objects/object_ossan.xml +- name: objects/object_ouke_haka + xml_path: assets/xml/objects/object_ouke_haka.xml +- name: objects/object_owl + xml_path: assets/xml/objects/object_owl.xml +- name: objects/object_peehat + xml_path: assets/xml/objects/object_peehat.xml +- name: objects/object_po_composer + xml_path: assets/xml/objects/object_po_composer.xml +- name: objects/object_po_field + xml_path: assets/xml/objects/object_po_field.xml +- name: objects/object_po_sisters + xml_path: assets/xml/objects/object_po_sisters.xml +- name: objects/object_poh + xml_path: assets/xml/objects/object_poh.xml +- name: objects/object_ps + xml_path: assets/xml/objects/object_ps.xml +- name: objects/object_pu_box + xml_path: assets/xml/objects/object_pu_box.xml +- name: objects/object_rd + xml_path: assets/xml/objects/object_rd.xml +- name: objects/object_reeba + xml_path: assets/xml/objects/object_reeba.xml +- name: objects/object_relay_objects + xml_path: assets/xml/objects/object_relay_objects.xml +- name: objects/object_rl + xml_path: assets/xml/objects/object_rl.xml +- name: objects/object_rr + xml_path: assets/xml/objects/object_rr.xml +- name: objects/object_rs + xml_path: assets/xml/objects/object_rs.xml +- name: objects/object_ru1 + xml_path: assets/xml/objects/object_ru1.xml +- name: objects/object_ru2 + xml_path: assets/xml/objects/object_ru2.xml +- name: objects/object_sa + xml_path: assets/xml/objects/object_sa.xml +- name: objects/object_sb + xml_path: assets/xml/objects/object_sb.xml +- name: objects/object_sd + xml_path: assets/xml/objects/object_sd.xml +- name: objects/object_shop_dungen + xml_path: assets/xml/objects/object_shop_dungen.xml +- name: objects/object_shopnuts + xml_path: assets/xml/objects/object_shopnuts.xml +- name: objects/object_siofuki + xml_path: assets/xml/objects/object_siofuki.xml +- name: objects/object_sk2 + xml_path: assets/xml/objects/object_sk2.xml +- name: objects/object_skb + xml_path: assets/xml/objects/object_skb.xml +- name: objects/object_skj + xml_path: assets/xml/objects/object_skj.xml +- name: objects/object_spot00_break + xml_path: assets/xml/objects/object_spot00_break.xml +- name: objects/object_spot00_objects + xml_path: assets/xml/objects/object_spot00_objects.xml +- name: objects/object_spot01_matoya + xml_path: assets/xml/objects/object_spot01_matoya.xml +- name: objects/object_spot01_matoyab + xml_path: assets/xml/objects/object_spot01_matoyab.xml +- name: objects/object_spot01_objects + xml_path: assets/xml/objects/object_spot01_objects.xml +- name: objects/object_spot01_objects2 + xml_path: assets/xml/objects/object_spot01_objects2.xml +- name: objects/object_spot02_objects + xml_path: assets/xml/objects/object_spot02_objects.xml +- name: objects/object_spot03_object + xml_path: assets/xml/objects/object_spot03_object.xml +- name: objects/object_spot04_objects + xml_path: assets/xml/objects/object_spot04_objects.xml +- name: objects/object_spot05_objects + xml_path: assets/xml/objects/object_spot05_objects.xml +- name: objects/object_spot06_objects + xml_path: assets/xml/objects/object_spot06_objects.xml +- name: objects/object_spot07_object + xml_path: assets/xml/objects/object_spot07_object.xml +- name: objects/object_spot08_obj + xml_path: assets/xml/objects/object_spot08_obj.xml +- name: objects/object_spot09_obj + xml_path: assets/xml/objects/object_spot09_obj.xml +- name: objects/object_spot11_obj + xml_path: assets/xml/objects/object_spot11_obj.xml +- name: objects/object_spot12_obj + xml_path: assets/xml/objects/object_spot12_obj.xml +- name: objects/object_spot15_obj + xml_path: assets/xml/objects/object_spot15_obj.xml +- name: objects/object_spot16_obj + xml_path: assets/xml/objects/object_spot16_obj.xml +- name: objects/object_spot17_obj + xml_path: assets/xml/objects/object_spot17_obj.xml +- name: objects/object_spot18_obj + xml_path: assets/xml/objects/object_spot18_obj.xml +- name: objects/object_ssh + xml_path: assets/xml/objects/object_ssh.xml +- name: objects/object_sst + xml_path: assets/xml/objects/object_sst.xml +- name: objects/object_st + xml_path: assets/xml/objects/object_st.xml +- name: objects/object_stream + xml_path: assets/xml/objects/object_stream.xml +- name: objects/object_syokudai + xml_path: assets/xml/objects/object_syokudai.xml +- name: objects/object_ta + xml_path: assets/xml/objects/object_ta.xml +- name: objects/object_timeblock + xml_path: assets/xml/objects/object_timeblock.xml +- name: objects/object_tite + xml_path: assets/xml/objects/object_tite.xml +- name: objects/object_tk + xml_path: assets/xml/objects/object_tk.xml +- name: objects/object_toki_objects + xml_path: assets/xml/objects/object_toki_objects.xml +- name: objects/object_torch2 + xml_path: assets/xml/objects/object_torch2.xml +- name: objects/object_toryo + xml_path: assets/xml/objects/object_toryo.xml +- name: objects/object_tp + xml_path: assets/xml/objects/object_tp.xml +- name: objects/object_tr + xml_path: assets/xml/objects/object_tr.xml +- name: objects/object_trap + xml_path: assets/xml/objects/object_trap.xml +- name: objects/object_triforce_spot + xml_path: assets/xml/objects/object_triforce_spot.xml +- name: objects/object_ts + xml_path: assets/xml/objects/object_ts.xml +- name: objects/object_tsubo + xml_path: assets/xml/objects/object_tsubo.xml +- name: objects/object_tw + xml_path: assets/xml/objects/object_tw.xml +- name: objects/object_umajump + xml_path: assets/xml/objects/object_umajump.xml +- name: objects/object_vali + xml_path: assets/xml/objects/object_vali.xml +- name: objects/object_vase + xml_path: assets/xml/objects/object_vase.xml +- name: objects/object_vm + xml_path: assets/xml/objects/object_vm.xml +- name: objects/object_wallmaster + xml_path: assets/xml/objects/object_wallmaster.xml +- name: objects/object_warp1 + xml_path: assets/xml/objects/object_warp1.xml +- name: objects/object_warp2 + xml_path: assets/xml/objects/object_warp2.xml +- name: objects/object_wf + xml_path: assets/xml/objects/object_wf.xml +- name: objects/object_wood02 + xml_path: assets/xml/objects/object_wood02.xml +- name: objects/object_xc + xml_path: assets/xml/objects/object_xc.xml +- name: objects/object_yabusame_point + xml_path: assets/xml/objects/object_yabusame_point.xml +- name: objects/object_ydan_objects + xml_path: assets/xml/objects/object_ydan_objects.xml +- name: objects/object_yukabyun + xml_path: assets/xml/objects/object_yukabyun.xml +- name: objects/object_zf + xml_path: assets/xml/objects/object_zf.xml +- name: objects/object_zg + xml_path: assets/xml/objects/object_zg.xml +- name: objects/object_zl1 + xml_path: assets/xml/objects/object_zl1.xml +- name: objects/object_zl2 + xml_path: assets/xml/objects/object_zl2.xml +- name: objects/object_zl2_anime1 + xml_path: assets/xml/objects/object_zl2_anime1.xml +- name: objects/object_zl2_anime2 + xml_path: assets/xml/objects/object_zl2_anime2.xml +- name: objects/object_zl4 + xml_path: assets/xml/objects/object_zl4.xml +- name: objects/object_zo + xml_path: assets/xml/objects/object_zo.xml +- name: overlays/ovl_Arrow_Fire + xml_path: assets/xml/overlays/ovl_Arrow_Fire.xml + start_offset: 0x980 + end_offset: 0x1DA0 +- name: overlays/ovl_Arrow_Ice + xml_path: assets/xml/overlays/ovl_Arrow_Ice.xml + start_offset: 0x9A0 + end_offset: 0x1DC0 +- name: overlays/ovl_Arrow_Light + xml_path: assets/xml/overlays/ovl_Arrow_Light.xml + start_offset: 0x9B0 + end_offset: 0x1DD0 +- name: overlays/ovl_Bg_Ganon_Otyuka + xml_path: assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml + start_offset: 0x1100 + end_offset: 0x24DC +- name: overlays/ovl_Bg_Jya_Cobra + xml_path: assets/xml/overlays/ovl_Bg_Jya_Cobra.xml + start_offset: 0x1850 + end_offset: 0x18C8 +- name: overlays/ovl_Boss_Dodongo + xml_path: assets/xml/overlays/ovl_Boss_Dodongo.xml + start_offset: 0x61E8 + end_offset: 0x91E8 +- name: overlays/ovl_Boss_Ganon + xml_path: assets/xml/overlays/ovl_Boss_Ganon.xml + start_offset: 0xE3C8 + end_offset: 0x20EE8 +- name: overlays/ovl_Boss_Ganon2 + xml_path: assets/xml/overlays/ovl_Boss_Ganon2.xml + start_offset: 0x9F88 + end_offset: 0x10438 +- name: overlays/ovl_Boss_Sst + xml_path: assets/xml/overlays/ovl_Boss_Sst.xml + start_offset: 0xA380 + end_offset: 0xAD30 +- name: overlays/ovl_Demo_Shd + xml_path: assets/xml/overlays/ovl_Demo_Shd.xml + start_offset: 0x410 + end_offset: 0x2390 +- name: overlays/ovl_Effect_Ss_Fhg_Flash + xml_path: assets/xml/overlays/ovl_Effect_Ss_Fhg_Flash.xml + start_offset: 0x9F0 + end_offset: 0xEA8 +- name: overlays/ovl_En_Bili + xml_path: assets/xml/overlays/ovl_En_Bili.xml + start_offset: 0x1E40 + end_offset: 0x1E60 +- name: overlays/ovl_En_Clear_Tag + xml_path: assets/xml/overlays/ovl_En_Clear_Tag.xml + start_offset: 0x2600 + end_offset: 0x8900 +- name: overlays/ovl_En_Ganon_Mant + xml_path: assets/xml/overlays/ovl_En_Ganon_Mant.xml + start_offset: 0x11F8 + end_offset: 0x40F8 +- name: overlays/ovl_En_Ganon_Organ + xml_path: assets/xml/overlays/ovl_En_Ganon_Organ.xml + start_offset: 0x368 + end_offset: 0x6EF0 +- name: overlays/ovl_En_Holl + xml_path: assets/xml/overlays/ovl_En_Holl.xml + start_offset: 0xE68 + end_offset: 0xED0 +- name: overlays/ovl_En_Jsjutan + xml_path: assets/xml/overlays/ovl_En_Jsjutan.xml + start_offset: 0x12C8 + end_offset: 0x4C60 +- name: overlays/ovl_En_Kanban + xml_path: assets/xml/overlays/ovl_En_Kanban.xml + start_offset: 0x2E70 + end_offset: 0x2F30 +- name: overlays/ovl_En_Sda + xml_path: assets/xml/overlays/ovl_En_Sda.xml + start_offset: 0x1498 + end_offset: 0x1528 +- name: overlays/ovl_En_Ssh + xml_path: assets/xml/overlays/ovl_En_Ssh.xml + start_offset: 0x2150 + end_offset: 0x21E0 +- name: overlays/ovl_En_St + xml_path: assets/xml/overlays/ovl_En_St.xml + start_offset: 0x26A0 + end_offset: 0x2730 +- name: overlays/ovl_En_Sth + xml_path: assets/xml/overlays/ovl_En_Sth.xml + start_offset: 0xE70 + end_offset: 0x3E44 +- name: overlays/ovl_End_Title + xml_path: assets/xml/overlays/ovl_End_Title_ique.xml + start_offset: 0x750 + end_offset: 0x59D0 +- name: overlays/ovl_file_choose + xml_path: assets/xml/overlays/ovl_file_choose.xml + start_offset: 0xEC40 + end_offset: 0xF320 +- name: overlays/ovl_Magic_Dark + xml_path: assets/xml/overlays/ovl_Magic_Dark.xml + start_offset: 0xC90 + end_offset: 0x16C0 +- name: overlays/ovl_Magic_Fire + xml_path: assets/xml/overlays/ovl_Magic_Fire.xml + start_offset: 0xB50 + end_offset: 0x21A0 +- name: overlays/ovl_Magic_Wind + xml_path: assets/xml/overlays/ovl_Magic_Wind.xml + start_offset: 0x6A0 + end_offset: 0x1BB8 +- name: overlays/ovl_Oceff_Spot + xml_path: assets/xml/overlays/ovl_Oceff_Spot.xml + start_offset: 0x780 + end_offset: 0xE58 +- name: overlays/ovl_Oceff_Storm + xml_path: assets/xml/overlays/ovl_Oceff_Storm.xml + start_offset: 0x750 + end_offset: 0x1AE0 +- name: overlays/ovl_Oceff_Wipe + xml_path: assets/xml/overlays/ovl_Oceff_Wipe.xml + start_offset: 0x520 + end_offset: 0xCE0 +- name: overlays/ovl_Oceff_Wipe2 + xml_path: assets/xml/overlays/ovl_Oceff_Wipe2.xml + start_offset: 0x430 + end_offset: 0x1698 +- name: overlays/ovl_Oceff_Wipe3 + xml_path: assets/xml/overlays/ovl_Oceff_Wipe3.xml + start_offset: 0x430 + end_offset: 0x1678 +- name: overlays/ovl_Oceff_Wipe4 + xml_path: assets/xml/overlays/ovl_Oceff_Wipe4.xml + start_offset: 0x410 + end_offset: 0xEF8 +- name: scenes/dungeons/bdan + xml_path: assets/xml/scenes/dungeons/bdan.xml +- name: scenes/dungeons/bdan_boss + xml_path: assets/xml/scenes/dungeons/bdan_boss.xml +- name: scenes/dungeons/Bmori1 + xml_path: assets/xml/scenes/dungeons/Bmori1.xml +- name: scenes/dungeons/ddan + xml_path: assets/xml/scenes/dungeons/ddan.xml +- name: scenes/dungeons/ddan_boss + xml_path: assets/xml/scenes/dungeons/ddan_boss_v2.xml +- name: scenes/dungeons/FIRE_bs + xml_path: assets/xml/scenes/dungeons/FIRE_bs.xml +- name: scenes/dungeons/ganon + xml_path: assets/xml/scenes/dungeons/ganon.xml +- name: scenes/dungeons/ganon_boss + xml_path: assets/xml/scenes/dungeons/ganon_boss.xml +- name: scenes/dungeons/ganon_demo + xml_path: assets/xml/scenes/dungeons/ganon_demo.xml +- name: scenes/dungeons/ganon_final + xml_path: assets/xml/scenes/dungeons/ganon_final.xml +- name: scenes/dungeons/ganon_sonogo + xml_path: assets/xml/scenes/dungeons/ganon_sonogo.xml +- name: scenes/dungeons/ganontika + xml_path: assets/xml/scenes/dungeons/ganontika.xml +- name: scenes/dungeons/ganontikasonogo + xml_path: assets/xml/scenes/dungeons/ganontikasonogo.xml +- name: scenes/dungeons/gerudoway + xml_path: assets/xml/scenes/dungeons/gerudoway.xml +- name: scenes/dungeons/HAKAdan + xml_path: assets/xml/scenes/dungeons/HAKAdan.xml +- name: scenes/dungeons/HAKAdan_bs + xml_path: assets/xml/scenes/dungeons/HAKAdan_bs.xml +- name: scenes/dungeons/HAKAdanCH + xml_path: assets/xml/scenes/dungeons/HAKAdanCH.xml +- name: scenes/dungeons/HIDAN + xml_path: assets/xml/scenes/dungeons/HIDAN.xml +- name: scenes/dungeons/ice_doukutu + xml_path: assets/xml/scenes/dungeons/ice_doukutu_v2.xml +- name: scenes/dungeons/jyasinboss + xml_path: assets/xml/scenes/dungeons/jyasinboss.xml +- name: scenes/dungeons/jyasinzou + xml_path: assets/xml/scenes/dungeons/jyasinzou.xml +- name: scenes/dungeons/men + xml_path: assets/xml/scenes/dungeons/men.xml +- name: scenes/dungeons/MIZUsin + xml_path: assets/xml/scenes/dungeons/MIZUsin.xml +- name: scenes/dungeons/MIZUsin_bs + xml_path: assets/xml/scenes/dungeons/MIZUsin_bs.xml +- name: scenes/dungeons/moribossroom + xml_path: assets/xml/scenes/dungeons/moribossroom.xml +- name: scenes/dungeons/ydan + xml_path: assets/xml/scenes/dungeons/ydan.xml +- name: scenes/dungeons/ydan_boss + xml_path: assets/xml/scenes/dungeons/ydan_boss.xml +- name: scenes/indoors/bowling + xml_path: assets/xml/scenes/indoors/bowling.xml +- name: scenes/indoors/daiyousei_izumi + xml_path: assets/xml/scenes/indoors/daiyousei_izumi.xml +- name: scenes/indoors/hairal_niwa + xml_path: assets/xml/scenes/indoors/hairal_niwa.xml +- name: scenes/indoors/hairal_niwa_n + xml_path: assets/xml/scenes/indoors/hairal_niwa_n.xml +- name: scenes/indoors/hakasitarelay + xml_path: assets/xml/scenes/indoors/hakasitarelay.xml +- name: scenes/indoors/hut + xml_path: assets/xml/scenes/indoors/hut.xml +- name: scenes/indoors/hylia_labo + xml_path: assets/xml/scenes/indoors/hylia_labo.xml +- name: scenes/indoors/impa + xml_path: assets/xml/scenes/indoors/impa.xml +- name: scenes/indoors/kakariko + xml_path: assets/xml/scenes/indoors/kakariko.xml +- name: scenes/indoors/kenjyanoma + xml_path: assets/xml/scenes/indoors/kenjyanoma.xml +- name: scenes/indoors/kokiri_home + xml_path: assets/xml/scenes/indoors/kokiri_home.xml +- name: scenes/indoors/kokiri_home3 + xml_path: assets/xml/scenes/indoors/kokiri_home3.xml +- name: scenes/indoors/kokiri_home4 + xml_path: assets/xml/scenes/indoors/kokiri_home4.xml +- name: scenes/indoors/kokiri_home5 + xml_path: assets/xml/scenes/indoors/kokiri_home5.xml +- name: scenes/indoors/labo + xml_path: assets/xml/scenes/indoors/labo.xml +- name: scenes/indoors/link_home + xml_path: assets/xml/scenes/indoors/link_home.xml +- name: scenes/indoors/mahouya + xml_path: assets/xml/scenes/indoors/mahouya.xml +- name: scenes/indoors/malon_stable + xml_path: assets/xml/scenes/indoors/malon_stable.xml +- name: scenes/indoors/miharigoya + xml_path: assets/xml/scenes/indoors/miharigoya.xml +- name: scenes/indoors/nakaniwa + xml_path: assets/xml/scenes/indoors/nakaniwa.xml +- name: scenes/indoors/souko + xml_path: assets/xml/scenes/indoors/souko.xml +- name: scenes/indoors/syatekijyou + xml_path: assets/xml/scenes/indoors/syatekijyou.xml +- name: scenes/indoors/takaraya + xml_path: assets/xml/scenes/indoors/takaraya.xml +- name: scenes/indoors/tent + xml_path: assets/xml/scenes/indoors/tent.xml +- name: scenes/indoors/tokinoma + xml_path: assets/xml/scenes/indoors/tokinoma.xml +- name: scenes/indoors/yousei_izumi_tate + xml_path: assets/xml/scenes/indoors/yousei_izumi_tate.xml +- name: scenes/indoors/yousei_izumi_yoko + xml_path: assets/xml/scenes/indoors/yousei_izumi_yoko.xml +- name: scenes/misc/enrui + xml_path: assets/xml/scenes/misc/enrui.xml +- name: scenes/misc/entra + xml_path: assets/xml/scenes/misc/entra.xml +- name: scenes/misc/entra_n + xml_path: assets/xml/scenes/misc/entra_n.xml +- name: scenes/misc/hakaana + xml_path: assets/xml/scenes/misc/hakaana.xml +- name: scenes/misc/hakaana2 + xml_path: assets/xml/scenes/misc/hakaana2.xml +- name: scenes/misc/hakaana_ouke + xml_path: assets/xml/scenes/misc/hakaana_ouke.xml +- name: scenes/misc/hiral_demo + xml_path: assets/xml/scenes/misc/hiral_demo.xml +- name: scenes/misc/kakariko3 + xml_path: assets/xml/scenes/misc/kakariko3.xml +- name: scenes/misc/kakusiana + xml_path: assets/xml/scenes/misc/kakusiana.xml +- name: scenes/misc/kinsuta + xml_path: assets/xml/scenes/misc/kinsuta.xml +- name: scenes/misc/market_alley + xml_path: assets/xml/scenes/misc/market_alley.xml +- name: scenes/misc/market_alley_n + xml_path: assets/xml/scenes/misc/market_alley_n.xml +- name: scenes/misc/market_day + xml_path: assets/xml/scenes/misc/market_day.xml +- name: scenes/misc/market_night + xml_path: assets/xml/scenes/misc/market_night.xml +- name: scenes/misc/market_ruins + xml_path: assets/xml/scenes/misc/market_ruins.xml +- name: scenes/misc/shrine + xml_path: assets/xml/scenes/misc/shrine.xml +- name: scenes/misc/shrine_n + xml_path: assets/xml/scenes/misc/shrine_n.xml +- name: scenes/misc/shrine_r + xml_path: assets/xml/scenes/misc/shrine_r.xml +- name: scenes/misc/turibori + xml_path: assets/xml/scenes/misc/turibori.xml +- name: scenes/overworld/ganon_tou + xml_path: assets/xml/scenes/overworld/ganon_tou.xml +- name: scenes/overworld/spot00 + xml_path: assets/xml/scenes/overworld/spot00.xml +- name: scenes/overworld/spot01 + xml_path: assets/xml/scenes/overworld/spot01.xml +- name: scenes/overworld/spot02 + xml_path: assets/xml/scenes/overworld/spot02.xml +- name: scenes/overworld/spot03 + xml_path: assets/xml/scenes/overworld/spot03.xml +- name: scenes/overworld/spot04 + xml_path: assets/xml/scenes/overworld/spot04.xml +- name: scenes/overworld/spot05 + xml_path: assets/xml/scenes/overworld/spot05.xml +- name: scenes/overworld/spot06 + xml_path: assets/xml/scenes/overworld/spot06.xml +- name: scenes/overworld/spot07 + xml_path: assets/xml/scenes/overworld/spot07.xml +- name: scenes/overworld/spot08 + xml_path: assets/xml/scenes/overworld/spot08.xml +- name: scenes/overworld/spot09 + xml_path: assets/xml/scenes/overworld/spot09.xml +- name: scenes/overworld/spot10 + xml_path: assets/xml/scenes/overworld/spot10.xml +- name: scenes/overworld/spot11 + xml_path: assets/xml/scenes/overworld/spot11.xml +- name: scenes/overworld/spot12 + xml_path: assets/xml/scenes/overworld/spot12.xml +- name: scenes/overworld/spot13 + xml_path: assets/xml/scenes/overworld/spot13.xml +- name: scenes/overworld/spot15 + xml_path: assets/xml/scenes/overworld/spot15.xml +- name: scenes/overworld/spot16 + xml_path: assets/xml/scenes/overworld/spot16_v2.xml +- name: scenes/overworld/spot17 + xml_path: assets/xml/scenes/overworld/spot17.xml +- name: scenes/overworld/spot18 + xml_path: assets/xml/scenes/overworld/spot18.xml +- name: scenes/overworld/spot20 + xml_path: assets/xml/scenes/overworld/spot20.xml +- name: scenes/shops/alley_shop + xml_path: assets/xml/scenes/shops/alley_shop.xml +- name: scenes/shops/drag + xml_path: assets/xml/scenes/shops/drag.xml +- name: scenes/shops/face_shop + xml_path: assets/xml/scenes/shops/face_shop.xml +- name: scenes/shops/golon + xml_path: assets/xml/scenes/shops/golon.xml +- name: scenes/shops/kokiri_shop + xml_path: assets/xml/scenes/shops/kokiri_shop.xml +- name: scenes/shops/night_shop + xml_path: assets/xml/scenes/shops/night_shop.xml +- name: scenes/shops/shop1 + xml_path: assets/xml/scenes/shops/shop1.xml +- name: scenes/shops/zoora + xml_path: assets/xml/scenes/shops/zoora.xml +- name: textures/backgrounds + xml_path: assets/xml/textures/backgrounds.xml +- name: textures/do_action_static + xml_path: assets/xml/textures/do_action_static.xml +- name: textures/icon_item_24_static + xml_path: assets/xml/textures/icon_item_24_static.xml +- name: textures/icon_item_dungeon_static + xml_path: assets/xml/textures/icon_item_dungeon_static.xml +- name: textures/icon_item_field_static + xml_path: assets/xml/textures/icon_item_field_static.xml +- name: textures/icon_item_gameover_static + xml_path: assets/xml/textures/icon_item_gameover_static.xml +- name: textures/icon_item_jpn_static + xml_path: assets/xml/textures/icon_item_jpn_static.xml +- name: textures/icon_item_nes_static + xml_path: assets/xml/textures/icon_item_nes_static.xml +- name: textures/icon_item_static + xml_path: assets/xml/textures/icon_item_static.xml +- name: textures/item_name_static + xml_path: assets/xml/textures/item_name_static.xml +- name: textures/kanji + xml_path: assets/xml/textures/kanji.xml +- name: textures/map_48x85_static + xml_path: assets/xml/textures/map_48x85_static.xml +- name: textures/map_grand_static + xml_path: assets/xml/textures/map_grand_static.xml +- name: textures/map_i_static + xml_path: assets/xml/textures/map_i_static.xml +- name: textures/map_name_static + xml_path: assets/xml/textures/map_name_static.xml +- name: textures/message_static + xml_path: assets/xml/textures/message_static.xml +- name: textures/message_texture_static + xml_path: assets/xml/textures/message_texture_static.xml +- name: textures/nes_font_static + xml_path: assets/xml/textures/nes_font_static_ique_cn.xml +- name: textures/nintendo_rogo_static + xml_path: assets/xml/textures/nintendo_rogo_static_v2.xml +- name: textures/parameter_static + xml_path: assets/xml/textures/parameter_static.xml +- name: textures/place_title_cards + xml_path: assets/xml/textures/place_title_cards.xml +- name: textures/skyboxes + xml_path: assets/xml/textures/skyboxes.xml +- name: textures/title_static + xml_path: assets/xml/textures/title_static.xml diff --git a/baseroms/ique-cn/segments.csv b/baseroms/ique-cn/segments.csv new file mode 100644 index 0000000000..e06853b6c2 --- /dev/null +++ b/baseroms/ique-cn/segments.csv @@ -0,0 +1,1510 @@ +Name,VRAM start +makerom,80000000 +boot,80000450 +dmadata, +Audiobank, +Audioseq, +Audiotable, +kanji, +link_animetion, +icon_item_static, +icon_item_24_static, +icon_item_field_static, +icon_item_dungeon_static, +icon_item_gameover_static, +icon_item_jpn_static, +icon_item_nes_static, +item_name_static, +map_name_static, +do_action_static, +message_static, +message_texture_static, +nes_font_static, +jpn_message_data_static, +nes_message_data_static, +staff_message_data_static, +map_grand_static, +map_48x85_static, +map_i_static, +code,80018FA0 +ovl_title,80800000 +ovl_select,80800930 +ovl_opening,808035B0 +ovl_file_choose,80803700 +ovl_kaleido_scope,808141F0 +ovl_player_actor,80830290 +ovl_map_mark_data,80856A70 +ovl_En_Test,8085D5D0 +ovl_En_GirlA,80862E80 +ovl_En_Part,808657A0 +ovl_En_Light,80866E00 +ovl_En_Door,80867C00 +ovl_En_Box,80868A40 +ovl_En_Poh,8086A5A0 +ovl_En_Okuta,8086E790 +ovl_En_Bom,80870D70 +ovl_En_Wallmas,80871C40 +ovl_En_Dodongo,80873650 +ovl_En_Firefly,808763F0 +ovl_En_Horse,80878560 +ovl_En_Arrow,808847C0 +ovl_En_Elf,80885EC0 +ovl_En_Niw,8088A880 +ovl_En_Tite,8088DBB0 +ovl_En_Reeba,80890950 +ovl_En_Peehat,808923C0 +ovl_En_Holl,80895AC0 +ovl_En_Scene_Change,80896A90 +ovl_En_Zf,80896BC0 +ovl_En_Hata,8089D6B0 +ovl_Boss_Dodongo,8089DC40 +ovl_Boss_Goma,808A7740 +ovl_En_Zl1,808AD6E0 +ovl_En_Viewer,808B14F0 +ovl_En_Goma,808B43B0 +ovl_Bg_Pushbox,808B7060 +ovl_En_Bubble,808B7360 +ovl_Door_Shutter,808B8780 +ovl_En_Dodojr,808BAA40 +ovl_En_Bdfire,808BC8E0 +ovl_En_Boom,808BD480 +ovl_En_Torch2,808BDD50 +ovl_En_Bili,808C04F0 +ovl_En_Tp,808C27C0 +ovl_En_St,808C4630 +ovl_En_Bw,808C72A0 +ovl_En_Eiyer,808CA630 +ovl_En_River_Sound,808CC290 +ovl_En_Horse_Normal,808CCC20 +ovl_En_Ossan,808CF240 +ovl_Bg_Treemouth,808D5820 +ovl_Bg_Dodoago,808D6E80 +ovl_Bg_Hidan_Dalm,808D7C30 +ovl_Bg_Hidan_Hrock,808D8480 +ovl_En_Horse_Ganon,808D8CB0 +ovl_Bg_Hidan_Rock,808D9A30 +ovl_Bg_Hidan_Rsekizou,808DAB30 +ovl_Bg_Hidan_Sekizou,808DB710 +ovl_Bg_Hidan_Sima,808DCB60 +ovl_Bg_Hidan_Syoku,808DDA60 +ovl_En_Xc,808DDEC0 +ovl_Bg_Hidan_Curtain,808E4650 +ovl_Bg_Spot00_Hanebasi,808E50F0 +ovl_En_Mb,808E6200 +ovl_En_Bombf,808EA430 +ovl_Bg_Hidan_Firewall,808EB8C0 +ovl_Bg_Dy_Yoseizo,808EC020 +ovl_En_Zl2,808EEE10 +ovl_Bg_Hidan_Fslift,808F3510 +ovl_En_OE2,808F39E0 +ovl_Bg_Ydan_Hasi,808F3AC0 +ovl_Bg_Ydan_Maruta,808F4270 +ovl_Boss_Ganondrof,808F4950 +ovl_En_Am,808F96E0 +ovl_En_Dekubaba,808FBAE0 +ovl_En_M_Fire1,808FF590 +ovl_En_M_Thunder,808FF730 +ovl_Bg_Ddan_Jd,80900D30 +ovl_Bg_Breakwall,80901380 +ovl_En_Jj,809021F0 +ovl_En_Horse_Zelda,809037C0 +ovl_Bg_Ddan_Kd,809042B0 +ovl_Door_Warp1,80904BA0 +ovl_Obj_Syokudai,80908EB0 +ovl_Item_B_Heart,80909B00 +ovl_En_Dekunuts,80909F10 +ovl_Bg_Menkuri_Kaiten,8090B710 +ovl_Bg_Menkuri_Eye,8090B8A0 +ovl_En_Vali,8090BD40 +ovl_Bg_Mizu_Movebg,8090E400 +ovl_Bg_Mizu_Water,8090F590 +ovl_Arms_Hook,80910260 +ovl_En_fHG,80910FD0 +ovl_Bg_Mori_Hineri,80913900 +ovl_En_Bb,80914650 +ovl_Bg_Toki_Hikari,80918330 +ovl_En_Yukabyun,809190D0 +ovl_Bg_Toki_Swd,809196E0 +ovl_En_Fhg_Fire,8091AD30 +ovl_Bg_Mjin,8091D3D0 +ovl_Bg_Hidan_Kousi,8091D7C0 +ovl_Door_Toki,8091DD50 +ovl_Bg_Hidan_Hamstep,8091DEB0 +ovl_En_Bird,8091ED60 +ovl_En_Wood02,8091F220 +ovl_En_Lightbox,80920400 +ovl_En_Pu_box,80920880 +ovl_En_Trap,80920BC0 +ovl_En_Arow_Trap,80921E60 +ovl_En_Vase,80921FB0 +ovl_En_Ta,809220B0 +ovl_En_Tk,80925A70 +ovl_Bg_Mori_Bigst,809278A0 +ovl_Bg_Mori_Elevator,809281D0 +ovl_Bg_Mori_Kaitenkabe,80928CC0 +ovl_Bg_Mori_Rakkatenjo,80929330 +ovl_En_Vm,80929CB0 +ovl_Demo_Effect,8092B570 +ovl_Demo_Kankyo,80931110 +ovl_Bg_Hidan_Fwbig,80934E00 +ovl_En_Floormas,80935AE0 +ovl_En_Heishi1,80938EC0 +ovl_En_Rd,8093A3D0 +ovl_En_Po_Sisters,8093CC90 +ovl_Bg_Heavy_Block,80941980 +ovl_Bg_Po_Event,80943270 +ovl_Obj_Mure,809450B0 +ovl_En_Sw,809460C0 +ovl_Boss_Fd,809498B0 +ovl_Object_Kankyo,80950C10 +ovl_En_Du,80953E90 +ovl_En_Fd,80955920 +ovl_En_Horse_Link_Child,809585C0 +ovl_Door_Ana,8095A3C0 +ovl_Bg_Spot02_Objects,8095AA30 +ovl_Bg_Haka,8095BD90 +ovl_Magic_Wind,8095C450 +ovl_Magic_Fire,8095E150 +ovl_En_Ru1,80960450 +ovl_Boss_Fd2,80967AF0 +ovl_En_Fd_Fire,8096B820 +ovl_En_Dh,8096C530 +ovl_En_Dha,8096E010 +ovl_En_Rl,8096F010 +ovl_En_Encount1,8096FEF0 +ovl_Demo_Du,80970A50 +ovl_Demo_Im,80974230 +ovl_Demo_Tre_Lgt,809781A0 +ovl_En_Fw,809788B0 +ovl_Bg_Vb_Sima,8097A070 +ovl_En_Vb_Ball,8097A790 +ovl_Bg_Haka_Megane,8097B940 +ovl_Bg_Haka_MeganeBG,8097BD40 +ovl_Bg_Haka_Ship,8097C400 +ovl_Bg_Haka_Sgami,8097CE50 +ovl_En_Heishi2,8097DA70 +ovl_En_Encount2,8097FC70 +ovl_En_Fire_Rock,80980EA0 +ovl_En_Brob,80981FB0 +ovl_Mir_Ray,809830A0 +ovl_Bg_Spot09_Obj,80984950 +ovl_Bg_Spot18_Obj,80984E70 +ovl_Boss_Va,80985740 +ovl_Bg_Haka_Tubo,8099C9D0 +ovl_Bg_Haka_Trap,8099D3F0 +ovl_Bg_Haka_Huta,8099E9C0 +ovl_Bg_Haka_Zou,8099F460 +ovl_Bg_Spot17_Funen,809A0650 +ovl_En_Syateki_Itm,809A08A0 +ovl_En_Syateki_Man,809A1640 +ovl_En_Tana,809A2400 +ovl_En_Nb,809A26B0 +ovl_Boss_Mo,809A6C80 +ovl_En_Sb,809B7260 +ovl_En_Bigokuta,809B86A0 +ovl_En_Karebaba,809BB1A0 +ovl_Bg_Bdan_Objects,809BCA90 +ovl_Demo_Sa,809BDD60 +ovl_Demo_Go,809C0880 +ovl_En_In,809C15D0 +ovl_En_Tr,809C4370 +ovl_Bg_Spot16_Bombstone,809C5C70 +ovl_Bg_Hidan_Kowarerukabe,809C71C0 +ovl_Bg_Bombwall,809C80A0 +ovl_En_Ru2,809C8960 +ovl_Obj_Dekujr,809CB6E0 +ovl_Bg_Mizu_Uzu,809CBD20 +ovl_Bg_Spot06_Objects,809CBEF0 +ovl_Bg_Ice_Objects,809CD2F0 +ovl_Bg_Haka_Water,809CE230 +ovl_En_Ma2,809CEA30 +ovl_En_Bom_Chu,809CFA90 +ovl_En_Horse_Game_Check,809D1130 +ovl_Boss_Tw,809D2200 +ovl_En_Rr,809E7DD0 +ovl_En_Ba,809EA300 +ovl_En_Bx,809EC1D0 +ovl_En_Anubice,809ECCD0 +ovl_En_Anubice_Fire,809EDF80 +ovl_Bg_Mori_Hashigo,809EED40 +ovl_Bg_Mori_Hashira4,809EF600 +ovl_Bg_Mori_Idomizu,809EFB90 +ovl_Bg_Spot16_Doughnut,809F01D0 +ovl_Bg_Bdan_Switch,809F0790 +ovl_En_Ma1,809F1BC0 +ovl_Boss_Ganon,809F2EA0 +ovl_Boss_Sst,80A18CD0 +ovl_En_Ny,80A252A0 +ovl_En_Fr,80A26BE0 +ovl_Item_Shield,80A29670 +ovl_Bg_Ice_Shelter,80A2A080 +ovl_En_Ice_Hono,80A2B2C0 +ovl_Item_Ocarina,80A2C4B0 +ovl_Magic_Dark,80A2CC80 +ovl_Demo_6K,80A2E4D0 +ovl_En_Anubice_Tag,80A31230 +ovl_Bg_Haka_Gate,80A31500 +ovl_Bg_Spot15_Saku,80A325A0 +ovl_Bg_Jya_Goroiwa,80A328E0 +ovl_Bg_Jya_Zurerukabe,80A33060 +ovl_Bg_Jya_Cobra,80A33710 +ovl_Bg_Jya_Kanaami,80A35450 +ovl_Fishing,80A35800 +ovl_Obj_Oshihiki,80A4ED40 +ovl_Bg_Gate_Shutter,80A507F0 +ovl_Eff_Dust,80A50C80 +ovl_Bg_Spot01_Fusya,80A52050 +ovl_Bg_Spot01_Idohashira,80A522F0 +ovl_Bg_Spot01_Idomizu,80A52EF0 +ovl_Bg_Po_Syokudai,80A53210 +ovl_Bg_Ganon_Otyuka,80A53B80 +ovl_Bg_Spot15_Rrbox,80A561C0 +ovl_Bg_Umajump,80A56FA0 +ovl_En_Insect,80A57130 +ovl_En_Butte,80A59650 +ovl_En_Fish,80A5AC20 +ovl_Bg_Spot08_Iceblock,80A5CD30 +ovl_Item_Etcetera,80A5DD70 +ovl_Arrow_Fire,80A5E640 +ovl_Arrow_Ice,80A60520 +ovl_Arrow_Light,80A62420 +ovl_Obj_Kibako,80A64330 +ovl_Obj_Tsubo,80A65030 +ovl_En_Wonder_Item,80A66020 +ovl_En_Ik,80A66D50 +ovl_Demo_Ik,80A6B3B0 +ovl_En_Skj,80A6C8C0 +ovl_En_Skjneedle,80A70210 +ovl_En_G_Switch,80A70520 +ovl_Demo_Ext,80A71D40 +ovl_Demo_Shd,80A72690 +ovl_En_Dns,80A74AA0 +ovl_Elf_Msg,80A75E30 +ovl_En_Honotrap,80A76420 +ovl_En_Tubo_Trap,80A77980 +ovl_Obj_Ice_Poly,80A78620 +ovl_Bg_Spot03_Taki,80A78FD0 +ovl_Bg_Spot07_Taki,80A798F0 +ovl_En_Fz,80A79EE0 +ovl_En_Po_Relay,80A7BEF0 +ovl_Bg_Relay_Objects,80A7D600 +ovl_En_Diving_Game,80A7DDB0 +ovl_En_Kusa,80A7F760 +ovl_Obj_Bean,80A80C40 +ovl_Obj_Bombiwa,80A833D0 +ovl_Obj_Switch,80A83940 +ovl_Obj_Elevator,80A85720 +ovl_Obj_Lift,80A85AE0 +ovl_Obj_Hsblock,80A86500 +ovl_En_Okarina_Tag,80A86AD0 +ovl_En_Yabusame_Mark,80A87FD0 +ovl_En_Goroiwa,80A886A0 +ovl_En_Ex_Ruppy,80A8AA60 +ovl_En_Toryo,80A8BB20 +ovl_En_Daiku,80A8C7B0 +ovl_En_Nwc,80A8DEF0 +ovl_En_Blkobj,80A8E910 +ovl_Item_Inbox,80A8EE70 +ovl_En_Ge1,80A8EFD0 +ovl_Obj_Blockstop,80A91000 +ovl_En_Sda,80A911A0 +ovl_En_Clear_Tag,80A92890 +ovl_En_Niw_Lady,80A9DE30 +ovl_En_Gm,80A9F730 +ovl_En_Ms,80AA0460 +ovl_En_Hs,80AA0B50 +ovl_Bg_Ingate,80AA16F0 +ovl_En_Kanban,80AA1A80 +ovl_En_Heishi3,80AA4BD0 +ovl_En_Syateki_Niw,80AA55A0 +ovl_En_Attack_Niw,80AA7630 +ovl_Bg_Spot01_Idosoko,80AA8890 +ovl_En_Sa,80AA8AA0 +ovl_En_Wonder_Talk,80AAAD10 +ovl_Bg_Gjyo_Bridge,80AAB3A0 +ovl_En_Ds,80AAB890 +ovl_En_Mk,80AAC4B0 +ovl_En_Bom_Bowl_Man,80AAD340 +ovl_En_Bom_Bowl_Pit,80AAE880 +ovl_En_Owl,80AAF1F0 +ovl_En_Ishi,80AB2D90 +ovl_Obj_Hana,80ABBEE0 +ovl_Obj_Lightswitch,80ABC1F0 +ovl_Obj_Mure2,80ABD620 +ovl_En_Go,80ABE040 +ovl_En_Fu,80AC2680 +ovl_En_Changer,80AC33D0 +ovl_Bg_Jya_Megami,80AC3DB0 +ovl_Bg_Jya_Lift,80AC4FA0 +ovl_Bg_Jya_Bigmirror,80AC54F0 +ovl_Bg_Jya_Bombchuiwa,80AC5D40 +ovl_Bg_Jya_Amishutter,80AC6880 +ovl_Bg_Jya_Bombiwa,80AC6C10 +ovl_Bg_Spot18_Basket,80AC71D0 +ovl_En_Ganon_Organ,80AC81C0 +ovl_En_Siofuki,80ACF200 +ovl_En_Stream,80ACFFB0 +ovl_En_Mm,80AD0540 +ovl_En_Ko,80AD1BA0 +ovl_En_Kz,80AD5CE0 +ovl_En_Weather_Tag,80AD7280 +ovl_Bg_Sst_Floor,80AD8170 +ovl_En_Ani,80AD86D0 +ovl_En_Ex_Item,80AD9440 +ovl_Bg_Jya_Ironobj,80ADA5C0 +ovl_En_Js,80ADB370 +ovl_En_Jsjutan,80ADBD40 +ovl_En_Cs,80AE1670 +ovl_En_Md,80AE28A0 +ovl_En_Hy,80AE4F10 +ovl_En_Ganon_Mant,80AE8850 +ovl_En_Okarina_Effect,80AECA80 +ovl_En_Mag,80AECE40 +ovl_Door_Gerudo,80AF1E80 +ovl_Elf_Msg2,80AF2470 +ovl_Demo_Gt,80AF28E0 +ovl_En_Po_Field,80AF7EF0 +ovl_Efc_Erupc,80AFB980 +ovl_Bg_Zg,80AFC470 +ovl_En_Heishi4,80AFC8C0 +ovl_En_Zl3,80AFD7C0 +ovl_Boss_Ganon2,80B05610 +ovl_En_Kakasi,80B18480 +ovl_En_Takara_Man,80B191C0 +ovl_Obj_Makeoshihiki,80B19A80 +ovl_Oceff_Spot,80B19F10 +ovl_End_Title,80B1AE40 +ovl_En_Torch,80B20880 +ovl_Demo_Ec,80B20970 +ovl_Shot_Sun,80B241D0 +ovl_En_Dy_Extra,80B24890 +ovl_En_Wonder_Talk2,80B24E30 +ovl_En_Ge2,80B254D0 +ovl_Obj_Roomtimer,80B26E70 +ovl_En_Ssh,80B270C0 +ovl_En_Sth,80B296B0 +ovl_Oceff_Wipe,80B2D770 +ovl_Effect_Ss_Dust,80B2E4F0 +ovl_Effect_Ss_KiraKira,80B2ED30 +ovl_Effect_Ss_Bomb,80B2F3A0 +ovl_Effect_Ss_Bomb2,80B2F7D0 +ovl_Effect_Ss_Blast,80B300D0 +ovl_Effect_Ss_G_Spk,80B30460 +ovl_Effect_Ss_D_Fire,80B30A10 +ovl_Effect_Ss_Bubble,80B30F00 +ovl_Effect_Ss_G_Ripple,80B31380 +ovl_Effect_Ss_G_Splash,80B318E0 +ovl_Effect_Ss_G_Magma,80B31D90 +ovl_Effect_Ss_G_Fire,80B31FF0 +ovl_Effect_Ss_Lightning,80B32280 +ovl_Effect_Ss_Dt_Bubble,80B32950 +ovl_Effect_Ss_Hahen,80B32EE0 +ovl_Effect_Ss_Stick,80B33520 +ovl_Effect_Ss_Sibuki,80B338C0 +ovl_Effect_Ss_Sibuki2,80B33F90 +ovl_Effect_Ss_G_Magma2,80B342C0 +ovl_Effect_Ss_Stone1,80B347D0 +ovl_Effect_Ss_HitMark,80B34B50 +ovl_Effect_Ss_Fhg_Flash,80B350A0 +ovl_Effect_Ss_K_Fire,80B36020 +ovl_Effect_Ss_Solder_Srch_Ball,80B36460 +ovl_Effect_Ss_Kakera,80B36610 +ovl_Effect_Ss_Ice_Piece,80B376A0 +ovl_Effect_Ss_En_Ice,80B37AE0 +ovl_Effect_Ss_Fire_Tail,80B383A0 +ovl_Effect_Ss_En_Fire,80B38AA0 +ovl_Effect_Ss_Extra,80B391F0 +ovl_Effect_Ss_Fcircle,80B395B0 +ovl_Effect_Ss_Dead_Db,80B39A60 +ovl_Effect_Ss_Dead_Dd,80B39F40 +ovl_Effect_Ss_Dead_Ds,80B3A4D0 +ovl_Effect_Ss_Dead_Sound,80B3A950 +ovl_Oceff_Storm,80B3AA90 +ovl_En_Weiyer,80B3C640 +ovl_Bg_Spot05_Soko,80B3E040 +ovl_Bg_Jya_1flift,80B3E360 +ovl_Bg_Jya_Haheniron,80B3E9F0 +ovl_Bg_Spot12_Gate,80B3F1E0 +ovl_Bg_Spot12_Saku,80B3F5F0 +ovl_En_Hintnuts,80B3FAB0 +ovl_En_Nutsball,80B414E0 +ovl_Bg_Spot00_Break,80B41B00 +ovl_En_Shopnuts,80B41CA0 +ovl_En_It,80B42BB0 +ovl_En_GeldB,80B42D40 +ovl_Oceff_Wipe2,80B480F0 +ovl_Oceff_Wipe3,80B49860 +ovl_En_Niw_Girl,80B4AFB0 +ovl_En_Dog,80B4BA80 +ovl_En_Si,80B4CC30 +ovl_Bg_Spot01_Objects2,80B4D130 +ovl_Obj_Comb,80B4D5F0 +ovl_Bg_Spot11_Bakudankabe,80B4DE50 +ovl_Obj_Kibako2,80B4E490 +ovl_En_Dnt_Demo,80B4EB50 +ovl_En_Dnt_Jiji,80B4F870 +ovl_En_Dnt_Nomal,80B50D90 +ovl_En_Guest,80B53B90 +ovl_Bg_Bom_Guard,80B54530 +ovl_En_Hs2,80B54750 +ovl_Demo_Kekkai,80B54D30 +ovl_Bg_Spot08_Bakudankabe,80B56020 +ovl_Bg_Spot17_Bakudankabe,80B566C0 +ovl_Obj_Mure3,80B56DB0 +ovl_En_Tg,80B57580 +ovl_En_Mu,80B57C60 +ovl_En_Go2,80B58580 +ovl_En_Wf,80B5E5C0 +ovl_En_Skb,80B628D0 +ovl_Demo_Gj,80B641C0 +ovl_Demo_Geff,80B67E70 +ovl_Bg_Gnd_Firemeiro,80B68690 +ovl_Bg_Gnd_Darkmeiro,80B68BE0 +ovl_Bg_Gnd_Soulmeiro,80B693A0 +ovl_Bg_Gnd_Nisekabe,80B69C00 +ovl_Bg_Gnd_Iceblock,80B69D70 +ovl_Bg_Ydan_Sp,80B6AE70 +ovl_En_Gb,80B6C590 +ovl_En_Gs,80B6DCC0 +ovl_Bg_Mizu_Bwall,80B6FB30 +ovl_Bg_Mizu_Shutter,80B71000 +ovl_En_Daiku_Kakariko,80B71800 +ovl_Bg_Bowl_Wall,80B72BC0 +ovl_En_Wall_Tubo,80B73540 +ovl_En_Po_Desert,80B73A30 +ovl_En_Crow,80B747F0 +ovl_Door_Killer,80B75E90 +ovl_Bg_Spot11_Oasis,80B77400 +ovl_Bg_Spot18_Futa,80B77B30 +ovl_Bg_Spot18_Shutter,80B77CD0 +ovl_En_Ma3,80B78220 +ovl_En_Cow,80B791D0 +ovl_Bg_Ice_Turara,80B7A630 +ovl_Bg_Ice_Shutter,80B7AE60 +ovl_En_Kakasi2,80B7B2D0 +ovl_En_Kakasi3,80B7B9F0 +ovl_Oceff_Wipe4,80B7CAD0 +ovl_En_Eg,80B7DAB0 +ovl_Bg_Menkuri_Nisekabe,80B7DC60 +ovl_En_Zo,80B7DDB0 +ovl_Effect_Ss_Ice_Smoke,80B80370 +ovl_Obj_Makekinsuta,80B80850 +ovl_En_Ge3,80B809A0 +ovl_Obj_Timeblock,80B815E0 +ovl_Obj_Hamishi,80B82230 +ovl_En_Zl4,80B82A80 +ovl_En_Mm2,80B874B0 +ovl_Bg_Jya_Block,80B88270 +ovl_Obj_Warp2block,80B884E0 +gameplay_keep, +gameplay_field_keep, +gameplay_dangeon_keep, +gameplay_object_exchange_static, +object_link_boy, +object_link_child, +object_box, +object_human, +object_okuta, +object_poh, +object_wallmaster, +object_dy_obj, +object_firefly, +object_dodongo, +object_fire, +object_niw, +object_tite, +object_reeba, +object_peehat, +object_kingdodongo, +object_horse, +object_zf, +object_goma, +object_zl1, +object_gol, +object_bubble, +object_dodojr, +object_torch2, +object_bl, +object_tp, +object_oA1, +object_st, +object_bw, +object_ei, +object_horse_normal, +object_oB1, +object_o_anime, +object_spot04_objects, +object_ddan_objects, +object_hidan_objects, +object_horse_ganon, +object_oA2, +object_spot00_objects, +object_mb, +object_bombf, +object_sk2, +object_oE1, +object_oE_anime, +object_oE2, +object_ydan_objects, +object_gnd, +object_am, +object_dekubaba, +object_oA3, +object_oA4, +object_oA5, +object_oA6, +object_oA7, +object_jj, +object_oA8, +object_oA9, +object_oB2, +object_oB3, +object_oB4, +object_horse_zelda, +object_opening_demo1, +object_warp1, +object_b_heart, +object_dekunuts, +object_oE3, +object_oE4, +object_menkuri_objects, +object_oE5, +object_oE6, +object_oE7, +object_oE8, +object_oE9, +object_oE10, +object_oE11, +object_oE12, +object_vali, +object_oA10, +object_oA11, +object_mizu_objects, +object_fhg, +object_ossan, +object_mori_hineri1, +object_Bb, +object_toki_objects, +object_yukabyun, +object_zl2, +object_mjin, +object_mjin_flash, +object_mjin_dark, +object_mjin_flame, +object_mjin_ice, +object_mjin_soul, +object_mjin_wind, +object_mjin_oka, +object_haka_objects, +object_spot06_objects, +object_ice_objects, +object_relay_objects, +object_mori_hineri1a, +object_mori_hineri2, +object_mori_hineri2a, +object_mori_objects, +object_mori_tex, +object_spot08_obj, +object_warp2, +object_hata, +object_bird, +object_wood02, +object_lightbox, +object_pu_box, +object_trap, +object_vase, +object_im, +object_ta, +object_tk, +object_xc, +object_vm, +object_bv, +object_hakach_objects, +object_efc_crystal_light, +object_efc_fire_ball, +object_efc_flash, +object_efc_lgt_shower, +object_efc_star_field, +object_god_lgt, +object_light_ring, +object_triforce_spot, +object_medal, +object_bdan_objects, +object_sd, +object_rd, +object_po_sisters, +object_heavy_object, +object_gndd, +object_fd, +object_du, +object_fw, +object_horse_link_child, +object_spot02_objects, +object_haka, +object_ru1, +object_syokudai, +object_fd2, +object_dh, +object_rl, +object_efc_tw, +object_demo_tre_lgt, +object_gi_key, +object_mir_ray, +object_brob, +object_gi_jewel, +object_spot09_obj, +object_spot18_obj, +object_bdoor, +object_spot17_obj, +object_shop_dungen, +object_nb, +object_mo, +object_sb, +object_gi_melody, +object_gi_heart, +object_gi_compass, +object_gi_bosskey, +object_gi_medal, +object_gi_nuts, +object_sa, +object_gi_hearts, +object_gi_arrowcase, +object_gi_bombpouch, +object_in, +object_tr, +object_spot16_obj, +object_oE1s, +object_oE4s, +object_os_anime, +object_gi_bottle, +object_gi_stick, +object_gi_map, +object_oF1d_map, +object_ru2, +object_gi_shield_1, +object_dekujr, +object_gi_magicpot, +object_gi_bomb_1, +object_oF1s, +object_ma2, +object_gi_purse, +object_hni, +object_tw, +object_rr, +object_bxa, +object_anubice, +object_gi_gerudo, +object_gi_arrow, +object_gi_bomb_2, +object_gi_egg, +object_gi_scale, +object_gi_shield_2, +object_gi_hookshot, +object_gi_ocarina, +object_gi_milk, +object_ma1, +object_ganon, +object_sst, +object_ny, +object_fr, +object_gi_pachinko, +object_gi_boomerang, +object_gi_bow, +object_gi_glasses, +object_gi_liquid, +object_ani, +object_demo_6k, +object_gi_shield_3, +object_gi_letter, +object_spot15_obj, +object_jya_obj, +object_gi_clothes, +object_gi_bean, +object_gi_fish, +object_gi_saw, +object_gi_hammer, +object_gi_grass, +object_gi_longsword, +object_spot01_objects, +object_md, +object_km1, +object_kw1, +object_zo, +object_kz, +object_umajump, +object_masterkokiri, +object_masterkokirihead, +object_mastergolon, +object_masterzoora, +object_aob, +object_ik, +object_ahg, +object_cne, +object_gi_niwatori, +object_skj, +object_gi_bottle_letter, +object_bji, +object_bba, +object_gi_ocarina_0, +object_ds, +object_ane, +object_boj, +object_spot03_object, +object_spot07_object, +object_fz, +object_bob, +object_ge1, +object_yabusame_point, +object_gi_boots_2, +object_gi_seed, +object_gnd_magic, +object_d_elevator, +object_d_hsblock, +object_d_lift, +object_mamenoki, +object_goroiwa, +object_toryo, +object_daiku, +object_nwc, +object_blkobj, +object_gm, +object_ms, +object_hs, +object_ingate, +object_lightswitch, +object_kusa, +object_tsubo, +object_gi_gloves, +object_gi_coin, +object_kanban, +object_gjyo_objects, +object_owl, +object_mk, +object_fu, +object_gi_ki_tan_mask, +object_gi_redead_mask, +object_gi_skj_mask, +object_gi_rabit_mask, +object_gi_truth_mask, +object_ganon_objects, +object_siofuki, +object_stream, +object_mm, +object_fa, +object_os, +object_gi_eye_lotion, +object_gi_powder, +object_gi_mushroom, +object_gi_ticketstone, +object_gi_brokensword, +object_js, +object_cs, +object_gi_prescription, +object_gi_bracelet, +object_gi_soldout, +object_gi_frog, +object_mag, +object_door_gerudo, +object_gt, +object_efc_erupc, +object_zl2_anime1, +object_zl2_anime2, +object_gi_golonmask, +object_gi_zoramask, +object_gi_gerudomask, +object_ganon2, +object_ka, +object_ts, +object_zg, +object_gi_hoverboots, +object_gi_m_arrow, +object_ds2, +object_ec, +object_fish, +object_gi_sutaru, +object_gi_goddess, +object_ssh, +object_bigokuta, +object_bg, +object_spot05_objects, +object_spot12_obj, +object_bombiwa, +object_hintnuts, +object_rs, +object_spot00_break, +object_gla, +object_shopnuts, +object_geldb, +object_gr, +object_dog, +object_jya_iron, +object_jya_door, +object_spot01_objects2, +object_spot11_obj, +object_kibako2, +object_dns, +object_dnk, +object_gi_fire, +object_gi_insect, +object_gi_butterfly, +object_gi_ghost, +object_gi_soul, +object_bowl, +object_po_field, +object_demo_kekkai, +object_efc_doughnut, +object_gi_dekupouch, +object_ganon_anime1, +object_ganon_anime2, +object_ganon_anime3, +object_gi_rupy, +object_spot01_matoya, +object_spot01_matoyab, +object_po_composer, +object_mu, +object_wf, +object_skb, +object_gj, +object_geff, +object_haka_door, +object_gs, +object_ps, +object_bwall, +object_crow, +object_cow, +object_cob, +object_gi_sword_1, +object_door_killer, +object_ouke_haka, +object_timeblock, +object_zl4, +g_pn_01, +g_pn_02, +g_pn_03, +g_pn_04, +g_pn_05, +g_pn_06, +g_pn_07, +g_pn_08, +g_pn_09, +g_pn_10, +g_pn_11, +g_pn_12, +g_pn_13, +g_pn_14, +g_pn_15, +g_pn_16, +g_pn_17, +g_pn_18, +g_pn_19, +g_pn_20, +g_pn_21, +g_pn_22, +g_pn_23, +g_pn_24, +g_pn_25, +g_pn_26, +g_pn_27, +g_pn_28, +g_pn_29, +g_pn_30, +g_pn_31, +g_pn_32, +g_pn_33, +g_pn_34, +g_pn_35, +g_pn_36, +g_pn_37, +g_pn_38, +g_pn_39, +g_pn_40, +g_pn_41, +g_pn_42, +g_pn_43, +g_pn_44, +g_pn_45, +g_pn_46, +g_pn_47, +g_pn_48, +g_pn_49, +g_pn_50, +g_pn_51, +g_pn_52, +g_pn_53, +g_pn_54, +g_pn_55, +g_pn_56, +g_pn_57, +z_select_static, +nintendo_rogo_static, +title_static, +parameter_static, +vr_fine0_static, +vr_fine0_pal_static, +vr_fine1_static, +vr_fine1_pal_static, +vr_fine2_static, +vr_fine2_pal_static, +vr_fine3_static, +vr_fine3_pal_static, +vr_cloud0_static, +vr_cloud0_pal_static, +vr_cloud1_static, +vr_cloud1_pal_static, +vr_cloud2_static, +vr_cloud2_pal_static, +vr_cloud3_static, +vr_cloud3_pal_static, +vr_holy0_static, +vr_holy0_pal_static, +vr_holy1_static, +vr_holy1_pal_static, +vr_MDVR_static, +vr_MDVR_pal_static, +vr_MNVR_static, +vr_MNVR_pal_static, +vr_RUVR_static, +vr_RUVR_pal_static, +vr_LHVR_static, +vr_LHVR_pal_static, +vr_KHVR_static, +vr_KHVR_pal_static, +vr_K3VR_static, +vr_K3VR_pal_static, +vr_K4VR_static, +vr_K4VR_pal_static, +vr_K5VR_static, +vr_K5VR_pal_static, +vr_SP1a_static, +vr_SP1a_pal_static, +vr_MLVR_static, +vr_MLVR_pal_static, +vr_KKRVR_static, +vr_KKRVR_pal_static, +vr_KR3VR_static, +vr_KR3VR_pal_static, +vr_IPVR_static, +vr_IPVR_pal_static, +vr_KSVR_static, +vr_KSVR_pal_static, +vr_GLVR_static, +vr_GLVR_pal_static, +vr_ZRVR_static, +vr_ZRVR_pal_static, +vr_DGVR_static, +vr_DGVR_pal_static, +vr_ALVR_static, +vr_ALVR_pal_static, +vr_NSVR_static, +vr_NSVR_pal_static, +vr_LBVR_static, +vr_LBVR_pal_static, +vr_TTVR_static, +vr_TTVR_pal_static, +vr_FCVR_static, +vr_FCVR_pal_static, +elf_message_field, +elf_message_ydan, +ydan_scene, +ydan_room_0, +ydan_room_1, +ydan_room_2, +ydan_room_3, +ydan_room_4, +ydan_room_5, +ydan_room_6, +ydan_room_7, +ydan_room_8, +ydan_room_9, +ydan_room_10, +ydan_room_11, +ddan_scene, +ddan_room_0, +ddan_room_1, +ddan_room_2, +ddan_room_3, +ddan_room_4, +ddan_room_5, +ddan_room_6, +ddan_room_7, +ddan_room_8, +ddan_room_9, +ddan_room_10, +ddan_room_11, +ddan_room_12, +ddan_room_13, +ddan_room_14, +ddan_room_15, +ddan_room_16, +bdan_scene, +bdan_room_0, +bdan_room_1, +bdan_room_2, +bdan_room_3, +bdan_room_4, +bdan_room_5, +bdan_room_6, +bdan_room_7, +bdan_room_8, +bdan_room_9, +bdan_room_10, +bdan_room_11, +bdan_room_12, +bdan_room_13, +bdan_room_14, +bdan_room_15, +Bmori1_scene, +Bmori1_room_0, +Bmori1_room_1, +Bmori1_room_2, +Bmori1_room_3, +Bmori1_room_4, +Bmori1_room_5, +Bmori1_room_6, +Bmori1_room_7, +Bmori1_room_8, +Bmori1_room_9, +Bmori1_room_10, +Bmori1_room_11, +Bmori1_room_12, +Bmori1_room_13, +Bmori1_room_14, +Bmori1_room_15, +Bmori1_room_16, +Bmori1_room_17, +Bmori1_room_18, +Bmori1_room_19, +Bmori1_room_20, +Bmori1_room_21, +Bmori1_room_22, +HIDAN_scene, +HIDAN_room_0, +HIDAN_room_1, +HIDAN_room_2, +HIDAN_room_3, +HIDAN_room_4, +HIDAN_room_5, +HIDAN_room_6, +HIDAN_room_7, +HIDAN_room_8, +HIDAN_room_9, +HIDAN_room_10, +HIDAN_room_11, +HIDAN_room_12, +HIDAN_room_13, +HIDAN_room_14, +HIDAN_room_15, +HIDAN_room_16, +HIDAN_room_17, +HIDAN_room_18, +HIDAN_room_19, +HIDAN_room_20, +HIDAN_room_21, +HIDAN_room_22, +HIDAN_room_23, +HIDAN_room_24, +HIDAN_room_25, +HIDAN_room_26, +MIZUsin_scene, +MIZUsin_room_0, +MIZUsin_room_1, +MIZUsin_room_2, +MIZUsin_room_3, +MIZUsin_room_4, +MIZUsin_room_5, +MIZUsin_room_6, +MIZUsin_room_7, +MIZUsin_room_8, +MIZUsin_room_9, +MIZUsin_room_10, +MIZUsin_room_11, +MIZUsin_room_12, +MIZUsin_room_13, +MIZUsin_room_14, +MIZUsin_room_15, +MIZUsin_room_16, +MIZUsin_room_17, +MIZUsin_room_18, +MIZUsin_room_19, +MIZUsin_room_20, +MIZUsin_room_21, +MIZUsin_room_22, +jyasinzou_scene, +jyasinzou_room_0, +jyasinzou_room_1, +jyasinzou_room_2, +jyasinzou_room_3, +jyasinzou_room_4, +jyasinzou_room_5, +jyasinzou_room_6, +jyasinzou_room_7, +jyasinzou_room_8, +jyasinzou_room_9, +jyasinzou_room_10, +jyasinzou_room_11, +jyasinzou_room_12, +jyasinzou_room_13, +jyasinzou_room_14, +jyasinzou_room_15, +jyasinzou_room_16, +jyasinzou_room_17, +jyasinzou_room_18, +jyasinzou_room_19, +jyasinzou_room_20, +jyasinzou_room_21, +jyasinzou_room_22, +jyasinzou_room_23, +jyasinzou_room_24, +jyasinzou_room_25, +jyasinzou_room_26, +jyasinzou_room_27, +jyasinzou_room_28, +HAKAdan_scene, +HAKAdan_room_0, +HAKAdan_room_1, +HAKAdan_room_2, +HAKAdan_room_3, +HAKAdan_room_4, +HAKAdan_room_5, +HAKAdan_room_6, +HAKAdan_room_7, +HAKAdan_room_8, +HAKAdan_room_9, +HAKAdan_room_10, +HAKAdan_room_11, +HAKAdan_room_12, +HAKAdan_room_13, +HAKAdan_room_14, +HAKAdan_room_15, +HAKAdan_room_16, +HAKAdan_room_17, +HAKAdan_room_18, +HAKAdan_room_19, +HAKAdan_room_20, +HAKAdan_room_21, +HAKAdan_room_22, +HAKAdanCH_scene, +HAKAdanCH_room_0, +HAKAdanCH_room_1, +HAKAdanCH_room_2, +HAKAdanCH_room_3, +HAKAdanCH_room_4, +HAKAdanCH_room_5, +HAKAdanCH_room_6, +ice_doukutu_scene, +ice_doukutu_room_0, +ice_doukutu_room_1, +ice_doukutu_room_2, +ice_doukutu_room_3, +ice_doukutu_room_4, +ice_doukutu_room_5, +ice_doukutu_room_6, +ice_doukutu_room_7, +ice_doukutu_room_8, +ice_doukutu_room_9, +ice_doukutu_room_10, +ice_doukutu_room_11, +men_scene, +men_room_0, +men_room_1, +men_room_2, +men_room_3, +men_room_4, +men_room_5, +men_room_6, +men_room_7, +men_room_8, +men_room_9, +men_room_10, +ganontika_scene, +ganontika_room_0, +ganontika_room_1, +ganontika_room_2, +ganontika_room_3, +ganontika_room_4, +ganontika_room_5, +ganontika_room_6, +ganontika_room_7, +ganontika_room_8, +ganontika_room_9, +ganontika_room_10, +ganontika_room_11, +ganontika_room_12, +ganontika_room_13, +ganontika_room_14, +ganontika_room_15, +ganontika_room_16, +ganontika_room_17, +ganontika_room_18, +ganontika_room_19, +spot00_scene, +spot00_room_0, +spot01_scene, +spot01_room_0, +spot02_scene, +spot02_room_0, +spot02_room_1, +spot03_scene, +spot03_room_0, +spot03_room_1, +spot04_scene, +spot04_room_0, +spot04_room_1, +spot04_room_2, +spot05_scene, +spot05_room_0, +spot06_scene, +spot06_room_0, +spot07_scene, +spot07_room_0, +spot07_room_1, +spot08_scene, +spot08_room_0, +spot09_scene, +spot09_room_0, +spot10_scene, +spot10_room_0, +spot10_room_1, +spot10_room_2, +spot10_room_3, +spot10_room_4, +spot10_room_5, +spot10_room_6, +spot10_room_7, +spot10_room_8, +spot10_room_9, +spot11_scene, +spot11_room_0, +spot12_scene, +spot12_room_0, +spot12_room_1, +spot13_scene, +spot13_room_0, +spot13_room_1, +spot15_scene, +spot15_room_0, +spot16_scene, +spot16_room_0, +spot17_scene, +spot17_room_0, +spot17_room_1, +spot18_scene, +spot18_room_0, +spot18_room_1, +spot18_room_2, +spot18_room_3, +market_day_scene, +market_day_room_0, +market_night_scene, +market_night_room_0, +kenjyanoma_scene, +kenjyanoma_room_0, +tokinoma_scene, +tokinoma_room_0, +tokinoma_room_1, +link_home_scene, +link_home_room_0, +kokiri_shop_scene, +kokiri_shop_room_0, +kokiri_home_scene, +kokiri_home_room_0, +kakusiana_scene, +kakusiana_room_0, +kakusiana_room_1, +kakusiana_room_2, +kakusiana_room_3, +kakusiana_room_4, +kakusiana_room_5, +kakusiana_room_6, +kakusiana_room_7, +kakusiana_room_8, +kakusiana_room_9, +kakusiana_room_10, +kakusiana_room_11, +kakusiana_room_12, +kakusiana_room_13, +entra_scene, +entra_room_0, +moribossroom_scene, +moribossroom_room_0, +moribossroom_room_1, +syatekijyou_scene, +syatekijyou_room_0, +shop1_scene, +shop1_room_0, +hairal_niwa_scene, +hairal_niwa_room_0, +ganon_tou_scene, +ganon_tou_room_0, +market_alley_scene, +market_alley_room_0, +spot20_scene, +spot20_room_0, +market_ruins_scene, +market_ruins_room_0, +entra_n_scene, +entra_n_room_0, +enrui_scene, +enrui_room_0, +market_alley_n_scene, +market_alley_n_room_0, +hiral_demo_scene, +hiral_demo_room_0, +kokiri_home3_scene, +kokiri_home3_room_0, +malon_stable_scene, +malon_stable_room_0, +kakariko_scene, +kakariko_room_0, +bdan_boss_scene, +bdan_boss_room_0, +bdan_boss_room_1, +FIRE_bs_scene, +FIRE_bs_room_0, +FIRE_bs_room_1, +hut_scene, +hut_room_0, +daiyousei_izumi_scene, +daiyousei_izumi_room_0, +hakaana_scene, +hakaana_room_0, +yousei_izumi_tate_scene, +yousei_izumi_tate_room_0, +yousei_izumi_yoko_scene, +yousei_izumi_yoko_room_0, +golon_scene, +golon_room_0, +zoora_scene, +zoora_room_0, +drag_scene, +drag_room_0, +alley_shop_scene, +alley_shop_room_0, +night_shop_scene, +night_shop_room_0, +impa_scene, +impa_room_0, +labo_scene, +labo_room_0, +tent_scene, +tent_room_0, +nakaniwa_scene, +nakaniwa_room_0, +ddan_boss_scene, +ddan_boss_room_0, +ddan_boss_room_1, +ydan_boss_scene, +ydan_boss_room_0, +ydan_boss_room_1, +HAKAdan_bs_scene, +HAKAdan_bs_room_0, +HAKAdan_bs_room_1, +MIZUsin_bs_scene, +MIZUsin_bs_room_0, +MIZUsin_bs_room_1, +ganon_scene, +ganon_room_0, +ganon_room_1, +ganon_room_2, +ganon_room_3, +ganon_room_4, +ganon_room_5, +ganon_room_6, +ganon_room_7, +ganon_room_8, +ganon_room_9, +ganon_boss_scene, +ganon_boss_room_0, +jyasinboss_scene, +jyasinboss_room_0, +jyasinboss_room_1, +jyasinboss_room_2, +jyasinboss_room_3, +kokiri_home4_scene, +kokiri_home4_room_0, +kokiri_home5_scene, +kokiri_home5_room_0, +ganon_final_scene, +ganon_final_room_0, +kakariko3_scene, +kakariko3_room_0, +hakasitarelay_scene, +hakasitarelay_room_0, +hakasitarelay_room_1, +hakasitarelay_room_2, +hakasitarelay_room_3, +hakasitarelay_room_4, +hakasitarelay_room_5, +hakasitarelay_room_6, +shrine_scene, +shrine_room_0, +turibori_scene, +turibori_room_0, +shrine_n_scene, +shrine_n_room_0, +shrine_r_scene, +shrine_r_room_0, +hakaana2_scene, +hakaana2_room_0, +gerudoway_scene, +gerudoway_room_0, +gerudoway_room_1, +gerudoway_room_2, +gerudoway_room_3, +gerudoway_room_4, +gerudoway_room_5, +hairal_niwa_n_scene, +hairal_niwa_n_room_0, +bowling_scene, +bowling_room_0, +hakaana_ouke_scene, +hakaana_ouke_room_0, +hakaana_ouke_room_1, +hakaana_ouke_room_2, +hylia_labo_scene, +hylia_labo_room_0, +souko_scene, +souko_room_0, +souko_room_1, +souko_room_2, +miharigoya_scene, +miharigoya_room_0, +mahouya_scene, +mahouya_room_0, +takaraya_scene, +takaraya_room_0, +takaraya_room_1, +takaraya_room_2, +takaraya_room_3, +takaraya_room_4, +takaraya_room_5, +takaraya_room_6, +ganon_sonogo_scene, +ganon_sonogo_room_0, +ganon_sonogo_room_1, +ganon_sonogo_room_2, +ganon_sonogo_room_3, +ganon_sonogo_room_4, +ganon_demo_scene, +ganon_demo_room_0, +face_shop_scene, +face_shop_room_0, +kinsuta_scene, +kinsuta_room_0, +ganontikasonogo_scene, +ganontikasonogo_room_0, +ganontikasonogo_room_1, +bump_texture_static, +anime_model_1_static, +anime_model_2_static, +anime_model_3_static, +anime_model_4_static, +anime_model_5_static, +anime_model_6_static, +anime_texture_1_static, +anime_texture_2_static, +anime_texture_3_static, +anime_texture_4_static, +anime_texture_5_static, +anime_texture_6_static, +softsprite_matrix_static, diff --git a/baseroms/ntsc-1.0/config.yml b/baseroms/ntsc-1.0/config.yml index 072aebec3d..2bdf99411a 100644 --- a/baseroms/ntsc-1.0/config.yml +++ b/baseroms/ntsc-1.0/config.yml @@ -2,7 +2,7 @@ checksums: - checksum-JP - checksum-US dmadata_start: 0x7430 -text_lang_pal: false +text_lang: NTSC incbins: - name: ipl3 segment: makerom diff --git a/baseroms/ntsc-1.1/config.yml b/baseroms/ntsc-1.1/config.yml index 6726cc59f6..1b110a84c8 100644 --- a/baseroms/ntsc-1.1/config.yml +++ b/baseroms/ntsc-1.1/config.yml @@ -2,7 +2,7 @@ checksums: - checksum-JP - checksum-US dmadata_start: 0x7430 -text_lang_pal: false +text_lang: NTSC incbins: - name: ipl3 segment: makerom diff --git a/baseroms/ntsc-1.2/config.yml b/baseroms/ntsc-1.2/config.yml index f9293586f9..a631ca5511 100644 --- a/baseroms/ntsc-1.2/config.yml +++ b/baseroms/ntsc-1.2/config.yml @@ -2,7 +2,7 @@ checksums: - checksum-JP - checksum-US dmadata_start: 0x7960 -text_lang_pal: false +text_lang: NTSC incbins: - name: ipl3 segment: makerom diff --git a/baseroms/pal-1.0/config.yml b/baseroms/pal-1.0/config.yml index 1a80071bbb..a8ea60b79d 100644 --- a/baseroms/pal-1.0/config.yml +++ b/baseroms/pal-1.0/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7950 -text_lang_pal: true +text_lang: PAL incbins: - name: ipl3 segment: makerom diff --git a/baseroms/pal-1.1/config.yml b/baseroms/pal-1.1/config.yml index 57f037b350..4811f1cb93 100644 --- a/baseroms/pal-1.1/config.yml +++ b/baseroms/pal-1.1/config.yml @@ -1,5 +1,5 @@ dmadata_start: 0x7950 -text_lang_pal: true +text_lang: PAL incbins: - name: ipl3 segment: makerom diff --git a/docker-compose.yml b/docker-compose.yml index a6cdbbdf8e..bca75f474c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,8 @@ -version: "3" services: oot: + build: + dockerfile: Dockerfile volumes: - - oot-sync:/oot:nocopy - image: "oot:latest" + - ./:/oot tty: true - -volumes: - oot-sync: - external: true + stdin_open: true diff --git a/docs/BUILDING_DOCKER.md b/docs/BUILDING_DOCKER.md index afc35b48bc..98aed29c97 100644 --- a/docs/BUILDING_DOCKER.md +++ b/docs/BUILDING_DOCKER.md @@ -6,22 +6,20 @@ To use Docker, you'll need either Docker Desktop or Docker Toolbox installed and You'll also need to prepare a local version of the project with a copied base ROM (see steps [2](../README.md#2-clone-the-repository) and [3](../README.md#3-prepare-a-base-rom) of the Linux instructions). -## 2. Create the Docker image +## 2. Create and start the Docker image build -From inside your local project, run the following command: +From the root of your local project, run the following command: ```bash -docker build . -t oot +docker-compose up --build ``` -## 3. Start the container +This should immediately begin steps [4](../README.md#4-setup-the-rom-and-build-process) and [5](../README.md#5-build-the-rom) within the Docker container. -To start the container, you can mount your local filesystem into the Docker container and run an interactive bash session. +## 3. Shell into the 'oot' container + +To exec into the oot Docker image at any time, run the following command either during or after the build: ```bash -docker run -it --rm --mount type=bind,source="$(pwd)",destination=/oot oot /bin/bash +docker-compose exec oot bash ``` - -## 4. Setup and Build the ROM - -Once inside the container, you can follow steps [4](../README.md#4-setup-the-rom-and-build-process) and [5](../README.md#5-build-the-rom) of the Linux instructions to setup and build the ROM, or run any other command you need. diff --git a/docs/BUILDING_MACOS.md b/docs/BUILDING_MACOS.md index af58ac3fce..d34035fcec 100644 --- a/docs/BUILDING_MACOS.md +++ b/docs/BUILDING_MACOS.md @@ -14,12 +14,13 @@ For macOS, use Homebrew to install the following dependencies: * bash * clang-format * libxml2 +* libiconv You can install them with the following commands: ```bash brew update -brew install coreutils make python3 libpng bash clang-format libxml2 +brew install coreutils make python3 libpng bash clang-format libxml2 libiconv ``` (The repository expects Homebrew-installed programs to be either linked correctly in `$PATH` etc. or in their default locations.) @@ -42,10 +43,9 @@ cd ~/binutils-tmp Get and extract binutils source ```bash -wget https://ftp.gnu.org/gnu/binutils/binutils-2.35.tar.bz2 +curl -O https://ftp.gnu.org/gnu/binutils/binutils-2.35.tar.bz2 tar xjf binutils-2.35.tar.bz2 ``` -(You may find this command does not work: if so, just access the URL in a browser and save it to `~/binutils-tmp`.) Create and enter a build directory ```bash @@ -64,9 +64,9 @@ make -j sudo make install ``` -Edit your `~/.bash_profile`/`~/.zsh_profile` (or whichever shell you use) to add the new binutils binaries to the system PATH +Edit your `~/.bash_profile`/`~/.zprofile` (or whichever shell you use) to add the new binutils binaries to the system PATH ```bash -echo "export PATH=$PATH:/opt/cross/bin" >> ~/.bash_profile +echo 'export PATH="$PATH:/opt/cross/bin"' >> ~/.bash_profile ``` Reload `~/.bash_profile` (or just launch a new terminal tab) diff --git a/docs/audio/Samplebank_XML.md b/docs/audio/Samplebank_XML.md new file mode 100644 index 0000000000..b9c027bcb7 --- /dev/null +++ b/docs/audio/Samplebank_XML.md @@ -0,0 +1,77 @@ +# Samplebank XML Format Specification + +Samplebank XMLs describe a samplebank file that contains compressed waveform data. It specifies which sample files to include as well as certain global properties such as the index of this samplebank. + +--- + +```xml + +``` +Begins a new samplebank. + +**Attributes** + +- **Name**: The name of the samplebank. +- **Index**: The index of the samplebank for the samplebank table. Must be a unique index for all samplebanks and pointers. +- **Medium**: The storage medium, from the `SampleMedium` enum. +- **CachePolicy**: The cache policy, from the `AudioCacheLoadType` enum. +- [Optional] **BufferBug**: Whether this samplebank suffers from a buffer clearing bug present in the original audio tools. For matching only. + +**Tags** + +- + ```xml + + ``` + Create an alternate index that refers to this samplebank. + + **Attributes** + + - **Index**: The alternative index, must be unique among all samplebanks and pointers. + + --- + +- + ```xml + + ``` + Adds a **compressed** sample file to the samplebank. The sample should be single-channel and big-endian, in a format that is recognizable by the audio driver such as: pcm16, vadpcm, or half-frame vadpcm. + + **Attributes** + + - **Name**: Name of this sample. Must be a valid C language identifier. + - **Path**: Path to aifc file relative to the project root (typically in `$(BUILD_DIR)/assets/audio/samples/`) + + --- + +- + ```xml + + ``` + Adds a binary blob to the samplebank. Intended for matching only when data cannot be identified. + + **Attributes** + + - **Name**: Name of this blob. Must be a valid C language identifier. + - **Path**: Path to binary file, relative to the project root (typically in `$(BUILD_DIR)/assets/audio/samples/`) + + --- + +```xml + +``` +--- diff --git a/docs/audio/Soundfont_XML.md b/docs/audio/Soundfont_XML.md new file mode 100644 index 0000000000..c2d8a572ed --- /dev/null +++ b/docs/audio/Soundfont_XML.md @@ -0,0 +1,319 @@ +# Soundfont XML Format Specification + +Soundfont XMLs describe the layout of a single soundfont. These package raw samples together into instruments, of which there are three kinds: +- **Effects**: These are simple sound effects that just play a single sample without any modulation. +- **Drums**: These define a MIDI-style percussion key map. +- **Instruments**: These are instruments that may be played at any key with up to three voices and may be modulated by an envelope. + +In the specification, `Note Name`s can be either a MIDI note name e.g. `C4` or it may be a **Zelda64** note number, which are related to MIDI note numbers ($n$) by $(n - 21) \mod 128$. + +--- + +```xml + +``` +Begins a new soundfont. + +**Attributes** +- **Name**: Soundfont symbol name. Must be a valid C identifier. +- **Index**: Soundfont index. Must be an integer. +- **Medium**: Storage medium. Must be an enum name from `SampleMedium`. +- **CachePolicy**: Cache policy. Must be an enum name from `AudioCacheLoadType`. +- **SampleBank**: Path to samplebank xml used by this soundfont. +- [Optional] **Indirect**: Pointer index if the samplebank is referenced indirectly. +- [Optional] **SampleBankDD**: Path to samplebank xml used for DD medium. +- [Optional] **IndirectDD**: Pointer index if the DD samplebank is referenced indirectly. +- [Optional] **LoopsHaveFrames**: Whether loops in this soundfont store the total frame count of the sample. Must be a boolean. +- [Optional] **PadToSize**: For matching only. Specifies the total file size the result output should be padded to. +- [Optional] **NumInstruments**: For matching only. Specifies the total number of instrument pointers. Usually this is automatically assigned based on `max(program_number) + 1` but some vanilla banks don't match this way. + +**Tags** + +- + ```xml + + ``` + Lists envelopes defined in this soundfont. + + **Attributes** + + N/A + + **Tags** + + - + ```xml + + ``` + Starts a new envelope. + + **Attributes** + + - **Name**: Unique name for this envelope. Must be a valid C identifier. + - **Release**: Release rate index (into `gAudioCtx.adsrDecayTable`) for this envelope + + **Tags** + + - + ```xml + + ``` + Add a point to the envelope at (delay, arg) + + **Attributes** + + - **Delay**: Duration until the next point + - **Arg**: Value of the envelope at this point + + --- + + - + ```xml + + ``` + Insert a ADSR_DISABLE command + + --- + + - + ```xml + + ``` + Insert a ADSR_HANG command + + --- + + - + ```xml + + ``` + Insert a ADSR_GOTO command + + **Attributes** + + - **Index**: Index of the envelope point to jump to + + --- + + ```xml + + ``` + --- + + ```xml + + ``` + --- + +- + ```xml + + ``` + Begins a list of samples used in this Soundfont. + + **Attributes** + + - [Optional] **IsDD**: Whether all the samples in the list are on the Disk Drive. The sample data will come from the samplebank `SampleBankDD`. **Default is `false`.** **NOTE this is not fully implemented, it should always be `false`.** + - [Optional] **Cached**: Whether all the samples in the list should be added to the `usedSamples` cache. **Default is `false`.** + + **Tags** + + - + ```xml + + ``` + Declares a sample used in this soundfont. + + **Attributes** + + - **Name**: The name of this sample. A sample with this name must be present in the samplebank used by the soundfont. + - [Optional] **SampleRate**: An overriding sample rate for this sample. **Default comes from the sample file.** + - [Optional] **BaseNote**: An overriding root key for this sample. **Default comes from the sample file.** + - [Optional] **IsDD**: Whether this sample is on the Disk Drive. The sample data will come from the samplebank `SampleBankDD`. **Default is `false`.** **NOTE this is not fully implemented, it should always be `false`.** + - [Optional] **Cached**: Whether this sample should be added to the `usedSamples` cache. **Default is `false`.** + + --- + + ```xml + + ``` + --- + +- + ```xml + + ``` + Begins a list of sound effects to define for this soundfont. Sound effects correspond to simple sounds that cannot be played at different keys. + + **Attributes** + + N/A + + **Tags** + + - + ```xml + + ``` + Defines a single sound effect. + + **Attributes** + - **Name**: The name of the sound effect, the name is made available in sequence files in the form `SF{n}_{name}` where `n` is the index of this soundfont and `name` is this name. For example, if `n=0` and `name=ExampleEffect` the name to use in sequence files is `SF0_ExampleEffect`. + - **Sample**: The name of the sample associated with this effect. + - [Optional] **SampleRate**: An overriding sample rate for this effect. **Default comes from the sample definition.** + - [Optional] **BaseNote**: An overriding root key for this effect. **Default comes from the sample definition.** + + --- + + ```xml + + ``` + --- + +- + ```xml + + ``` + Begins the percussion definitions for this soundfont. Percussion corresponds to the MIDI notion of percussion, where single samples are mapped across a range of keys. + + **Attributes** + + N/A + + **Tags** + + - + ```xml + + ``` + Defines a single percussion range. + + **Attributes** + - **Name**: The name of this sound. Definitions are emitted for sequence files in the form `SF{n}_{name}_{note}` for every note covered by this sound. + - [Optional] **Note**: The key to map this sound to. Should not overlap with other definitions. **If this field is left unspecified, `NoteStart` and `NoteEnd` become required.** + - [Optional] **NoteStart**: The first key that is mapped to this sound. Should not overlap with other definitions. **If this field is left unspecified, `Note` becomes required. If this field is specified, `NoteEnd` must also be specified.** + - [Optional] **NoteEnd**: The last key that is mapped to this sound. Should not overlap with other definitions. **If this field is left unspecified, `Note` becomes required. If this field is specified, `NoteStart` must also be specified.** + - **Pan**: The stereo weight for this sound. Center=`64`. + - **Envelope**: The envelope to modulate the volume over time with. Must be defined in the `Envelopes` list. + - [Optional] **Release**: An override for the envelope release rate. **Default is the release rate specified in the envelope definition** + - **Sample**: The name of the sample to use. + - [Optional] **SampleRate**: An overriding sample rate for this sound. **Default comes from the sample definition.** + - [Optional] **BaseNote**: An overriding root key for this sound. **Default comes from the sample definition.** + + --- + + ```xml + + ``` + --- + +- + ```xml + + ``` + Begins the instrument definitions for this soundfont. Instruments correspond to the MIDI notion of instruments, with up to 3 samples (voices) per instrument that must map to contiguous ranges of notes. + + **Attributes** + + N/A + + **Tags** + + - + ```xml + + ``` + Defines an instrument. + + **Attributes** + - **ProgramNumber**: MIDI Program Number for this instrument. Must be in the range `0 <= n <= 125` + - **Name**: The name of this instrument. + - **Envelope**: Envelope to use, identified by name. + - [Optional] **Release**: Release rate index override. **Default release rate comes from the chosen envelope.** + - **Sample**: The name of the middle sample to use for this instrument. + - [Optional] **SampleRate**: Sample rate override for the middle sample. **Default is sourced from the sample properties.** + - [Optional] **BaseNote**: Base note override for the middle sample. **Default is sourced from the sample properties.** + - [Optional] **RangeLo**: The largest note for SampleLo. SampleLo will be used instead of Sample for keys in the range [0, RangeLo]. **If left unspecified, SampleLo must not be specified. If specified, SampleLo must be specified.** + - [Optional] **SampleLo**: The name of the low sample to use for this instrument. + - [Optional] **SampleRateLo**: Sample rate override for the low sample. **Default is sourced from the sample properties.** + - [Optional] **BaseNoteLo**: Base note override for the low sample. **Default is sourced from the sample properties.** + - [Optional] **RangeHi**: The smallest note for SampleHi. SampleHi will be used instead of Sample for keys in the range [RangeHi, 127]. **If left unspecified, SampleHi must not be specified. If specified, SampleHi must be specified.** + - [Optional] **SampleHi**: The name of the high sample to use for this instrument. + - [Optional] **SampleRateHi**: Sample rate override for the high sample. **Default is sourced from the sample properties.** + - [Optional] **BaseNoteHi**: Base note override for the high sample. **Default is sourced from the sample properties.** + + --- + + ```xml + + ``` + --- + +```xml + +``` +--- diff --git a/docs/audio/build_flowchart.png b/docs/audio/build_flowchart.png new file mode 100644 index 0000000000..9ef26221ee Binary files /dev/null and b/docs/audio/build_flowchart.png differ diff --git a/docs/libu64.md b/docs/libu64.md index 34cc668c8c..67c1223231 100644 --- a/docs/libu64.md +++ b/docs/libu64.md @@ -62,7 +62,7 @@ Note `debug.c` has additional debug-only functions in gc-eu-mq-dbg, hinting that Additionally `debug.c`, `gfxprint.c` and `pad.c` all require compilation flags `-O2` (instead of `-O2 -g3`) to match, as supplementary evidence these were part of a separately compiled library. -`-O2` is also required for most files between `gfxprint.c` and `pad.c` in the code segment (see spec), hinting that these other files (`loadfragment2_n64.c`, `loadfragment2_gc.c`, `mtxuty-cvt.c`, `relocation_gc.c`, `load_gc.c`, `code_800FC620.c`) are also part of libu64. +`-O2` is also required for most files between `gfxprint.c` and `pad.c` in the code segment (see spec), hinting that these other files (`loadfragment2_n64.c`, `loadfragment2_gc.c`, `mtxuty-cvt.c`, `relocation_gc.c`, `load_gc.c`, `system_heap.c`) are also part of libu64. Files `rcp_utils.c` and `logseverity_gc.c` do not strictly require `-O2`, but they do match with `-O2`. diff --git a/format.py b/format.py index 9eaf983d31..0350475589 100755 --- a/format.py +++ b/format.py @@ -30,8 +30,8 @@ # Compiler options used with Clang-Tidy # Normal warnings are disabled with -Wno-everything to focus only on tidying -INCLUDES = "-Iinclude -Isrc -Ibuild/gc-eu-mq-dbg -Ibuild/hackeroot-mq -I." -DEFINES = "-D_LANGUAGE_C -DNON_MATCHING -DF3DEX_GBI_2" +INCLUDES = "-Iinclude -Isrc -Ibuild/gc-eu-mq-dbg -I. -Ibuild/hackeroot-mq -I." +DEFINES = "-D_LANGUAGE_C -DNON_MATCHING -DF3DEX_GBI_2 -DBUILD_CREATOR=\"\" -DBUILD_DATE=__DATE__ -DBUILD_TIME=__TIME__" COMPILER_OPTS = f"-fno-builtin -std=gnu90 -m32 -Wno-everything {INCLUDES} {DEFINES}" diff --git a/include/attributes.h b/include/attributes.h index c3154cac7b..3276c84325 100644 --- a/include/attributes.h +++ b/include/attributes.h @@ -8,12 +8,22 @@ #endif #define UNUSED __attribute__((unused)) -#define FALLTHROUGH __attribute__((fallthrough)) -#define NORETURN __attribute__((noreturn)) #define NO_REORDER __attribute__((no_reorder)) #define SECTION_DATA __attribute__((section(".data"))) -#ifdef __GNUC__ +#if __GNUC__ >= 7 +#define FALLTHROUGH __attribute__((fallthrough)) +#else +#define FALLTHROUGH +#endif + +#if defined(__GNUC__) && defined(NON_MATCHING) +#define NORETURN __attribute__((noreturn)) +#else +#define NORETURN +#endif + +#if defined(__GNUC__) && defined(NON_MATCHING) #define UNREACHABLE() __builtin_unreachable() #else #define UNREACHABLE() diff --git a/include/audio/aseq.h b/include/audio/aseq.h index ac600738b0..689c42664f 100644 --- a/include/audio/aseq.h +++ b/include/audio/aseq.h @@ -558,10 +558,9 @@ _RESET_SECTION .macro .startseq name /* Begin a sequence. */ - /* Write the sequence name into a special .name section */ - .pushsection .name, "", @note + /* Write the sequence name into a special .note.name section */ + .pushsection .note.name, "", @note .asciz "\name" - .balign 4 .popsection /* Reset section and write start symbol. */ diff --git a/include/fault.h b/include/fault.h index a95ae59064..8f1979520f 100644 --- a/include/fault.h +++ b/include/fault.h @@ -5,7 +5,7 @@ #include "attributes.h" #include "padmgr.h" -#if PLATFORM_GC +#if !PLATFORM_N64 // These are the same as the 3-bit ansi color codes #define FAULT_COLOR_BLACK 0 #define FAULT_COLOR_RED 1 @@ -33,7 +33,7 @@ typedef struct FaultClient { /* 0x0C */ void* arg1; } FaultClient; // size = 0x10 -#if PLATFORM_GC +#if !PLATFORM_N64 typedef struct FaultAddrConvClient { /* 0x00 */ struct FaultAddrConvClient* next; /* 0x04 */ void* callback; @@ -78,7 +78,7 @@ void func_800AE1F8(void); #define Fault_SetFontColor(color) (void)0 #define Fault_SetCharPad(padW, padH) (void)0 -#elif PLATFORM_GC +#else void Fault_InitDrawer(void); void Fault_SetForeColor(u16 color); @@ -98,7 +98,7 @@ extern volatile OSThread* gFaultFaultedThread; #define FAULT_MSG_ID gFaultMsgId -#elif PLATFORM_GC +#else typedef struct FaultMgr { /* 0x000 */ OSThread thread; diff --git a/include/functions.h b/include/functions.h index 542509684f..2861a437f7 100644 --- a/include/functions.h +++ b/include/functions.h @@ -66,13 +66,6 @@ void CutsceneFlags_UnsetAll(PlayState* play); void CutsceneFlags_Set(PlayState* play, s16 flag); void CutsceneFlags_Unset(PlayState* play, s16 flag); s32 CutsceneFlags_Get(PlayState* play, s16 flag); -s32 func_8006CFC0(s32 sceneId); -void func_8006D074(PlayState* play); -void func_8006D0AC(PlayState* play); -void func_8006D0EC(PlayState* play, Player* player); -void func_8006D684(PlayState* play, Player* player); -void func_8006DC68(PlayState* play, Player* player); -void func_8006DD9C(Actor* actor, Vec3f* arg1, s16 arg2); s32 Kanji_OffsetFromShiftJIS(s32 character); void Font_LoadCharWide(Font* font, u16 character, u16 codePointIndex); diff --git a/include/libc/assert.h b/include/libc/assert.h index 3e1c174d50..ec5bb5eee5 100644 --- a/include/libc/assert.h +++ b/include/libc/assert.h @@ -31,7 +31,7 @@ __attribute__((noreturn)) void __assert(const char* assertion, const char* file, // Static/compile-time assertions -#if defined(__GNUC__) || (__STDC_VERSION__ >= 201112L) +#if !defined(__sgi) && (__GNUC__ >= 5 || __STDC_VERSION__ >= 201112L) # define static_assert(cond, msg) _Static_assert(cond, msg) #else # ifndef GLUE diff --git a/include/libc/math.h b/include/libc/math.h index b46b6cd911..4389b576ef 100644 --- a/include/libc/math.h +++ b/include/libc/math.h @@ -61,6 +61,10 @@ f64 sqrt(f64 f); #endif #if !PLATFORM_N64 +extern float gPositiveInfinity; +extern float gNegativeInfinity; +extern float gPositiveZero; +extern float gNegativeZero; extern float qNaN0x3FFFFF; extern float qNaN0x10000; extern float sNaN0x3FFFFF; diff --git a/include/libc/stdarg.h b/include/libc/stdarg.h index 35ce4f944e..ec57a0c846 100644 --- a/include/libc/stdarg.h +++ b/include/libc/stdarg.h @@ -1,16 +1,16 @@ #ifndef STDARG_H #define STDARG_H -// When building with GCC, use the official vaarg macros to avoid warnings and possibly bad codegen. +// When building with modern GCC, use the official vaarg macros to avoid warnings and possibly bad codegen. -#ifdef __GNUC__ +#if __GNUC__ >= 3 #define va_list __builtin_va_list #define va_start __builtin_va_start #define va_arg __builtin_va_arg #define va_end __builtin_va_end -#else +#elif defined(__sgi) /* IDO */ #ifndef _VA_LIST_ # define _VA_LIST_ @@ -52,6 +52,28 @@ typedef char* va_list; /* No cleanup processing is required for the end of a varargs list: */ #define va_end(__list) -#endif /* __GNUC__ */ +#else /* EGCS */ + +typedef char * __gnuc_va_list; + +#define __va_rounded_size(__TYPE) \ + (((sizeof (__TYPE) + sizeof (int) - 1) / sizeof (int)) * sizeof (int)) + +#define va_start(__AP, __LASTARG) \ + (__AP = (__gnuc_va_list) __builtin_next_arg (__LASTARG)) + +#define va_end(__AP) ((void)0) + +/* We cast to void * and then to TYPE * because this avoids + a warning about increasing the alignment requirement. */ +#define va_arg(__AP, __type) \ + ((__type *) (void *) (__AP = (char *) ((__alignof__(__type) > 4 \ + ? ((__PTRDIFF_TYPE__)__AP + 8 - 1) & -8 \ + : ((__PTRDIFF_TYPE__)__AP + 4 - 1) & -4) \ + + __va_rounded_size(__type))))[-1] + +typedef __gnuc_va_list va_list; + +#endif #endif diff --git a/include/libc/stddef.h b/include/libc/stddef.h index 45620895ee..0c0926ba6b 100644 --- a/include/libc/stddef.h +++ b/include/libc/stddef.h @@ -15,7 +15,7 @@ typedef unsigned long size_t; #endif -#ifdef __GNUC__ +#if __GNUC__ >= 4 #define offsetof(structure, member) __builtin_offsetof (structure, member) #else #define offsetof(structure, member) ((size_t)&(((structure*)0)->member)) diff --git a/include/libc64/os_malloc.h b/include/libc64/os_malloc.h index 91b0d93c47..fcd4da1e14 100644 --- a/include/libc64/os_malloc.h +++ b/include/libc64/os_malloc.h @@ -11,7 +11,7 @@ typedef struct Arena { #if PLATFORM_N64 /* 0x08 */ u32 size; /* 0x0C */ u8 allocFailures; -#elif PLATFORM_GC +#else /* 0x08 */ OSMesgQueue lockQueue; /* 0x20 */ u8 allocFailures; // only used in non-debug builds /* 0x21 */ u8 isInit; diff --git a/include/line_numbers.h b/include/line_numbers.h new file mode 100644 index 0000000000..f0d0ae5faa --- /dev/null +++ b/include/line_numbers.h @@ -0,0 +1,67 @@ +#ifndef LINE_NUMBERS_H +#define LINE_NUMBERS_H + +// The macros in this file serve to reduce clutter from version differences that are only due to line numbers being different. + +// The "LN" macros defined here are not meant to be used directly. See the wrapper macros below. +#if OOT_VERSION == NTSC_1_0 +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_0) +#elif OOT_VERSION == NTSC_1_1 +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_1) +#elif OOT_VERSION == PAL_1_0 +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (pal_1_0) +#elif OOT_VERSION == NTSC_1_2 +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_2) +#elif OOT_VERSION == PAL_1_1 +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (pal_1_1) +#elif OOT_VERSION == GC_JP +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp) +#elif OOT_VERSION == GC_JP_MQ +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp_mq) +#elif OOT_VERSION == GC_US +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_us) +#elif OOT_VERSION == GC_US_MQ +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_us_mq) +#elif OOT_VERSION == GC_EU_MQ_DBG +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu_mq_dbg) +#elif OOT_VERSION == GC_EU +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu) +#elif OOT_VERSION == GC_EU_MQ +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu_mq) +#elif OOT_VERSION == GC_JP_CE +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp_ce) +#elif OOT_VERSION == IQUE_CN +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ique_cn) +#else +#error "Unsupported OOT version" +#endif + +/** + * These wrappers exist to remove duplication of line numbers being passed to LN. + * The wrappers have ambiguous names purposefully so they are short and don't add clutter. + * + * The groupings of different line numbers are difficult to name, as the exact grouping + * depends on which versions happen to have changes in a given file. + */ + +// NTSC 1.0 and all the other versions +#define LN1(ntsc_1_0, other) \ + LN(ntsc_1_0, other, other, other, other, other, other, other, other, other, other, other, other, other) + +// NTSC 1.0, NTSC 1.1, and all the other versions +#define LN2(ntsc_1_0, ntsc_1_1, other) \ + LN(ntsc_1_0, ntsc_1_1, other, other, other, other, other, other, other, other, other, other, other, other) + +// NTSC 1.0, Gamecube, and all the other versions +#define LN3(ntsc_1_0, other, gc) \ + LN(ntsc_1_0, other, other, other, other, gc, gc, gc, gc, gc, gc, gc, gc, gc) + +// NTSC 1.0, NTSC 1.1, Gamecube, and all the other versions +#define LN4(ntsc_1_0, ntsc_1_1, other, gc, ique) \ + LN(ntsc_1_0, ntsc_1_1, other, other, other, gc, gc, gc, gc, gc, gc, gc, gc, ique) + +// NTSC 1.0, NTSC 1.1, NTSC 1.2/PAL 1.0, Gamecube US/JP, Gamecube EU, and Gamecube CE +#define LN5(ntsc_1_0, ntsc_1_1, other, pal_1_1, gc_ntsc, gc_eu, gc_jp_ce) \ + LN(ntsc_1_0, ntsc_1_1, other, other, pal_1_1, gc_ntsc, gc_ntsc, gc_ntsc, gc_ntsc, gc_eu, gc_eu, gc_eu, gc_jp_ce, gc_jp_ce) + +#endif diff --git a/include/macros.h b/include/macros.h index da78aa7502..dcbf295a99 100644 --- a/include/macros.h +++ b/include/macros.h @@ -54,6 +54,8 @@ #define PRINTF osSyncPrintf #elif IDO_PRINTF_WORKAROUND #define PRINTF(args) (void)0 +#elif defined(__GNUC__) && __GNUC__ < 3 +#define PRINTF(format, args...) (void)0 #else #define PRINTF(format, ...) (void)0 #endif diff --git a/include/regs.h b/include/regs.h index ce267b9a9f..3f3be0659d 100644 --- a/include/regs.h +++ b/include/regs.h @@ -120,6 +120,8 @@ #define R_MESSAGE_DEBUGGER_TEXTID YREG(79) #define R_C_UP_ICON_X YREG(88) #define R_C_UP_ICON_Y YREG(89) +#define R_EXITED_SCENE_RIDING_HORSE AREG(6) // Used to spawn the player on top of Epona in the next scene +#define R_DEBUG_FORCE_EPONA_OBTAINED DREG(1) // If set, overrides EVENTCHKINF_EPONA_OBTAINED state giving Epona #define R_EPONAS_SONG_PLAYED DREG(53) #define R_MAGIC_FILL_COLOR(i) ZREG(0 + (i)) #define R_PAUSE_PAGE_SWITCH_FRAME_ADVANCE_ON ZREG(13) diff --git a/include/sfx.h b/include/sfx.h index 47a449e9c4..16d0b122d3 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -4,6 +4,7 @@ #include "ultra64.h" #include "versions.h" #include "z64math.h" +#include "libc/assert.h" typedef enum SfxBankType { /* 0 */ BANK_PLAYER, @@ -63,23 +64,48 @@ typedef struct SfxBankEntry { typedef enum SfxId { NA_SE_NONE, // Requesting a sfx with this id will play no sound + NA_SE_PL_BASE = 0x7FF, #include "tables/sfx/playerbank_table.h" + NA_SE_PL_END, + NA_SE_IT_BASE = 0x17FF, #include "tables/sfx/itembank_table.h" + NA_SE_IT_END, + NA_SE_EV_BASE = 0x27FF, #include "tables/sfx/environmentbank_table.h" + NA_SE_EV_END, + NA_SE_EN_BASE = 0x37FF, #include "tables/sfx/enemybank_table.h" + NA_SE_EN_END, + NA_SE_SY_BASE = 0x47FF, #include "tables/sfx/systembank_table.h" + NA_SE_SY_END, + NA_SE_OC_BASE = 0x57FF, #include "tables/sfx/ocarinabank_table.h" + NA_SE_OC_END, + NA_SE_VO_BASE = 0x67FF, #include "tables/sfx/voicebank_table.h" + NA_SE_VO_END, + NA_SE_MAX } SfxId; +// These limits are due to the way Sequence 0 is programmed. There is also a global limit of 512 entries for every bank +// enforced in Audio_PlayActiveSfx in sfx.c +static_assert(NA_SE_PL_END - (NA_SE_PL_BASE + 1) <= 256, "Player Bank SFX Table is limited to 256 entries due to Sequence 0"); +static_assert(NA_SE_IT_END - (NA_SE_IT_BASE + 1) <= 128, "Item Bank SFX Table is limited to 128 entries due to Sequence 0"); +static_assert(NA_SE_EV_END - (NA_SE_EV_BASE + 1) <= 256, "Environment Bank SFX Table is limited to 256 entries due to Sequence 0"); +static_assert(NA_SE_EN_END - (NA_SE_EN_BASE + 1) <= 512, "Enemy Bank SFX Table is limited to 512 entries due to Sequence 0"); +static_assert(NA_SE_SY_END - (NA_SE_SY_BASE + 1) <= 128, "System Bank SFX Table is limited to 128 entries due to Sequence 0"); +static_assert(NA_SE_OC_END - (NA_SE_OC_BASE + 1) <= 128, "Ocarina Bank SFX Table is limited to 128 entries due to Sequence 0"); +static_assert(NA_SE_VO_END - (NA_SE_VO_BASE + 1) <= 256, "Voice Bank SFX Table is limited to 256 entries due to Sequence 0"); + #undef DEFINE_SFX #define SFX_BANK_SHIFT(sfxId) (((sfxId) >> 12) & 0xFF) diff --git a/include/ultra64.h b/include/ultra64.h index e1f9a7c9b9..e8a4bd0ca7 100644 --- a/include/ultra64.h +++ b/include/ultra64.h @@ -31,6 +31,7 @@ #include "ultra64/motor.h" #include "ultra64/R4300.h" #include "ultra64/ucode.h" +#include "ultra64/version.h" union uObjBg; @@ -42,7 +43,7 @@ void osStopThread(OSThread* thread); void osViExtendVStart(u32 value); s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flag); -#if PLATFORM_N64 +#if LIBULTRA_VERSION < LIBULTRA_VERSION_K void osInitialize(void); #else #define osInitialize() \ diff --git a/include/ultra64/R4300.h b/include/ultra64/R4300.h index 6398ea17c4..1c2da84f12 100644 --- a/include/ultra64/R4300.h +++ b/include/ultra64/R4300.h @@ -4,13 +4,11 @@ #ifdef _LANGUAGE_C #include "ultratypes.h" #define U32(x) ((u32)x) -#define C_REG(x) (x) #else #define U32(x) (x) -#define C_REG(x) $x #endif -// Segment base addresses and sizes +/* Segment base addresses and sizes */ #define KUBASE 0 #define KUSIZE 0x80000000 #define K0BASE 0x80000000 @@ -20,24 +18,24 @@ #define K2BASE 0xC0000000 #define K2SIZE 0x20000000 -// Exception vectors -#define SIZE_EXCVEC 0x80 // Size of an exc. vec -#define UT_VEC K0BASE // utlbmiss vector -#define R_VEC (K1BASE + 0x1FC00000) // reset vector -#define XUT_VEC (K0BASE + 0x80) // extended address tlbmiss -#define ECC_VEC (K0BASE + 0x100) // Ecc exception vector -#define E_VEC (K0BASE + 0x180) // Gen. exception vector - -// Address conversion macros -#define K0_TO_K1(x) (U32(x) | 0xA0000000) // kseg0 to kseg1 -#define K1_TO_K0(x) (U32(x) & 0x9FFFFFFF) // kseg1 to kseg0 -#define K0_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) // kseg0 to physical -#define K1_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) // kseg1 to physical -#define KDM_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) // direct mapped to physical -#define PHYS_TO_K0(x) (U32(x) | 0x80000000) // physical to kseg0 -#define PHYS_TO_K1(x) (U32(x) | 0xA0000000) // physical to kseg1 - -// Address predicates +/* Exception vectors */ +#define SIZE_EXCVEC 0x80 /* Size of an exc. vec */ +#define UT_VEC K0BASE /* utlbmiss vector */ +#define R_VEC (K1BASE + 0x1FC00000) /* reset vector */ +#define XUT_VEC (K0BASE + 0x80) /* extended address tlbmiss */ +#define ECC_VEC (K0BASE + 0x100) /* Ecc exception vector */ +#define E_VEC (K0BASE + 0x180) /* Gen. exception vector */ + +/* Address conversion macros */ +#define K0_TO_K1(x) (U32(x) | 0xA0000000) /* kseg0 to kseg1 */ +#define K1_TO_K0(x) (U32(x) & 0x9FFFFFFF) /* kseg1 to kseg0 */ +#define K0_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) /* kseg0 to physical */ +#define K1_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) /* kseg1 to physical */ +#define KDM_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) /* direct mapped to physical */ +#define PHYS_TO_K0(x) (U32(x) | 0x80000000) /* physical to kseg0 */ +#define PHYS_TO_K1(x) (U32(x) | 0xA0000000) /* physical to kseg1 */ + +/* Address predicates */ #define IS_KSEG0(x) (U32(x) >= K0BASE && U32(x) < K1BASE) #define IS_KSEG1(x) (U32(x) >= K1BASE && U32(x) < K2BASE) #define IS_KSEGDM(x) (U32(x) >= K0BASE && U32(x) < K2BASE) @@ -45,25 +43,25 @@ #define IS_KPTESEG(x) (U32(x) >= KPTE_SHDUBASE) #define IS_KUSEG(x) (U32(x) < K0BASE) -// TLB size constants +/* TLB size constants */ #define NTLBENTRIES 31 /* entry 31 is reserved by rdb */ #define TLBHI_VPN2MASK 0xFFFFE000 #define TLBHI_VPN2SHIFT 13 #define TLBHI_PIDMASK 0xFF #define TLBHI_PIDSHIFT 0 -#define TLBHI_NPID 255 // 255 to fit in 8 bits +#define TLBHI_NPID 255 /* 255 to fit in 8 bits */ #define TLBLO_PFNMASK 0x3FFFFFC0 #define TLBLO_PFNSHIFT 6 -#define TLBLO_CACHMASK 0x38 // cache coherency algorithm +#define TLBLO_CACHMASK 0x38 /* cache coherency algorithm */ #define TLBLO_CACHSHIFT 3 -#define TLBLO_UNCACHED 0x10 // not cached -#define TLBLO_NONCOHRNT 0x18 // Cacheable non-coherent -#define TLBLO_EXLWR 0x28 // Exclusive write -#define TLBLO_D 0x4 // writeable -#define TLBLO_V 0x2 // valid bit -#define TLBLO_G 0x1 // global access bit +#define TLBLO_UNCACHED 0x10 /* not cached */ +#define TLBLO_NONCOHRNT 0x18 /* Cacheable non-coherent */ +#define TLBLO_EXLWR 0x28 /* Exclusive write */ +#define TLBLO_D 0x4 /* writeable */ +#define TLBLO_V 0x2 /* valid bit */ +#define TLBLO_G 0x1 /* global access bit */ #define TLBINX_PROBE 0x80000000 #define TLBINX_INXMASK 0x3F @@ -88,104 +86,104 @@ /* * Status register */ -#define SR_CUMASK 0xF0000000 // coproc usable bits - -#define SR_CU3 0x80000000 // Coprocessor 3 usable -#define SR_CU2 0x40000000 // Coprocessor 2 usable -#define SR_CU1 0x20000000 // Coprocessor 1 usable -#define SR_CU0 0x10000000 // Coprocessor 0 usable -#define SR_RP 0x08000000 // Reduced power (quarter speed) -#define SR_FR 0x04000000 // MIPS III FP register mode -#define SR_RE 0x02000000 // Reverse endian -#define SR_ITS 0x01000000 // Instruction trace support -#define SR_BEV 0x00400000 // Use boot exception vectors -#define SR_TS 0x00200000 // TLB shutdown -#define SR_SR 0x00100000 // Soft reset occured -#define SR_CH 0x00040000 // Cache hit for last 'cache' op -#define SR_CE 0x00020000 // Create ECC -#define SR_DE 0x00010000 // ECC of parity does not cause error - -// Interrupt enable bits -// (NOTE: bits set to 1 enable the corresponding level interrupt) -#define SR_IMASK 0x0000FF00 // Interrupt mask -#define SR_IMASK8 0x00000000 // mask level 8 -#define SR_IMASK7 0x00008000 // mask level 7 -#define SR_IMASK6 0x0000C000 // mask level 6 -#define SR_IMASK5 0x0000E000 // mask level 5 -#define SR_IMASK4 0x0000F000 // mask level 4 -#define SR_IMASK3 0x0000F800 // mask level 3 -#define SR_IMASK2 0x0000FC00 // mask level 2 -#define SR_IMASK1 0x0000FE00 // mask level 1 -#define SR_IMASK0 0x0000FF00 // mask level 0 - -#define SR_IBIT8 0x00008000 // bit level 8 -#define SR_IBIT7 0x00004000 // bit level 7 -#define SR_IBIT6 0x00002000 // bit level 6 -#define SR_IBIT5 0x00001000 // bit level 5 -#define SR_IBIT4 0x00000800 // bit level 4 -#define SR_IBIT3 0x00000400 // bit level 3 -#define SR_IBIT2 0x00000200 // bit level 2 -#define SR_IBIT1 0x00000100 // bit level 1 +#define SR_CUMASK 0xF0000000 /* coproc usable bits */ + +#define SR_CU3 0x80000000 /* Coprocessor 3 usable */ +#define SR_CU2 0x40000000 /* Coprocessor 2 usable */ +#define SR_CU1 0x20000000 /* Coprocessor 1 usable */ +#define SR_CU0 0x10000000 /* Coprocessor 0 usable */ +#define SR_RP 0x08000000 /* Reduced power (quarter speed) */ +#define SR_FR 0x04000000 /* MIPS III FP register mode */ +#define SR_RE 0x02000000 /* Reverse endian */ +#define SR_ITS 0x01000000 /* Instruction trace support */ +#define SR_BEV 0x00400000 /* Use boot exception vectors */ +#define SR_TS 0x00200000 /* TLB shutdown */ +#define SR_SR 0x00100000 /* Soft reset occured */ +#define SR_CH 0x00040000 /* Cache hit for last 'cache' op */ +#define SR_CE 0x00020000 /* Create ECC */ +#define SR_DE 0x00010000 /* ECC of parity does not cause error */ + +/* Interrupt enable bits */ +/* (NOTE: bits set to 1 enable the corresponding level interrupt) */ +#define SR_IMASK 0x0000FF00 /* Interrupt mask */ +#define SR_IMASK8 0x00000000 /* mask level 8 */ +#define SR_IMASK7 0x00008000 /* mask level 7 */ +#define SR_IMASK6 0x0000C000 /* mask level 6 */ +#define SR_IMASK5 0x0000E000 /* mask level 5 */ +#define SR_IMASK4 0x0000F000 /* mask level 4 */ +#define SR_IMASK3 0x0000F800 /* mask level 3 */ +#define SR_IMASK2 0x0000FC00 /* mask level 2 */ +#define SR_IMASK1 0x0000FE00 /* mask level 1 */ +#define SR_IMASK0 0x0000FF00 /* mask level 0 */ + +#define SR_IBIT8 0x00008000 /* bit level 8 */ +#define SR_IBIT7 0x00004000 /* bit level 7 */ +#define SR_IBIT6 0x00002000 /* bit level 6 */ +#define SR_IBIT5 0x00001000 /* bit level 5 */ +#define SR_IBIT4 0x00000800 /* bit level 4 */ +#define SR_IBIT3 0x00000400 /* bit level 3 */ +#define SR_IBIT2 0x00000200 /* bit level 2 */ +#define SR_IBIT1 0x00000100 /* bit level 1 */ #define SR_IMASKSHIFT 8 -#define SR_KX 0x00000080 // extended-addr TLB vec in kernel -#define SR_SX 0x00000040 // xtended-addr TLB vec supervisor -#define SR_UX 0x00000020 // xtended-addr TLB vec in user mode -#define SR_KSU_MASK 0x00000018 // mode mask -#define SR_KSU_USR 0x00000010 // user mode -#define SR_KSU_SUP 0x00000008 // supervisor mode -#define SR_KSU_KER 0x00000000 // kernel mode -#define SR_ERL 0x00000004 // Error level, 1=>cache error -#define SR_EXL 0x00000002 // Exception level, 1=>exception -#define SR_IE 0x00000001 // interrupt enable, 1=>enable - -// Cause Register -#define CAUSE_BD 0x80000000 // Branch delay slot -#define CAUSE_CEMASK 0x30000000 // coprocessor error +#define SR_KX 0x00000080 /* extended-addr TLB vec in kernel */ +#define SR_SX 0x00000040 /* xtended-addr TLB vec supervisor */ +#define SR_UX 0x00000020 /* xtended-addr TLB vec in user mode */ +#define SR_KSU_MASK 0x00000018 /* mode mask */ +#define SR_KSU_USR 0x00000010 /* user mode */ +#define SR_KSU_SUP 0x00000008 /* supervisor mode */ +#define SR_KSU_KER 0x00000000 /* kernel mode */ +#define SR_ERL 0x00000004 /* Error level, 1=>cache error */ +#define SR_EXL 0x00000002 /* Exception level, 1=>exception */ +#define SR_IE 0x00000001 /* interrupt enable, 1=>enable */ + +/* Cause Register */ +#define CAUSE_BD 0x80000000 /* Branch delay slot */ +#define CAUSE_CEMASK 0x30000000 /* coprocessor error */ #define CAUSE_CESHIFT 28 -// Interrupt pending bits -#define CAUSE_IP8 0x00008000 // External level 8 pending - COMPARE -#define CAUSE_IP7 0x00004000 // External level 7 pending - INT4 -#define CAUSE_IP6 0x00002000 // External level 6 pending - INT3 -#define CAUSE_IP5 0x00001000 // External level 5 pending - INT2 -#define CAUSE_IP4 0x00000800 // External level 4 pending - INT1 -#define CAUSE_IP3 0x00000400 // External level 3 pending - INT0 -#define CAUSE_SW2 0x00000200 // Software level 2 pending -#define CAUSE_SW1 0x00000100 // Software level 1 pending - -#define CAUSE_IPMASK 0x0000FF00 // Pending interrupt mask +/* Interrupt pending bits */ +#define CAUSE_IP8 0x00008000 /* External level 8 pending - COMPARE */ +#define CAUSE_IP7 0x00004000 /* External level 7 pending - INT4 */ +#define CAUSE_IP6 0x00002000 /* External level 6 pending - INT3 */ +#define CAUSE_IP5 0x00001000 /* External level 5 pending - INT2 */ +#define CAUSE_IP4 0x00000800 /* External level 4 pending - INT1 */ +#define CAUSE_IP3 0x00000400 /* External level 3 pending - INT0 */ +#define CAUSE_SW2 0x00000200 /* Software level 2 pending */ +#define CAUSE_SW1 0x00000100 /* Software level 1 pending */ + +#define CAUSE_IPMASK 0x0000FF00 /* Pending interrupt mask */ #define CAUSE_IPSHIFT 8 -#define CAUSE_EXCMASK 0x0000007C // Cause code bits +#define CAUSE_EXCMASK 0x0000007C /* Cause code bits */ #define CAUSE_EXCSHIFT 2 -// Cause register exception codes +/* Cause register exception codes */ #define EXC_CODE(x) ((x) << 2) -// Hardware exception codes -#define EXC_INT EXC_CODE(0) // interrupt -#define EXC_MOD EXC_CODE(1) // TLB mod -#define EXC_RMISS EXC_CODE(2) // Read TLB Miss -#define EXC_WMISS EXC_CODE(3) // Write TLB Miss -#define EXC_RADE EXC_CODE(4) // Read Address Error -#define EXC_WADE EXC_CODE(5) // Write Address Error -#define EXC_IBE EXC_CODE(6) // Instruction Bus Error -#define EXC_DBE EXC_CODE(7) // Data Bus Error -#define EXC_SYSCALL EXC_CODE(8) // SYSCALL -#define EXC_BREAK EXC_CODE(9) // BREAKpoint -#define EXC_II EXC_CODE(10) // Illegal Instruction -#define EXC_CPU EXC_CODE(11) // CoProcessor Unusable -#define EXC_OV EXC_CODE(12) // OVerflow -#define EXC_TRAP EXC_CODE(13) // Trap exception -#define EXC_VCEI EXC_CODE(14) // Virt. Coherency on Inst. fetch -#define EXC_FPE EXC_CODE(15) // Floating Point Exception -#define EXC_WATCH EXC_CODE(23) // Watchpoint reference -#define EXC_VCED EXC_CODE(31) // Virt. Coherency on data read - -// C0_PRID Defines +/* Hardware exception codes */ +#define EXC_INT EXC_CODE(0) /* interrupt */ +#define EXC_MOD EXC_CODE(1) /* TLB mod */ +#define EXC_RMISS EXC_CODE(2) /* Read TLB Miss */ +#define EXC_WMISS EXC_CODE(3) /* Write TLB Miss */ +#define EXC_RADE EXC_CODE(4) /* Read Address Error */ +#define EXC_WADE EXC_CODE(5) /* Write Address Error */ +#define EXC_IBE EXC_CODE(6) /* Instruction Bus Error */ +#define EXC_DBE EXC_CODE(7) /* Data Bus Error */ +#define EXC_SYSCALL EXC_CODE(8) /* SYSCALL */ +#define EXC_BREAK EXC_CODE(9) /* BREAKpoint */ +#define EXC_II EXC_CODE(10) /* Illegal Instruction */ +#define EXC_CPU EXC_CODE(11) /* CoProcessor Unusable */ +#define EXC_OV EXC_CODE(12) /* OVerflow */ +#define EXC_TRAP EXC_CODE(13) /* Trap exception */ +#define EXC_VCEI EXC_CODE(14) /* Virt. Coherency on Inst. fetch */ +#define EXC_FPE EXC_CODE(15) /* Floating Point Exception */ +#define EXC_WATCH EXC_CODE(23) /* Watchpoint reference */ +#define EXC_VCED EXC_CODE(31) /* Virt. Coherency on data read */ + +/* C0_PRID Defines */ #define C0_IMPMASK 0xFF00 #define C0_IMPSHIFT 8 #define C0_REVMASK 0xFF @@ -193,106 +191,106 @@ #define C0_MAJREVSHIFT 4 #define C0_MINREVMASK 0xF -// Coprocessor 0 operations -#define C0_READI 0x1 // read ITLB entry addressed by C0_INDEX -#define C0_WRITEI 0x2 // write ITLB entry addressed by C0_INDEX -#define C0_WRITER 0x6 // write ITLB entry addressed by C0_RAND -#define C0_PROBE 0x8 // probe for ITLB entry addressed by TLBHI -#define C0_RFE 0x10 // restore for exception - -// 'cache' instruction definitions - -// Target cache -#define CACH_PI 0x0 // specifies primary inst. cache -#define CACH_PD 0x1 // primary data cache -#define CACH_SI 0x2 // secondary instruction cache -#define CACH_SD 0x3 // secondary data cache - -// Cache operations -#define C_IINV 0x0 // index invalidate (inst, 2nd inst) -#define C_IWBINV 0x0 // index writeback inval (d, sd) -#define C_ILT 0x4 // index load tag (all) -#define C_IST 0x8 // index store tag (all) -#define C_CDX 0xC // create dirty exclusive (d, sd) -#define C_HINV 0x10 // hit invalidate (all) -#define C_HWBINV 0x14 // hit writeback inv. (d, sd) -#define C_FILL 0x14 // fill (i) -#define C_HWB 0x18 // hit writeback (i, d, sd) -#define C_HSV 0x1C // hit set virt. (si, sd) - -// Cache size definitions -#define ICACHE_SIZE 0x4000 // 16K -#define ICACHE_LINESIZE 32 // 8 words +/* Coprocessor 0 operations */ +#define C0_READI 0x1 /* read ITLB entry addressed by C0_INDEX */ +#define C0_WRITEI 0x2 /* write ITLB entry addressed by C0_INDEX */ +#define C0_WRITER 0x6 /* write ITLB entry addressed by C0_RAND */ +#define C0_PROBE 0x8 /* probe for ITLB entry addressed by TLBHI */ +#define C0_RFE 0x10 /* restore for exception */ + +/* 'cache' instruction definitions */ + +/* Target cache */ +#define CACH_PI 0x0 /* specifies primary inst. cache */ +#define CACH_PD 0x1 /* primary data cache */ +#define CACH_SI 0x2 /* secondary instruction cache */ +#define CACH_SD 0x3 /* secondary data cache */ + +/* Cache operations */ +#define C_IINV 0x0 /* index invalidate (inst, 2nd inst) */ +#define C_IWBINV 0x0 /* index writeback inval (d, sd) */ +#define C_ILT 0x4 /* index load tag (all) */ +#define C_IST 0x8 /* index store tag (all) */ +#define C_CDX 0xC /* create dirty exclusive (d, sd) */ +#define C_HINV 0x10 /* hit invalidate (all) */ +#define C_HWBINV 0x14 /* hit writeback inv. (d, sd) */ +#define C_FILL 0x14 /* fill (i) */ +#define C_HWB 0x18 /* hit writeback (i, d, sd) */ +#define C_HSV 0x1C /* hit set virt. (si, sd) */ + +/* Cache size definitions */ +#define ICACHE_SIZE 0x4000 /* 16K */ +#define ICACHE_LINESIZE 32 /* 8 words */ #define ICACHE_LINEMASK (ICACHE_LINESIZE - 1) -#define DCACHE_SIZE 0x2000 // 8K -#define DCACHE_LINESIZE 16 // 4 words +#define DCACHE_SIZE 0x2000 /* 8K */ +#define DCACHE_LINESIZE 16 /* 4 words */ #define DCACHE_LINEMASK (DCACHE_LINESIZE - 1) -// C0_CONFIG register definitions -#define CONFIG_CM 0x80000000 // 1 == Master-Checker enabled -#define CONFIG_EC 0x70000000 // System Clock ratio -#define CONFIG_EC_1_1 0x6 // System Clock ratio 1 :1 -#define CONFIG_EC_3_2 0x7 // System Clock ratio 1.5 :1 -#define CONFIG_EC_2_1 0x0 // System Clock ratio 2 :1 -#define CONFIG_EC_3_1 0x1 // System Clock ratio 3 :1 -#define CONFIG_EP 0x0F000000 // Transmit Data Pattern -#define CONFIG_SB 0x00C00000 // Secondary cache block size - -#define CONFIG_SS 0x00200000 // Split scache: 0 == I&D combined -#define CONFIG_SW 0x00100000 // scache port: 0==128, 1==64 -#define CONFIG_EW 0x000C0000 // System Port width: 0==64, 1==32 -#define CONFIG_SC 0x00020000 // 0 -> 2nd cache present -#define CONFIG_SM 0x00010000 // 0 -> Dirty Shared Coherency enable -#define CONFIG_BE 0x00008000 // Endian-ness: 1 --> BE -#define CONFIG_EM 0x00004000 // 1 -> ECC mode, 0 -> parity -#define CONFIG_EB 0x00002000 // Block order:1->sequent,0->subblock - -#define CONFIG_IC 0x00000E00 // Primary Icache size -#define CONFIG_DC 0x000001C0 // Primary Dcache size -#define CONFIG_IB 0x00000020 // Icache block size -#define CONFIG_DB 0x00000010 // Dcache block size -#define CONFIG_CU 0x00000008 // Update on Store-conditional -#define CONFIG_K0 0x00000007 // K0SEG Coherency algorithm - -#define CONFIG_UNCACHED 0x00000002 // K0 is uncached +/* C0_CONFIG register definitions */ +#define CONFIG_CM 0x80000000 /* 1 == Master-Checker enabled */ +#define CONFIG_EC 0x70000000 /* System Clock ratio */ +#define CONFIG_EC_1_1 0x6 /* System Clock ratio 1 :1 */ +#define CONFIG_EC_3_2 0x7 /* System Clock ratio 1.5 :1 */ +#define CONFIG_EC_2_1 0x0 /* System Clock ratio 2 :1 */ +#define CONFIG_EC_3_1 0x1 /* System Clock ratio 3 :1 */ +#define CONFIG_EP 0x0F000000 /* Transmit Data Pattern */ +#define CONFIG_SB 0x00C00000 /* Secondary cache block size */ + +#define CONFIG_SS 0x00200000 /* Split scache: 0 == I&D combined */ +#define CONFIG_SW 0x00100000 /* scache port: 0==128, 1==64 */ +#define CONFIG_EW 0x000C0000 /* System Port width: 0==64, 1==32 */ +#define CONFIG_SC 0x00020000 /* 0 -> 2nd cache present */ +#define CONFIG_SM 0x00010000 /* 0 -> Dirty Shared Coherency enable */ +#define CONFIG_BE 0x00008000 /* Endian-ness: 1 --> BE */ +#define CONFIG_EM 0x00004000 /* 1 -> ECC mode, 0 -> parity */ +#define CONFIG_EB 0x00002000 /* Block order:1->sequent,0->subblock */ + +#define CONFIG_IC 0x00000E00 /* Primary Icache size */ +#define CONFIG_DC 0x000001C0 /* Primary Dcache size */ +#define CONFIG_IB 0x00000020 /* Icache block size */ +#define CONFIG_DB 0x00000010 /* Dcache block size */ +#define CONFIG_CU 0x00000008 /* Update on Store-conditional */ +#define CONFIG_K0 0x00000007 /* K0SEG Coherency algorithm */ + +#define CONFIG_UNCACHED 0x00000002 /* K0 is uncached */ #define CONFIG_NONCOHRNT 0x00000003 #define CONFIG_COHRNT_EXLWR 0x00000005 -#define CONFIG_SB_SHFT 22 // shift SB to bit position 0 -#define CONFIG_IC_SHFT 9 // shift IC to bit position 0 -#define CONFIG_DC_SHFT 6 // shift DC to bit position 0 -#define CONFIG_BE_SHFT 15 // shift BE to bit position 0 - -// C0_TAGLO definitions for setting/getting cache states and physaddr bits -#define SADDRMASK 0xFFFFE000 // 31..13 -> scache paddr bits 35..17 -#define SVINDEXMASK 0x00000380 // 9..7: prim virt index bits 14..12 -#define SSTATEMASK 0x00001C00 // bits 12..10 hold scache line state -#define SINVALID 0x00000000 // invalid --> 000 == state 0 -#define SCLEANEXCL 0x00001000 // clean exclusive --> 100 == state 4 -#define SDIRTYEXCL 0x00001400 // dirty exclusive --> 101 == state 5 -#define SECC_MASK 0x0000007F // low 7 bits are ecc for the tag -#define SADDR_SHIFT 4 // shift STagLo (31..13) to 35..17 - -#define PADDRMASK 0xFFFFFF00 // PTagLo31..8->prim paddr bits35..12 -#define PADDR_SHIFT 4 // roll bits 35..12 down to 31..8 -#define PSTATEMASK 0x00C0 // bits 7..6 hold primary line state -#define PINVALID 0x0000 // invalid --> 000 == state 0 -#define PCLEANEXCL 0x0080 // clean exclusive --> 10 == state 2 -#define PDIRTYEXCL 0x00C0 // dirty exclusive --> 11 == state 3 -#define PPARITY_MASK 0x0001 // low bit is parity bit (even). - -// C0_CACHE_ERR definitions. -#define CACHERR_ER 0x80000000 // 0: inst ref, 1: data ref -#define CACHERR_EC 0x40000000 // 0: primary, 1: secondary -#define CACHERR_ED 0x20000000 // 1: data error -#define CACHERR_ET 0x10000000 // 1: tag error -#define CACHERR_ES 0x08000000 // 1: external ref, e.g. snoo -#define CACHERR_EE 0x04000000 // error on SysAD bus -#define CACHERR_EB 0x02000000 // complicated, see spec. -#define CACHERR_EI 0x01000000 // complicated, see spec. -#define CACHERR_SIDX_MASK 0x003FFFF8 // secondary cache index -#define CACHERR_PIDX_MASK 0x00000007 // primary cache index -#define CACHERR_PIDX_SHIFT 12 // bits 2..0 are paddr14..12 +#define CONFIG_SB_SHFT 22 /* shift SB to bit position 0 */ +#define CONFIG_IC_SHFT 9 /* shift IC to bit position 0 */ +#define CONFIG_DC_SHFT 6 /* shift DC to bit position 0 */ +#define CONFIG_BE_SHFT 15 /* shift BE to bit position 0 */ + +/* C0_TAGLO definitions for setting/getting cache states and physaddr bits */ +#define SADDRMASK 0xFFFFE000 /* 31..13 -> scache paddr bits 35..17 */ +#define SVINDEXMASK 0x00000380 /* 9..7: prim virt index bits 14..12 */ +#define SSTATEMASK 0x00001C00 /* bits 12..10 hold scache line state */ +#define SINVALID 0x00000000 /* invalid --> 000 == state 0 */ +#define SCLEANEXCL 0x00001000 /* clean exclusive --> 100 == state 4 */ +#define SDIRTYEXCL 0x00001400 /* dirty exclusive --> 101 == state 5 */ +#define SECC_MASK 0x0000007F /* low 7 bits are ecc for the tag */ +#define SADDR_SHIFT 4 /* shift STagLo (31..13) to 35..17 */ + +#define PADDRMASK 0xFFFFFF00 /* PTagLo31..8->prim paddr bits35..12 */ +#define PADDR_SHIFT 4 /* roll bits 35..12 down to 31..8 */ +#define PSTATEMASK 0x00C0 /* bits 7..6 hold primary line state */ +#define PINVALID 0x0000 /* invalid --> 000 == state 0 */ +#define PCLEANEXCL 0x0080 /* clean exclusive --> 10 == state 2 */ +#define PDIRTYEXCL 0x00C0 /* dirty exclusive --> 11 == state 3 */ +#define PPARITY_MASK 0x0001 /* low bit is parity bit (even). */ + +/* C0_CACHE_ERR definitions. */ +#define CACHERR_ER 0x80000000 /* 0: inst ref, 1: data ref */ +#define CACHERR_EC 0x40000000 /* 0: primary, 1: secondary */ +#define CACHERR_ED 0x20000000 /* 1: data error */ +#define CACHERR_ET 0x10000000 /* 1: tag error */ +#define CACHERR_ES 0x08000000 /* 1: external ref, e.g. snoo */ +#define CACHERR_EE 0x04000000 /* error on SysAD bus */ +#define CACHERR_EB 0x02000000 /* complicated, see spec. */ +#define CACHERR_EI 0x01000000 /* complicated, see spec. */ +#define CACHERR_SIDX_MASK 0x003FFFF8 /* secondary cache index */ +#define CACHERR_PIDX_MASK 0x00000007 /* primary cache index */ +#define CACHERR_PIDX_SHIFT 12 /* bits 2..0 are paddr14..12 */ /* * R4000 family supports hardware watchpoints: @@ -311,57 +309,88 @@ #define WATCHLO_VALIDMASK 0xFFFFFFFB #define WATCHHI_VALIDMASK 0x0000000F -// Coprocessor 0 registers -#define C0_INX C_REG(0) -#define C0_RAND C_REG(1) -#define C0_ENTRYLO0 C_REG(2) -#define C0_ENTRYLO1 C_REG(3) -#define C0_CONTEXT C_REG(4) -#define C0_PAGEMASK C_REG(5) // page mask -#define C0_WIRED C_REG(6) // # wired entries in tlb -#define C0_BADVADDR C_REG(8) -#define C0_COUNT C_REG(9) // free-running counter -#define C0_ENTRYHI C_REG(10) -#define C0_COMPARE C_REG(11) // counter comparison reg. -#define C0_SR C_REG(12) -#define C0_CAUSE C_REG(13) -#define C0_EPC C_REG(14) -#define C0_PRID C_REG(15) // revision identifier -#define C0_CONFIG C_REG(16) // hardware configuration -#define C0_LLADDR C_REG(17) // load linked address -#define C0_WATCHLO C_REG(18) // watchpoint -#define C0_WATCHHI C_REG(19) // watchpoint -#define C0_ECC C_REG(26) // S-cache ECC and primary parity -#define C0_CACHE_ERR C_REG(27) // cache error status -#define C0_TAGLO C_REG(28) // cache operations -#define C0_TAGHI C_REG(29) // cache operations -#define C0_ERROR_EPC C_REG(30) // ECC error prg. counter - -// floating-point status register -#define C1_FPCSR C_REG(31) - -#define FPCSR_FS 0x01000000 // flush denorm to zero -#define FPCSR_C 0x00800000 // condition bit -#define FPCSR_CE 0x00020000 // cause: unimplemented operation -#define FPCSR_CV 0x00010000 // cause: invalid operation -#define FPCSR_CZ 0x00008000 // cause: division by zero -#define FPCSR_CO 0x00004000 // cause: overflow -#define FPCSR_CU 0x00002000 // cause: underflow -#define FPCSR_CI 0x00001000 // cause: inexact operation -#define FPCSR_EV 0x00000800 // enable: invalid operation -#define FPCSR_EZ 0x00000400 // enable: division by zero -#define FPCSR_EO 0x00000200 // enable: overflow -#define FPCSR_EU 0x00000100 // enable: underflow -#define FPCSR_EI 0x00000080 // enable: inexact operation -#define FPCSR_FV 0x00000040 // flag: invalid operation -#define FPCSR_FZ 0x00000020 // flag: division by zero -#define FPCSR_FO 0x00000010 // flag: overflow -#define FPCSR_FU 0x00000008 // flag: underflow -#define FPCSR_FI 0x00000004 // flag: inexact operation -#define FPCSR_RM_MASK 0x00000003 // rounding mode mask -#define FPCSR_RM_RN 0x00000000 // round to nearest -#define FPCSR_RM_RZ 0x00000001 // round to zero -#define FPCSR_RM_RP 0x00000002 // round to positive infinity -#define FPCSR_RM_RM 0x00000003 // round to negative infinity +/* Coprocessor 0 registers */ +#ifdef _LANGUAGE_C +#define C0_INX 0 +#define C0_RAND 1 +#define C0_ENTRYLO0 2 +#define C0_ENTRYLO1 3 +#define C0_CONTEXT 4 +#define C0_PAGEMASK 5 /* page mask */ +#define C0_WIRED 6 /* # wired entries in tlb */ +#define C0_BADVADDR 8 +#define C0_COUNT 9 /* free-running counter */ +#define C0_ENTRYHI 10 +#define C0_COMPARE 11 /* counter comparison reg. */ +#define C0_SR 12 +#define C0_CAUSE 13 +#define C0_EPC 14 +#define C0_PRID 15 /* revision identifier */ +#define C0_CONFIG 16 /* hardware configuration */ +#define C0_LLADDR 17 /* load linked address */ +#define C0_WATCHLO 18 /* watchpoint */ +#define C0_WATCHHI 19 /* watchpoint */ +#define C0_ECC 26 /* S-cache ECC and primary parity */ +#define C0_CACHE_ERR 27 /* cache error status */ +#define C0_TAGLO 28 /* cache operations */ +#define C0_TAGHI 29 /* cache operations */ +#define C0_ERROR_EPC 30 /* ECC error prg. counter */ +#else +#define C0_INX $0 +#define C0_RAND $1 +#define C0_ENTRYLO0 $2 +#define C0_ENTRYLO1 $3 +#define C0_CONTEXT $4 +#define C0_PAGEMASK $5 /* page mask */ +#define C0_WIRED $6 /* # wired entries in tlb */ +#define C0_BADVADDR $8 +#define C0_COUNT $9 /* free-running counter */ +#define C0_ENTRYHI $10 +#define C0_COMPARE $11 /* counter comparison reg. */ +#define C0_SR $12 +#define C0_CAUSE $13 +#define C0_EPC $14 +#define C0_PRID $15 /* revision identifier */ +#define C0_CONFIG $16 /* hardware configuration */ +#define C0_LLADDR $17 /* load linked address */ +#define C0_WATCHLO $18 /* watchpoint */ +#define C0_WATCHHI $19 /* watchpoint */ +#define C0_ECC $26 /* S-cache ECC and primary parity */ +#define C0_CACHE_ERR $27 /* cache error status */ +#define C0_TAGLO $28 /* cache operations */ +#define C0_TAGHI $29 /* cache operations */ +#define C0_ERROR_EPC $30 /* ECC error prg. counter */ +#endif + +/* floating-point status register */ +#ifdef _LANGUAGE_C +#define C1_FPCSR 31 +#else +#define C1_FPCSR $31 +#endif + +#define FPCSR_FS 0x01000000 /* flush denorm to zero */ +#define FPCSR_C 0x00800000 /* condition bit */ +#define FPCSR_CE 0x00020000 /* cause: unimplemented operation */ +#define FPCSR_CV 0x00010000 /* cause: invalid operation */ +#define FPCSR_CZ 0x00008000 /* cause: division by zero */ +#define FPCSR_CO 0x00004000 /* cause: overflow */ +#define FPCSR_CU 0x00002000 /* cause: underflow */ +#define FPCSR_CI 0x00001000 /* cause: inexact operation */ +#define FPCSR_EV 0x00000800 /* enable: invalid operation */ +#define FPCSR_EZ 0x00000400 /* enable: division by zero */ +#define FPCSR_EO 0x00000200 /* enable: overflow */ +#define FPCSR_EU 0x00000100 /* enable: underflow */ +#define FPCSR_EI 0x00000080 /* enable: inexact operation */ +#define FPCSR_FV 0x00000040 /* flag: invalid operation */ +#define FPCSR_FZ 0x00000020 /* flag: division by zero */ +#define FPCSR_FO 0x00000010 /* flag: overflow */ +#define FPCSR_FU 0x00000008 /* flag: underflow */ +#define FPCSR_FI 0x00000004 /* flag: inexact operation */ +#define FPCSR_RM_MASK 0x00000003 /* rounding mode mask */ +#define FPCSR_RM_RN 0x00000000 /* round to nearest */ +#define FPCSR_RM_RZ 0x00000001 /* round to zero */ +#define FPCSR_RM_RP 0x00000002 /* round to positive infinity */ +#define FPCSR_RM_RM 0x00000003 /* round to negative infinity */ #endif diff --git a/include/ultra64/asm.h b/include/ultra64/asm.h index 2a2536bdaa..02ef26e985 100644 --- a/include/ultra64/asm.h +++ b/include/ultra64/asm.h @@ -6,55 +6,104 @@ #define _MIPS_ISA_MIPS2 2 #define _MIPS_ISA_MIPS3 3 #define _MIPS_ISA_MIPS4 4 + +#define _MIPS_SIM_ABI32 1 /* MIPS MSIG calling convention */ +#define _MIPS_SIM_NABI32 2 /* MIPS new 32-bit abi */ + /* NABI32 is 64bit calling convention but 32bit type sizes) */ +#define _MIPS_SIM_ABI64 3 /* MIPS 64 calling convention */ #endif #ifndef _LANGUAGE_C +#ifdef __GNUC__ +#define TYPE(x, t) .type x, @t +#define SIZE(x) .size x, . - x +#else +#define TYPE(x, t) +#define SIZE(x) +#endif + #define LEAF(x) \ - .balign 4 ;\ + .align 2 ;\ .globl x ;\ - .type x, @function ;\ + TYPE(x, function) ;\ + .ent x, 0 ;\ x: ;\ - .ent x, 0 ;\ - .frame $sp, 0, $ra + .frame sp, 0, ra #define XLEAF(x) \ - .balign 4 ;\ + .align 2 ;\ .globl x ;\ - .type x, @function ;\ - x: ;\ - .aent x, 0 + TYPE(x, function) ;\ + .aent x, 0 ;\ + x: #define NESTED(x, fsize, ra) \ .globl x ;\ + .ent x, 0 ;\ x: ;\ - .ent x, 0 ;\ - .frame $sp, fsize, ra + .frame sp, fsize, ra #define XNESTED(x) \ .globl x ;\ - x: ;\ - .aent x, 0 + .aent x, 0 ;\ + x: #define END(x) \ - .size x, . - x ;\ + SIZE(x) ;\ .end x -#define IMPORT(x, size) \ - .extern x, size - #define EXPORT(x) \ .globl x ;\ x: +#ifdef __sgi +#define IMPORT(sym, size) \ + .extern sym, size +#else +#define IMPORT(sym, size) +#endif + #define DATA(x) \ - .balign 4 ;\ + .align 2 ;\ .globl x ;\ - .type x, @object ;\ + TYPE(x, object) ;\ x: #define ENDDATA(x) \ - .size x, . - x + SIZE(x) + +#define MFC0(dst, src) \ + .set noreorder; mfc0 dst, src; .set reorder +#define MTC0(dst, src) \ + .set noreorder; mtc0 dst, src; .set reorder + +#define CFC1(dst, src) \ + .set noreorder; cfc1 dst, src; .set reorder +#define CTC1(src, dst) \ + .set noreorder; ctc1 src, dst; .set reorder + +#define NOP \ + .set noreorder; nop; .set reorder + +#define TLBWI \ + .set noreorder; tlbwi; .set reorder + +#define TLBR \ + .set noreorder; tlbr; .set reorder + +#define TLBP \ + .set noreorder; tlbp; .set reorder + +#ifndef __GNUC__ +#define ABS(x, y) \ + .globl x; \ + x = y +#else +#define ABS(x, y) \ + .globl x; \ + .set x, y +#endif #endif @@ -62,11 +111,11 @@ * Stack Alignment */ #if (_MIPS_SIM == _ABIO32) -#define NARGSAVE 4 // space for 4 args must be allocated +#define NARGSAVE 4 /* space for 4 args must be allocated */ #define ALSZ (8-1) #define ALMASK ~(8-1) #elif (_MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64) -#define NARGSAVE 0 // no caller responsibilities +#define NARGSAVE 0 /* no caller responsibilities */ #define ALSZ (16-1) #define ALMASK ~(16-1) #endif diff --git a/include/ultra64/bbskapi.h b/include/ultra64/bbskapi.h new file mode 100644 index 0000000000..7918975475 --- /dev/null +++ b/include/ultra64/bbskapi.h @@ -0,0 +1,272 @@ +/** + * @file bbskapi.h + * + * This file contains the external API for the iQue Player's Secure Kernel Calls. + * + * Applications require permission to call particular Secure Kernel Calls, defined in the associated Ticket. + * Most are not callable by games. + */ +#ifndef BB_SKAPI_H +#define BB_SKAPI_H + +#include "ultratypes.h" + +#define SKC_OK 0 +#define SKC_RECRYPT_INVALID 1 +#define SKC_RECRYPT_2 2 // Complete? +#define SKC_RECRYPT_3 3 // Partial? +#define SKC_RECRYPT_4 4 // Beginning? +#define SKC_INVALID_ARGS -1 +#define SKC_INVALID_TSRL -2 +#define SKC_INVALID_CARL -3 +#define SKC_INVALID_CPRL -4 +#define SKC_INVALID_CERT -9 +#define SKC_NO_PERMISSION -11 + +typedef struct BbAppLaunchCrls BbAppLaunchCrls; +typedef struct BbCertBase BbCertBase; +typedef struct BbEccSig BbEccSig; +typedef struct BbRecryptList BbRecryptList; +typedef struct BbShaHash BbShaHash; +typedef struct BbTicketBundle BbTicketBundle; + +/** + * Retrieves the console's unique BBID. + * + * @param bbId Location to write the BBID to. Must be a pointer to cached DRAM with 4-byte alignment. + * @return + * SKC_NO_PERMISSION If called with insufficient permission. + * SKC_INVALID_ARGS If the supplied pointer is not valid. + * SKC_OK Otherwise. + */ +s32 skGetId(u32* bbId); + +/** + * Prepares to launch an application. + * The provided ticket bundle is verified and made the active ticket bundle. + * The AES decryption hardware is prepared. + * + * @param bundle Ticket Bundle associated with this application. + * @param crls Application Certificate Revocation Lists to check when verifying the ticket bundle. + * The ticket bundle must be signed by the Root signature without going through any + * revoked certificates. + * @param recryptList System Recrypt List (encrypted and digitally signed) + * @return + * SKC_INVALID_ARGS If any inputs are or contain invalid pointers, + * or the ticket is not for this console, + * or the ticket is for a trial that has expired. + * SKC_INVALID_TSRL If the provided TSRL revocation list is invalid. + * SKC_INVALID_CARL If the provided CARL revocation list is invalid. + * SKC_INVALID_CPRL If the provided CPRL revocation list is invalid. + * SKC_INVALID_CERT If a digital certificate was revoked by one of the revocation lists. + * SKC_RECRYPT_3 If the recrypt state for this app is not in an acceptable state to be launched. + * SKC_RECRYPT_4 If the recrypt state for this app is not in an acceptable state to be launched. + * SKC_NO_PERMISSION If called with insufficient permission. + * SKC_OK Otherwise. + */ +s32 skLaunchSetup(BbTicketBundle* bundle, BbAppLaunchCrls* crls, BbRecryptList* recryptList); + +/** + * Launches a prepared application that is assumed to have been loaded into memory at the entrypoint between calling + * skLaunchSetup and calling this. skLaunchSetup must have been called prior to set the active ticket bundle. + * + * @param entrypoint The entrypoint address of the app to launch. + * + * @return + * SKC_INVALID_ARGS If the entrypoint is an invalid pointer, + * or if content failed a hash check for non-recrypted apps, + * or if the content is an expired trial. + * SKC_NO_PERMISSION If called with insufficient permission. + * @note Does not return if the call is successful. + */ +s32 skLaunch(void* entrypoint); + +/** + * Verifies whether a provided Recrypt List is valid. + * + * @param recryptList Pointer to the (encrypted and digitally signed) recrypt list to verify. + * @return + * SKC_OK If the recrypt list is valid + * SKC_INVALID_ARGS If the recrypt list is invalid + * (e.g. contains invalid pointers or its ECDSA signature fails to verify) + * SKC_NO_PERMISSION If called with insufficient permission. + */ +s32 skRecryptListValid(BbRecryptList* recryptList); + +/** + * Begins a new recryption task. Content downloaded is initially encrypted with the Common Key but may be re-encrypted + * with a new randomly generated AES key if the recrypt flag is set in the content metadata. Like with skLaunchSetup, + * the provided ticket bundle is first verified before being made the active ticket bundle. + * + * @param bundle The ticket bundle associated with the content that will be recrypted. + * @param crls Application Certificate Revocation Lists to check when verifying the ticket bundle. + * The ticket bundle must be signed by the Root signature without going through any + * revoked certificates. + * @param recryptList The recrypt list that the AES key will be saved to, after being encrypted with the + * console-specific recrypt list key. + * @return + * SKC_RECRYPT_INVALID If called on a ticket bundle that does not have the recrypt flag set. + * SKC_INVALID_ARGS If any inputs are or contain invalid pointers, + * or the ticket is not for this console, + * or the ticket is for a trial that has expired. + * SKC_INVALID_TSRL If the provided TSRL revocation list is invalid. + * SKC_INVALID_CARL If the provided CARL revocation list is invalid. + * SKC_INVALID_CPRL If the provided CPRL revocation list is invalid. + * SKC_INVALID_CERT If a digital certificate was revoked by one of the revocation lists. + * SKC_NO_PERMISSION If called with insufficient permission. + * Otherwise, one of SKC_RECRYPT_* will be returned communicating the initial state of the recryption process. + */ +s32 skRecryptBegin(BbTicketBundle* bundle, BbAppLaunchCrls* crls, BbRecryptList* recryptList); + +/** + * Recrypts the provided data, using the previously set context. + * Must be called following skRecryptBegin. + * + * @param buf Pointer to app content to encrypt and hash. + * @param size Amount of data to process in this buffer. + * @return + * SKC_INVALID_ARGS If the provided buffer is not fully contained in RAM or is otherwise invalid. + * SKC_NO_PERMISSION If called with insufficient permission. + * SKC_OK Otherwise. + */ +s32 skRecryptData(u8* buf, u32 size); + +/** + * Resumes a partially-complete recryption. The last chunk of successfully-recrypted data must be provided in order to + * set the AES-128-CBC Initialization Vector to continue recryption of the next chunk. + * Must be called following skRecryptBegin. + * + * @param buf Pointer to last chunk of successfully-recrypted content. + * @param size Amount of data available. + * @return + * SKC_INVALID_ARGS If the provided buffer is not fully contained in RAM or is otherwise invalid. + * SKC_NO_PERMISSION If called with insufficient permission. + * SKC_OK Otherwise. + */ +s32 skRecryptComputeState(u8* buf, u32 size); + +/** + * Concludes the recryption process. The SHA-1 hash of the content, computed during recryption, is checked against the + * hash in the active ticket bundle; if it passes, the recrypt list entry for the active content is updated to indicate + * that recryption is complete and was successful. + * + * @param recryptList The (encrypted and digitally signed) recrypt list to update. + * @return + * SKC_OK If recryption succeeded. + * SKC_INVALID_ARGS If recryption failed (e.g. if the hash of the content did not match the hash in the ticket bundle) + * or if the provided recrypt list is invalid or cannot find the entry for the content. + * SKC_NO_PERMISSION If called with insufficient permission. + */ +s32 skRecryptEnd(BbRecryptList* recryptList); + +/** + * Generates a digital signature for the provided SHA-1 hash (treated as a message) using the Elliptic Curve Digital + * Signature Algorithm (ECDSA) on the curve sect233r1 with the console's ECDSA Private Key. Appends an identity of 1 to + * the end of the message prior to signing. + * + * @param hash The SHA-1 hash to sign. + * @param outSignature The resulting ECDSA digital signature. + * @return + * SKC_INVALID_ARGS If either of the arguments is an invalid pointer. + * SKC_NO_PERMISSION If called with insufficient permission. + * SKC_OK Otherwise. + */ +s32 skSignHash(BbShaHash* hash, BbEccSig* outSignature); + +/** + * Verifies a SHA-1 hash (treated as a message) against a digital signature using either the Elliptic Curve Digital + * Signature Algorithm (ECDSA) or the RSA Digital Signature Algorithm. For RSA, either 2048-bit or 4096-bit signatures + * can be recognized. + * + * For verifying self-signed (e.g. via skSignHash) ECDSA signatures the certificate chain and revocation lists are not + * required and may be passed as NULL, the public key is the console's own ECDSA public key. For verifying other types + * of signatures, a valid certificate chain and certificate revocation lists must be provided, in which case the + * signature must be signed by the Root certificate without going through any revoked certificates. + * + * This can only verify hashes signed with an identity of 1, such as those signed via skSignHash. + * + * @param hash The SHA-1 hash to check the signature of. + * @param signature The signature to compare against. May be an ECDSA, RSA2048 or RSA4096 signature. + * @param certChain Certificate Chain, NULL-terminated list of certificate pointers. + * Not required for self-signed ECDSA signatures and must be NULL in that case. + * Should not be more than 5 certificates long. + * Should end on the Root signature. + * @param crls Certificate Revocation Lists to check certificates against. Not required for self-signed ECDSA signatures. + * @return + * SKC_OK If the hash was successfully verified against the signature. + * SKC_INVALID_ARGS If any arguments are invalid pointers, + * or the hash could not be verified against the digital signature, + * or the certificate chain was invalid, + * or if any certificate revocation lists were invalid. + * SKC_INVALID_CERT If a digital certificate was revoked by one of the revocation lists. + * SKC_NO_PERMISSION If called with insufficient permission. + */ +s32 skVerifyHash(BbShaHash* hash, u32* signature, BbCertBase** certChain, BbAppLaunchCrls* crls); + +/** + * Retrieves the consumption counters for all currently-tracked applications and the Ticket ID (TID) Window. + * + * The TID Window determines the TID for the first counter (cc[0]), the other counters (cc[i]) are associated with + * tidWindow + i. + * + * The consumption counters track either the number of minutes that a trial app has been played for, or the number of + * times a trial app has been launched. + * + * @param tidWindow The location to save the TID window to. + * @param cc An array of 26 u16s to save the consumption counters into. + * @return + * SKC_INVALID_ARGS If either pointer is invalid or there is not enough room to save all the consumption counters. + * SKC_NO_PERMISSION If called with insufficient permission. + * SKC_OK Otherwise. + */ +s32 skGetConsumption(u16* tidWindow, u16 cc[26]); + +/** + * Increments the Ticket ID Window by 1 and moves all consumption counters down by 1 slot to match the new window. The + * counter previously at position 0 is forgotten. + * + * @return + * SKC_NO_PERMISSION If called with insufficient permission. + * SKC_INVALID_ARGS If the resulting state could not be saved internally. + * SKC_OK If success. + */ +s32 skAdvanceTicketWindow(void); + +/** + * Overrides the trial limit and trial type stored in the currently loaded ticket. + * + * @param limit The new trial limit. Either a length of time or the number of allowed launches, depending on trial type. + * @param code The new trial type + * 0 = Time-limited in minutes, call skKeepAlive periodically + * 1 = Limited by number of launches + * 2 = Time-limited in minutes, no need to call skKeepAlive (TOVERIFY) + * @return + * SKC_OK If success. + * SKC_INVALID_ARGS If no ticket is currently loaded. + * SKC_NO_PERMISSION If called with insufficient permission. + */ +s32 skSetLimit(u16 limit, u16 code); + +/** + * Returns to the system menu. + * + * @return + * SKC_NO_PERMISSION If called with insufficient permission. + * @note Does not return if called with permission. + */ +s32 skExit(void); + +/** + * Keeps trial applications alive. + * + * The hardware trial timer does not have a very long period so must be refreshed periodically by calling this function. + * This function updates the timer and checks for an expiry. + * + * @return + * SKC_NO_PERMISSION If called with insufficient permission. + * SKC_OK Otherwise. + * @note This function may not return if it detects the trial has expired. + */ +s32 skKeepAlive(void); + +#endif diff --git a/include/ultra64/bcp.h b/include/ultra64/bcp.h new file mode 100644 index 0000000000..027fecf3f6 --- /dev/null +++ b/include/ultra64/bcp.h @@ -0,0 +1,193 @@ +#ifndef BCP_H +#define BCP_H + +#include "rcp.h" + +/****************************************************************************** + * Additional MIPS Interface (MI) Registers + */ + +/** + * Accesses to this register outside of Secure Mode cause an NMI to transfer control + * to the Secure Kernel. + * + * [25] ?: System software writes to this bit when launching an app or game + * [24] SK RAM Access: Set to 1 to enable access to 0x8000 bytes at 0x1FC40000 + * [7] Secure Trap Cause: Memory card removed + * [6] Secure Trap Cause: Power button pressed + * [5] Secure Trap Cause: MI Error + * [4] Secure Trap Cause: PI Error + * [3] Secure Trap Cause: Timer expired + * [2] Secure Trap Cause: Syscall via read of this register outside of secure mode + * [1] Boot ROM Swap: 0 = SK mapped at 0x1FC00000, Boot ROM mapped at 0x1FC20000 + * 1 = Boot ROM mapped at 0x1FC00000, SK mapped at 0x1FC20000 + * [0] Secure Mode: 0 = not in secure mode + * 1 = in secure mode + */ +#define MI_SECURE_EXCEPTION_REG (MI_BASE_REG + 0x14) + +/** + * Read: + * [25] MD (active, 1 if card is currently disconnected else 0) + * [24] Power Button (active, 1 if button is currently pressed else 0) + * [13] MD (pending interrupt) + * [12] Power Button (pending interrupt) + * [11] USB1 + * [10] USB0 + * [ 9] PI_ERR + * [ 8] IDE + * [ 7] AES + * [ 6] FLASH + * [ 5] DP + * [ 4] PI + * [ 3] VI + * [ 2] AI + * [ 1] SI + * [ 0] SP + * + * Write: + * [13] Clear MD Interrupt + */ +#define MI_EX_INTR_REG (MI_BASE_REG + 0x38) + +/* + * MI_EX_INTR_REG: read bits + */ +#define MI_EX_INTR_SP (1 << 0) +#define MI_EX_INTR_SI (1 << 1) +#define MI_EX_INTR_AI (1 << 2) +#define MI_EX_INTR_VI (1 << 3) +#define MI_EX_INTR_PI (1 << 4) +#define MI_EX_INTR_DP (1 << 5) +#define MI_EX_INTR_FLASH (1 << 6) +#define MI_EX_INTR_AES (1 << 7) +#define MI_EX_INTR_IDE (1 << 8) +#define MI_EX_INTR_PI_ERR (1 << 9) +#define MI_EX_INTR_USB0 (1 << 10) +#define MI_EX_INTR_USB1 (1 << 11) +#define MI_EX_INTR_PWR_BTN (1 << 12) +#define MI_EX_INTR_MD (1 << 13) +#define MI_EX_INTR_PWR_BTN_PRESSED (1 << 24) /* updated in real-time, unrelated to interrupt */ +#define MI_EX_INTR_CARD_NOT_PRESENT (1 << 25) /* updated in real-time, unrelated to interrupt */ + +#define MI_EX_INTR_ALL \ + (MI_EX_INTR_FLASH | MI_EX_INTR_AES | MI_EX_INTR_IDE | MI_EX_INTR_PI_ERR | \ + MI_EX_INTR_USB0 | MI_EX_INTR_USB1 | MI_EX_INTR_PWR_BTN | MI_EX_INTR_MD) + +/* + * MI_EX_INTR_REG: write bits + */ +#define MI_EX_INTR_CLR_MD (1 << 13) + +/** + * Write: + * [27:26] Set/Clear MD + * [25:24] Set/Clear BUTTON + * [23:22] Set/Clear USB1 + * [21:20] Set/Clear USB0 + * [19:18] Set/Clear PI_ERR + * [17:16] Set/Clear IDE + * [15:14] Set/Clear AES + * [13:12] Set/Clear FLASH + * [11:10] Set/Clear DP + * [ 9: 8] Set/Clear PI + * [ 7: 6] Set/Clear VI + * [ 5: 4] Set/Clear AI + * [ 3: 2] Set/Clear SI + * [ 1: 0] Set/Clear SP + * + * Read: + * [13] MD + * [12] BUTTON + * [11] USB1 + * [10] USB0 + * [ 9] PI_ERR + * [ 8] IDE + * [ 7] AES + * [ 6] FLASH + * [ 5] DP + * [ 4] PI + * [ 3] VI + * [ 2] AI + * [ 1] SI + * [ 0] SP + */ +#define MI_EX_INTR_MASK_REG (MI_BASE_REG + 0x3C) + +/* + * MI_EX_INTR_MASK_REG: write bits + */ +#define MI_EX_INTR_MASK_CLR_SP (1 << 0) /* clear SP mask */ +#define MI_EX_INTR_MASK_SET_SP (1 << 1) /* set SP mask */ +#define MI_EX_INTR_MASK_CLR_SI (1 << 2) /* clear SI mask */ +#define MI_EX_INTR_MASK_SET_SI (1 << 3) /* set SI mask */ +#define MI_EX_INTR_MASK_CLR_AI (1 << 4) /* clear AI mask */ +#define MI_EX_INTR_MASK_SET_AI (1 << 5) /* set AI mask */ +#define MI_EX_INTR_MASK_CLR_VI (1 << 6) /* clear VI mask */ +#define MI_EX_INTR_MASK_SET_VI (1 << 7) /* set VI mask */ +#define MI_EX_INTR_MASK_CLR_PI (1 << 8) /* clear PI mask */ +#define MI_EX_INTR_MASK_SET_PI (1 << 9) /* set PI mask */ +#define MI_EX_INTR_MASK_CLR_DP (1 << 10) /* clear DP mask */ +#define MI_EX_INTR_MASK_SET_DP (1 << 11) /* set DP mask */ +#define MI_EX_INTR_MASK_CLR_FLASH (1 << 12) /* clear FLASH mask */ +#define MI_EX_INTR_MASK_SET_FLASH (1 << 13) /* set FLASH mask */ +#define MI_EX_INTR_MASK_CLR_AES (1 << 14) /* clear AES mask */ +#define MI_EX_INTR_MASK_SET_AES (1 << 15) /* set AES mask */ +#define MI_EX_INTR_MASK_CLR_IDE (1 << 16) /* clear IDE mask */ +#define MI_EX_INTR_MASK_SET_IDE (1 << 17) /* set IDE mask */ +#define MI_EX_INTR_MASK_CLR_PI_ERR (1 << 18) /* clear PI_ERR mask */ +#define MI_EX_INTR_MASK_SET_PI_ERR (1 << 19) /* set PI_ERR mask */ +#define MI_EX_INTR_MASK_CLR_USB0 (1 << 20) /* clear USB0 mask */ +#define MI_EX_INTR_MASK_SET_USB0 (1 << 21) /* set USB0 mask */ +#define MI_EX_INTR_MASK_CLR_USB1 (1 << 22) /* clear USB1 mask */ +#define MI_EX_INTR_MASK_SET_USB1 (1 << 23) /* set USB1 mask */ +#define MI_EX_INTR_MASK_CLR_PWR_BTN (1 << 24) /* clear PWR_BTN mask */ +#define MI_EX_INTR_MASK_SET_PWR_BTN (1 << 25) /* set PWR_BTN mask */ +#define MI_EX_INTR_MASK_CLR_MD (1 << 26) /* clear MD mask */ +#define MI_EX_INTR_MASK_SET_MD (1 << 27) /* set MD mask */ + +/* + * MI_EX_INTR_MASK_REG: read bits + */ +#define MI_EX_INTR_MASK_SP (1 << 0) /* SP intr mask */ +#define MI_EX_INTR_MASK_SI (1 << 1) /* SI intr mask */ +#define MI_EX_INTR_MASK_AI (1 << 2) /* AI intr mask */ +#define MI_EX_INTR_MASK_VI (1 << 3) /* VI intr mask */ +#define MI_EX_INTR_MASK_PI (1 << 4) /* PI intr mask */ +#define MI_EX_INTR_MASK_DP (1 << 5) /* DP intr mask */ +#define MI_EX_INTR_MASK_FLASH (1 << 6) /* FLASH intr mask */ +#define MI_EX_INTR_MASK_AES (1 << 7) /* AES intr mask */ +#define MI_EX_INTR_MASK_IDE (1 << 8) /* IDE intr mask */ +#define MI_EX_INTR_MASK_PI_ERR (1 << 9) /* PI_ERR intr mask */ +#define MI_EX_INTR_MASK_USB0 (1 << 10) /* USB0 intr mask */ +#define MI_EX_INTR_MASK_USB1 (1 << 11) /* USB1 intr mask */ +#define MI_EX_INTR_MASK_PWR_BTN (1 << 12) /* PWR_BTN intr mask */ +#define MI_EX_INTR_MASK_MD (1 << 13) /* MD intr mask */ + +/****************************************************************************** + * Additional Parallel Interface (PI) Registers + */ + +/** + * Write: + * [31] Execute command after write + * [30] Interrupt when done + * [29:24] ? + * [23:16] NAND Command + * [15] ? + * [14] Buffer Select + * [13:12] Device Select + * [11] Do Error Correction + * [10] NAND Command is Multi-Cycle + * [ 9: 0] Data Transfer Length in Bytes + * + * Writing 0 to this register clears the interrupt + * + * Read: + * [31] Busy + * [11] Single-Bit Error Corrected + * [10] Double-Bit Error Uncorrectable + */ +#define PI_NAND_CTRL_REG (PI_BASE_REG + 0x48) + +#endif diff --git a/include/ultra64/exception.h b/include/ultra64/exception.h index 886a3b9096..d4368da166 100644 --- a/include/ultra64/exception.h +++ b/include/ultra64/exception.h @@ -1,7 +1,7 @@ #ifndef ULTRA64_EXCEPTION_H #define ULTRA64_EXCEPTION_H -// Interrupt masks +/* Interrupt masks */ #define OS_IM_NONE 0x00000001 #define OS_IM_RCP 0x00000401 #define OS_IM_SW1 0x00000501 @@ -23,7 +23,7 @@ #define RCP_IMASK 0x003F0000 #define RCP_IMASKSHIFT 16 -// OSHWIntr values +/* OSHWIntr values */ #define OS_INTR_CART 1 #ifdef _LANGUAGE_C @@ -51,11 +51,11 @@ extern __osHwInt __osHwIntTable[]; #else -// __osHwInt struct member offsets +/* __osHwInt struct member offsets */ #define HWINT_CALLBACK 0x00 #define HWINT_SP 0x04 -// __osHwInt struct size +/* __osHwInt struct size */ #define HWINT_SIZE 0x8 #endif diff --git a/include/ultra64/libc.h b/include/ultra64/libc.h index e71cb879d7..3480f101ad 100644 --- a/include/ultra64/libc.h +++ b/include/ultra64/libc.h @@ -5,7 +5,7 @@ void osSyncPrintf(const char* fmt, ...); -#ifdef __GNUC__ +#if defined(__GNUC__) && defined(NON_MATCHING) void bzero(void* __s, unsigned int __n); int bcmp(const void* __sl, const void* __s2, unsigned int __n); void bcopy(const void* __src, void* __dest, unsigned int __n); diff --git a/include/ultra64/message.h b/include/ultra64/message.h index bf93c524c9..dc89dc48ed 100644 --- a/include/ultra64/message.h +++ b/include/ultra64/message.h @@ -21,6 +21,16 @@ #define OS_EVENT_FAULT 12 /* CPU fault event: used by rmon */ #define OS_EVENT_THREADSTATUS 13 /* CPU thread status: used by rmon */ #define OS_EVENT_PRENMI 14 /* Pre NMI interrupt */ +#ifdef BBPLAYER +#define OS_EVENT_FLASH 23 /* NAND flash operation complete */ +#define OS_EVENT_AES 24 /* AES decryption complete */ +#define OS_EVENT_IDE 25 /* IDE transfer complete */ +#define OS_EVENT_PI_ERR 26 /* PI Error? */ +#define OS_EVENT_USB0 27 /* USB Controller 0 */ +#define OS_EVENT_USB1 28 /* USB Controller 1 */ +#define OS_EVENT_UNK_29 29 /* ? */ +#define OS_EVENT_MD 30 /* Memory card removed */ +#endif #ifdef _LANGUAGE_C @@ -47,7 +57,7 @@ typedef struct OSMesgQueue { #else -// OSMesgQueue struct member offsets +/* OSMesgQueue struct member offsets */ #define MQ_MTQUEUE 0x00 #define MQ_FULLQUEUE 0x04 diff --git a/include/ultra64/rcp.h b/include/ultra64/rcp.h index 9c97e8bd9f..8fb8a523e9 100644 --- a/include/ultra64/rcp.h +++ b/include/ultra64/rcp.h @@ -114,13 +114,13 @@ /** * External device info */ -#define DEVICE_TYPE_CART 0 // ROM cartridge -#define DEVICE_TYPE_BULK 1 // ROM bulk -#define DEVICE_TYPE_64DD 2 // 64 Disk Drive -#define DEVICE_TYPE_SRAM 3 // SRAM -// 4-6 are reserved -#define DEVICE_TYPE_INIT 7 // initial value -// 8-14 are reserved +#define DEVICE_TYPE_CART 0 /* ROM cartridge */ +#define DEVICE_TYPE_BULK 1 /* ROM bulk */ +#define DEVICE_TYPE_64DD 2 /* 64 Disk Drive */ +#define DEVICE_TYPE_SRAM 3 /* SRAM */ +/* 4-6 are reserved */ +#define DEVICE_TYPE_INIT 7 /* initial value */ +/* 8-14 are reserved */ /** @@ -138,31 +138,31 @@ #define SP_BASE_REG 0x04040000 -// SP memory address (R/W): [12] 0=DMEM,1=IMEM, [11:0] DMEM/IMEM address +/* SP memory address (R/W): [12] 0=DMEM,1=IMEM, [11:0] DMEM/IMEM address */ #define SP_MEM_ADDR_REG (SP_BASE_REG + 0x00) -// SP DRAM DMA address (R/W): [23:0] RDRAM address +/* SP DRAM DMA address (R/W): [23:0] RDRAM address */ #define SP_DRAM_ADDR_REG (SP_BASE_REG + 0x04) -// SP read DMA length (R/W): [31:20] skip, [19:12] count, [11:0] length; RDRAM -> I/DMEM +/* SP read DMA length (R/W): [31:20] skip, [19:12] count, [11:0] length; RDRAM -> I/DMEM */ #define SP_RD_LEN_REG (SP_BASE_REG + 0x08) -// SP write DMA length (R/W): [31:20] skip, [19:12] count, [11:0] length; I/DMEM -> RDRAM +/* SP write DMA length (R/W): [31:20] skip, [19:12] count, [11:0] length; I/DMEM -> RDRAM */ #define SP_WR_LEN_REG (SP_BASE_REG + 0x0C) -// SP status (R/W): [14:0] valid bits; see below for write/read mode +/* SP status (R/W): [14:0] valid bits; see below for write/read mode */ #define SP_STATUS_REG (SP_BASE_REG + 0x10) -// SP DMA full (R): [0] dma full +/* SP DMA full (R): [0] dma full */ #define SP_DMA_FULL_REG (SP_BASE_REG + 0x14) -// SP DMA busy (R): [0] dma busy +/* SP DMA busy (R): [0] dma busy */ #define SP_DMA_BUSY_REG (SP_BASE_REG + 0x18) -// SP semaphore (R/W): Read: [0] acquire semaphore; Write: [] release semaphore +/* SP semaphore (R/W): Read: [0] acquire semaphore; Write: [] release semaphore */ #define SP_SEMAPHORE_REG (SP_BASE_REG + 0x1C) -// SP PC (R/W): [11:0] program counter +/* SP PC (R/W): [11:0] program counter */ #define SP_PC_REG 0x04080000 /* @@ -174,31 +174,31 @@ /* * SP_STATUS_REG: write bits */ -#define SP_CLR_HALT (1 << 0) // clear halt -#define SP_SET_HALT (1 << 1) // set halt -#define SP_CLR_BROKE (1 << 2) // clear broke -#define SP_CLR_INTR (1 << 3) // clear interrupt -#define SP_SET_INTR (1 << 4) // set interrupt -#define SP_CLR_SSTEP (1 << 5) // clear sstep -#define SP_SET_SSTEP (1 << 6) // set sstep -#define SP_CLR_INTR_BREAK (1 << 7) // clear interrupt on break -#define SP_SET_INTR_BREAK (1 << 8) // set interrupt on break -#define SP_CLR_SIG0 (1 << 9) // clear signal 0 -#define SP_SET_SIG0 (1 << 10) // set signal 0 -#define SP_CLR_SIG1 (1 << 11) // clear signal 1 -#define SP_SET_SIG1 (1 << 12) // set signal 1 -#define SP_CLR_SIG2 (1 << 13) // clear signal 2 -#define SP_SET_SIG2 (1 << 14) // set signal 2 -#define SP_CLR_SIG3 (1 << 15) // clear signal 3 -#define SP_SET_SIG3 (1 << 16) // set signal 3 -#define SP_CLR_SIG4 (1 << 17) // clear signal 4 -#define SP_SET_SIG4 (1 << 18) // set signal 4 -#define SP_CLR_SIG5 (1 << 19) // clear signal 5 -#define SP_SET_SIG5 (1 << 20) // set signal 5 -#define SP_CLR_SIG6 (1 << 21) // clear signal 6 -#define SP_SET_SIG6 (1 << 22) // set signal 6 -#define SP_CLR_SIG7 (1 << 23) // clear signal 7 -#define SP_SET_SIG7 (1 << 24) // set signal 7 +#define SP_CLR_HALT (1 << 0) /* clear halt */ +#define SP_SET_HALT (1 << 1) /* set halt */ +#define SP_CLR_BROKE (1 << 2) /* clear broke */ +#define SP_CLR_INTR (1 << 3) /* clear interrupt */ +#define SP_SET_INTR (1 << 4) /* set interrupt */ +#define SP_CLR_SSTEP (1 << 5) /* clear sstep */ +#define SP_SET_SSTEP (1 << 6) /* set sstep */ +#define SP_CLR_INTR_BREAK (1 << 7) /* clear interrupt on break */ +#define SP_SET_INTR_BREAK (1 << 8) /* set interrupt on break */ +#define SP_CLR_SIG0 (1 << 9) /* clear signal 0 */ +#define SP_SET_SIG0 (1 << 10) /* set signal 0 */ +#define SP_CLR_SIG1 (1 << 11) /* clear signal 1 */ +#define SP_SET_SIG1 (1 << 12) /* set signal 1 */ +#define SP_CLR_SIG2 (1 << 13) /* clear signal 2 */ +#define SP_SET_SIG2 (1 << 14) /* set signal 2 */ +#define SP_CLR_SIG3 (1 << 15) /* clear signal 3 */ +#define SP_SET_SIG3 (1 << 16) /* set signal 3 */ +#define SP_CLR_SIG4 (1 << 17) /* clear signal 4 */ +#define SP_SET_SIG4 (1 << 18) /* set signal 4 */ +#define SP_CLR_SIG5 (1 << 19) /* clear signal 5 */ +#define SP_SET_SIG5 (1 << 20) /* set signal 5 */ +#define SP_CLR_SIG6 (1 << 21) /* clear signal 6 */ +#define SP_SET_SIG6 (1 << 22) /* set signal 6 */ +#define SP_CLR_SIG7 (1 << 23) /* clear signal 7 */ +#define SP_SET_SIG7 (1 << 24) /* set signal 7 */ /* * SP_STATUS_REG: read bits @@ -238,22 +238,22 @@ #define SP_SET_CPUSIGNAL SP_SET_SIG4 #define SP_STATUS_CPUSIGNAL SP_STATUS_SIG4 -// SP IMEM BIST REG (R/W): [6:0] BIST status bits; see below for detail +/* SP IMEM BIST REG (R/W): [6:0] BIST status bits; see below for detail */ #define SP_IBIST_REG 0x04080004 /* * SP_IBIST_REG: write bits */ -#define SP_IBIST_CHECK (1 << 0) // BIST check -#define SP_IBIST_GO (1 << 1) // BIST go -#define SP_IBIST_CLEAR (1 << 2) // BIST clear +#define SP_IBIST_CHECK (1 << 0) /* BIST check */ +#define SP_IBIST_GO (1 << 1) /* BIST go */ +#define SP_IBIST_CLEAR (1 << 2) /* BIST clear */ /* * SP_BIST_REG: read bits * First 2 bits are same as in write mode */ #define SP_IBIST_DONE (1 << 2) -#define SP_IBIST_FAILED 0x78 // bits [6:3], BIST fail +#define SP_IBIST_FAILED 0x78 /* bits [6:3], BIST fail */ /** @@ -261,28 +261,28 @@ */ #define DPC_BASE_REG 0x04100000 -// DP CMD DMA start (R/W): [23:0] DMEM/RDRAM start address +/* DP CMD DMA start (R/W): [23:0] DMEM/RDRAM start address */ #define DPC_START_REG (DPC_BASE_REG + 0x00) -// DP CMD DMA end (R/W): [23:0] DMEM/RDRAM end address +/* DP CMD DMA end (R/W): [23:0] DMEM/RDRAM end address */ #define DPC_END_REG (DPC_BASE_REG + 0x04) -// DP CMD DMA end (R): [23:0] DMEM/RDRAM current address +/* DP CMD DMA end (R): [23:0] DMEM/RDRAM current address */ #define DPC_CURRENT_REG (DPC_BASE_REG + 0x08) -// DP CMD status (R/W): [9:0] valid bits - see below for definitions +/* DP CMD status (R/W): [9:0] valid bits - see below for definitions */ #define DPC_STATUS_REG (DPC_BASE_REG + 0x0C) -// DP clock counter (R): [23:0] clock counter +/* DP clock counter (R): [23:0] clock counter */ #define DPC_CLOCK_REG (DPC_BASE_REG + 0x10) -// DP buffer busy counter (R): [23:0] clock counter +/* DP buffer busy counter (R): [23:0] clock counter */ #define DPC_BUFBUSY_REG (DPC_BASE_REG + 0x14) -// DP pipe busy counter (R): [23:0] clock counter +/* DP pipe busy counter (R): [23:0] clock counter */ #define DPC_PIPEBUSY_REG (DPC_BASE_REG + 0x18) -// DP TMEM load counter (R): [23:0] clock counter +/* DP TMEM load counter (R): [23:0] clock counter */ #define DPC_TMEM_REG (DPC_BASE_REG + 0x1C) /* @@ -320,16 +320,16 @@ */ #define DPS_BASE_REG 0x04200000 -// DP tmem built-in self-test (R/W): [10:0] BIST status bits +/* DP tmem built-in self-test (R/W): [10:0] BIST status bits */ #define DPS_TBIST_REG (DPS_BASE_REG + 0x00) -// DP span test mode (R/W): [0] Span buffer test access enable +/* DP span test mode (R/W): [0] Span buffer test access enable */ #define DPS_TEST_MODE_REG (DPS_BASE_REG + 0x04) -// DP span buffer test address (R/W): [6:0] bits +/* DP span buffer test address (R/W): [6:0] bits */ #define DPS_BUFTEST_ADDR_REG (DPS_BASE_REG + 0x08) -// DP span buffer test data (R/W): [31:0] span buffer data +/* DP span buffer test data (R/W): [31:0] span buffer data */ #define DPS_BUFTEST_DATA_REG (DPS_BASE_REG + 0x0C) /* @@ -344,7 +344,7 @@ * First 2 bits are same as in write mode */ #define DPS_TBIST_DONE (1 << 2) -#define DPS_TBIST_FAILED 0x7F8 // bits [10:3], BIST fail +#define DPS_TBIST_FAILED 0x7F8 /* bits [10:3], BIST fail */ /** @@ -352,22 +352,22 @@ */ #define MI_BASE_REG 0x04300000 -// MI init mode (W): [11] clear DP interrupt, [9/10] clear/set ebus test mode -// [8] set init mode, [7] clear init mode, [6:0] init length -// (R): [8] ebus test mode, [7] init mode, [6:0] init length +/* MI init mode (W): [11] clear DP interrupt, [9/10] clear/set ebus test mode */ +/* [8] set init mode, [7] clear init mode, [6:0] init length */ +/* (R): [8] ebus test mode, [7] init mode, [6:0] init length */ #define MI_INIT_MODE_REG (MI_BASE_REG + 0x00) #define MI_MODE_REG MI_INIT_MODE_REG /* * MI_MODE_REG: write bits */ -#define MI_CLR_INIT (1 << 7) // clear init mode -#define MI_SET_INIT (1 << 8) // set init mode -#define MI_CLR_EBUS (1 << 9) // clear ebus test -#define MI_SET_EBUS (1 << 10) // set ebus test mode -#define MI_CLR_DP_INTR (1 << 11) // clear dp interrupt -#define MI_CLR_RDRAM (1 << 12) // clear RDRAM reg -#define MI_SET_RDRAM (1 << 13) // set RDRAM reg mode +#define MI_CLR_INIT (1 << 7) /* clear init mode */ +#define MI_SET_INIT (1 << 8) /* set init mode */ +#define MI_CLR_EBUS (1 << 9) /* clear ebus test */ +#define MI_SET_EBUS (1 << 10) /* set ebus test mode */ +#define MI_CLR_DP_INTR (1 << 11) /* clear dp interrupt */ +#define MI_CLR_RDRAM (1 << 12) /* clear RDRAM reg */ +#define MI_SET_RDRAM (1 << 13) /* set RDRAM reg mode */ /* * MI_MODE_REG: read bits @@ -376,52 +376,52 @@ #define MI_MODE_EBUS (1 << 8) /* ebus test mode */ #define MI_MODE_RDRAM (1 << 9) /* RDRAM reg mode */ -// MI version (R): [31:24] rsp, [23:16] rdp, [15:8] rac, [7:0] io +/* MI version (R): [31:24] rsp, [23:16] rdp, [15:8] rac, [7:0] io */ #define MI_VERSION_REG (MI_BASE_REG + 0x04) #define MI_NOOP_REG MI_VERSION_REG -// MI interrupt (R): [5:0] valid bits - see below for bit patterns +/* MI interrupt (R): [5:0] valid bits - see below for bit patterns */ #define MI_INTR_REG (MI_BASE_REG + 0x08) -// MI interrupt mask (R): [5:0] valid bits - see below for bit patterns -// (W): [11:0] valid bits - see below for bit patterns +/* MI interrupt mask (R): [5:0] valid bits - see below for bit patterns */ +/* (W): [11:0] valid bits - see below for bit patterns */ #define MI_INTR_MASK_REG (MI_BASE_REG + 0x0C) /* * MI_INTR_REG: read bits */ -#define MI_INTR_SP (1 << 0) // SP intr -#define MI_INTR_SI (1 << 1) // SI intr -#define MI_INTR_AI (1 << 2) // AI intr -#define MI_INTR_VI (1 << 3) // VI intr -#define MI_INTR_PI (1 << 4) // PI intr -#define MI_INTR_DP (1 << 5) // DP intr +#define MI_INTR_SP (1 << 0) /* SP intr */ +#define MI_INTR_SI (1 << 1) /* SI intr */ +#define MI_INTR_AI (1 << 2) /* AI intr */ +#define MI_INTR_VI (1 << 3) /* VI intr */ +#define MI_INTR_PI (1 << 4) /* PI intr */ +#define MI_INTR_DP (1 << 5) /* DP intr */ /* * MI_INTR_MASK_REG: write bits */ -#define MI_INTR_MASK_CLR_SP (1 << 0) // clear SP mask -#define MI_INTR_MASK_SET_SP (1 << 1) // set SP mask -#define MI_INTR_MASK_CLR_SI (1 << 2) // clear SI mask -#define MI_INTR_MASK_SET_SI (1 << 3) // set SI mask -#define MI_INTR_MASK_CLR_AI (1 << 4) // clear AI mask -#define MI_INTR_MASK_SET_AI (1 << 5) // set AI mask -#define MI_INTR_MASK_CLR_VI (1 << 6) // clear VI mask -#define MI_INTR_MASK_SET_VI (1 << 7) // set VI mask -#define MI_INTR_MASK_CLR_PI (1 << 8) // clear PI mask -#define MI_INTR_MASK_SET_PI (1 << 9) // set PI mask -#define MI_INTR_MASK_CLR_DP (1 << 10) // clear DP mask -#define MI_INTR_MASK_SET_DP (1 << 11) // set DP mask +#define MI_INTR_MASK_CLR_SP (1 << 0) /* clear SP mask */ +#define MI_INTR_MASK_SET_SP (1 << 1) /* set SP mask */ +#define MI_INTR_MASK_CLR_SI (1 << 2) /* clear SI mask */ +#define MI_INTR_MASK_SET_SI (1 << 3) /* set SI mask */ +#define MI_INTR_MASK_CLR_AI (1 << 4) /* clear AI mask */ +#define MI_INTR_MASK_SET_AI (1 << 5) /* set AI mask */ +#define MI_INTR_MASK_CLR_VI (1 << 6) /* clear VI mask */ +#define MI_INTR_MASK_SET_VI (1 << 7) /* set VI mask */ +#define MI_INTR_MASK_CLR_PI (1 << 8) /* clear PI mask */ +#define MI_INTR_MASK_SET_PI (1 << 9) /* set PI mask */ +#define MI_INTR_MASK_CLR_DP (1 << 10) /* clear DP mask */ +#define MI_INTR_MASK_SET_DP (1 << 11) /* set DP mask */ /* * MI_INTR_MASK_REG: read bits */ -#define MI_INTR_MASK_SP (1 << 0) // SP intr mask -#define MI_INTR_MASK_SI (1 << 1) // SI intr mask -#define MI_INTR_MASK_AI (1 << 2) // AI intr mask -#define MI_INTR_MASK_VI (1 << 3) // VI intr mask -#define MI_INTR_MASK_PI (1 << 4) // PI intr mask -#define MI_INTR_MASK_DP (1 << 5) // DP intr mask +#define MI_INTR_MASK_SP (1 << 0) /* SP intr mask */ +#define MI_INTR_MASK_SI (1 << 1) /* SI intr mask */ +#define MI_INTR_MASK_AI (1 << 2) /* AI intr mask */ +#define MI_INTR_MASK_VI (1 << 3) /* VI intr mask */ +#define MI_INTR_MASK_PI (1 << 4) /* PI intr mask */ +#define MI_INTR_MASK_DP (1 << 5) /* DP intr mask */ /** @@ -454,90 +454,90 @@ #define VI_CONTROL_REG (VI_BASE_REG + 0x00) #define VI_STATUS_REG VI_CONTROL_REG -// VI origin (R/W): [23:0] frame buffer origin in bytes +/* VI origin (R/W): [23:0] frame buffer origin in bytes */ #define VI_ORIGIN_REG (VI_BASE_REG + 0x04) #define VI_DRAM_ADDR_REG VI_ORIGIN_REG -// VI width (R/W): [11:0] frame buffer line width in pixels +/* VI width (R/W): [11:0] frame buffer line width in pixels */ #define VI_WIDTH_REG (VI_BASE_REG + 0x08) #define VI_H_WIDTH_REG VI_WIDTH_REG -// VI vertical intr (R/W): [9:0] interrupt when current half-line = V_INTR +/* VI vertical intr (R/W): [9:0] interrupt when current half-line = V_INTR */ #define VI_INTR_REG (VI_BASE_REG + 0x0C) #define VI_V_INTR_REG VI_INTR_REG -// VI current vertical line (R/W): [9:0] current half line, sampled once per -// line (the lsb of V_CURRENT is constant within a field, and in interlaced -// modes gives the field number - which is constant for non-interlaced modes) -// - Any write to this register will clear interrupt line +/* VI current vertical line (R/W): [9:0] current half line, sampled once per */ +/* line (the lsb of V_CURRENT is constant within a field, and in interlaced */ +/* modes gives the field number - which is constant for non-interlaced modes) */ +/* - Any write to this register will clear interrupt line */ #define VI_CURRENT_REG (VI_BASE_REG + 0x10) #define VI_V_CURRENT_LINE_REG VI_CURRENT_REG -// VI video timing (R/W): [29:20] start of color burst in pixels from h-sync -// [19:16] vertical sync width in half lines, -// [15: 8] color burst width in pixels, -// [ 7: 0] horizontal sync width in pixels, +/* VI video timing (R/W): [29:20] start of color burst in pixels from h-sync */ +/* [19:16] vertical sync width in half lines, */ +/* [15: 8] color burst width in pixels, */ +/* [ 7: 0] horizontal sync width in pixels, */ #define VI_BURST_REG (VI_BASE_REG + 0x14) #define VI_TIMING_REG VI_BURST_REG -// VI vertical sync (R/W): [9:0] number of half-lines per field +/* VI vertical sync (R/W): [9:0] number of half-lines per field */ #define VI_V_SYNC_REG (VI_BASE_REG + 0x18) -// VI horizontal sync (R/W): [20:16] a 5-bit leap pattern used for PAL only (h_sync_period) -// [11: 0] total duration of a line in 1/4 pixel +/* VI horizontal sync (R/W): [20:16] a 5-bit leap pattern used for PAL only (h_sync_period) */ +/* [11: 0] total duration of a line in 1/4 pixel */ #define VI_H_SYNC_REG (VI_BASE_REG + 0x1C) -// VI horizontal sync leap (R/W): [27:16] identical to h_sync_period -// [11: 0] identical to h_sync_period +/* VI horizontal sync leap (R/W): [27:16] identical to h_sync_period */ +/* [11: 0] identical to h_sync_period */ #define VI_LEAP_REG (VI_BASE_REG + 0x20) #define VI_H_SYNC_LEAP_REG VI_LEAP_REG -// VI horizontal video (R/W): [25:16] start of active video in screen pixels -// [ 9: 0] end of active video in screen pixels +/* VI horizontal video (R/W): [25:16] start of active video in screen pixels */ +/* [ 9: 0] end of active video in screen pixels */ #define VI_H_START_REG (VI_BASE_REG + 0x24) #define VI_H_VIDEO_REG VI_H_START_REG -// VI vertical video (R/W): [25:16] start of active video in screen half-lines -// [ 9: 0] end of active video in screen half-lines +/* VI vertical video (R/W): [25:16] start of active video in screen half-lines */ +/* [ 9: 0] end of active video in screen half-lines */ #define VI_V_START_REG (VI_BASE_REG + 0x28) #define VI_V_VIDEO_REG VI_V_START_REG -// VI vertical burst (R/W): [25:16] start of color burst enable in half-lines -// [ 9: 0] end of color burst enable in half-lines +/* VI vertical burst (R/W): [25:16] start of color burst enable in half-lines */ +/* [ 9: 0] end of color burst enable in half-lines */ #define VI_V_BURST_REG (VI_BASE_REG + 0x2C) -// VI x-scale (R/W): [27:16] horizontal subpixel offset (2.10 format) -// [11: 0] 1/horizontal scale up factor (2.10 format) +/* VI x-scale (R/W): [27:16] horizontal subpixel offset (2.10 format) */ +/* [11: 0] 1/horizontal scale up factor (2.10 format) */ #define VI_X_SCALE_REG (VI_BASE_REG + 0x30) -// VI y-scale (R/W): [27:16] vertical subpixel offset (2.10 format) -// [11: 0] 1/vertical scale up factor (2.10 format) +/* VI y-scale (R/W): [27:16] vertical subpixel offset (2.10 format) */ +/* [11: 0] 1/vertical scale up factor (2.10 format) */ #define VI_Y_SCALE_REG (VI_BASE_REG + 0x34) /* * VI_CONTROL_REG: read bits */ -#define VI_CTRL_TYPE_16 0x00002 // [1:0] pixel size: 16 bit -#define VI_CTRL_TYPE_32 0x00003 // [1:0] pixel size: 32 bit -#define VI_CTRL_GAMMA_DITHER_ON 0x00004 // 2: default = on -#define VI_CTRL_GAMMA_ON 0x00008 // 3: default = on -#define VI_CTRL_DIVOT_ON 0x00010 // 4: default = on -#define VI_CTRL_SERRATE_ON 0x00040 // 6: on if interlaced -#define VI_CTRL_ANTIALIAS_MASK 0x00300 // [9:8] anti-alias mode -#define VI_CTRL_ANTIALIAS_MODE_0 0x00000 // Bit [9:8] anti-alias mode: AA enabled, resampling enabled, always fetch extra lines -#define VI_CTRL_ANTIALIAS_MODE_1 0x00100 // Bit [9:8] anti-alias mode: AA enabled, resampling enabled, fetch extra lines as-needed -#define VI_CTRL_ANTIALIAS_MODE_2 0x00200 // Bit [9:8] anti-alias mode: AA disabled, resampling enabled, operate as if everything is covered -#define VI_CTRL_ANTIALIAS_MODE_3 0x00300 // Bit [9:8] anti-alias mode: AA disabled, resampling disabled, replicate pixels -#define VI_CTRL_PIXEL_ADV_MASK 0x0F000 // [15:12] pixel advance mode -#define VI_CTRL_PIXEL_ADV_3 0x03000 // Bit [15:12] pixel advance mode: Always 3 on N64 -#define VI_CTRL_DITHER_FILTER_ON 0x10000 // 16: dither-filter mode +#define VI_CTRL_TYPE_16 0x00002 /* [1:0] pixel size: 16 bit */ +#define VI_CTRL_TYPE_32 0x00003 /* [1:0] pixel size: 32 bit */ +#define VI_CTRL_GAMMA_DITHER_ON 0x00004 /* 2: default = on */ +#define VI_CTRL_GAMMA_ON 0x00008 /* 3: default = on */ +#define VI_CTRL_DIVOT_ON 0x00010 /* 4: default = on */ +#define VI_CTRL_SERRATE_ON 0x00040 /* 6: on if interlaced */ +#define VI_CTRL_ANTIALIAS_MASK 0x00300 /* [9:8] anti-alias mode */ +#define VI_CTRL_ANTIALIAS_MODE_0 0x00000 /* Bit [9:8] anti-alias mode: AA enabled, resampling enabled, always fetch extra lines */ +#define VI_CTRL_ANTIALIAS_MODE_1 0x00100 /* Bit [9:8] anti-alias mode: AA enabled, resampling enabled, fetch extra lines as-needed */ +#define VI_CTRL_ANTIALIAS_MODE_2 0x00200 /* Bit [9:8] anti-alias mode: AA disabled, resampling enabled, operate as if everything is covered */ +#define VI_CTRL_ANTIALIAS_MODE_3 0x00300 /* Bit [9:8] anti-alias mode: AA disabled, resampling disabled, replicate pixels */ +#define VI_CTRL_PIXEL_ADV_MASK 0x0F000 /* [15:12] pixel advance mode */ +#define VI_CTRL_PIXEL_ADV(n) (((n) << 12) & VI_CTRL_PIXEL_ADV_MASK) /* Bit [15:12] pixel advance mode: Always 3 on N64 */ +#define VI_CTRL_DITHER_FILTER_ON 0x10000 /* 16: dither-filter mode */ /* * Possible video clocks (NTSC or PAL) */ -#define VI_NTSC_CLOCK 48681812 // Hz = 48.681812 MHz -#define VI_PAL_CLOCK 49656530 // Hz = 49.656530 MHz -#define VI_MPAL_CLOCK 48628316 // Hz = 48.628316 MHz +#define VI_NTSC_CLOCK 48681812 /* Hz = 48.681812 MHz */ +#define VI_PAL_CLOCK 49656530 /* Hz = 49.656530 MHz */ +#define VI_MPAL_CLOCK 48628316 /* Hz = 48.628316 MHz */ /** @@ -549,25 +549,25 @@ */ #define AI_BASE_REG 0x04500000 -// AI DRAM address (W): [23:0] starting RDRAM address (8B-aligned) +/* AI DRAM address (W): [23:0] starting RDRAM address (8B-aligned) */ #define AI_DRAM_ADDR_REG (AI_BASE_REG + 0x00) -// AI length (R/W): [14:0] transfer length (v1.0) - Bottom 3 bits are ignored -// [17:0] transfer length (v2.0) - Bottom 3 bits are ignored +/* AI length (R/W): [14:0] transfer length (v1.0) - Bottom 3 bits are ignored */ +/* [17:0] transfer length (v2.0) - Bottom 3 bits are ignored */ #define AI_LEN_REG (AI_BASE_REG + 0x04) -// AI control (W): [0] DMA enable - if LSB == 1, DMA is enabled +/* AI control (W): [0] DMA enable - if LSB == 1, DMA is enabled */ #define AI_CONTROL_REG (AI_BASE_REG + 0x08) /* * AI_CONTROL_REG: write bits */ -#define AI_CONTROL_DMA_ON 1 // LSB = 1: DMA enable -#define AI_CONTROL_DMA_OFF 0 // LSB = 1: DMA enable +#define AI_CONTROL_DMA_ON 1 /* LSB = 1: DMA enable */ +#define AI_CONTROL_DMA_OFF 0 /* LSB = 1: DMA enable */ -// AI status (R): [31]/[0] ai_full (addr & len buffer full), [30] ai_busy -// Note that a 1->0 transition in ai_full will set interrupt -// (W): clear audio interrupt +/* AI status (R): [31]/[0] ai_full (addr & len buffer full), [30] ai_busy */ +/* Note that a 1->0 transition in ai_full will set interrupt */ +/* (W): clear audio interrupt */ #define AI_STATUS_REG (AI_BASE_REG + 0x0C) /* @@ -576,23 +576,23 @@ #define AI_STATUS_FIFO_FULL (1 << 31) #define AI_STATUS_DMA_BUSY (1 << 30) -// AI DAC sample period register (W): [13:0] dac rate -// - vid_clock/(dperiod + 1) is the DAC sample rate -// - (dperiod + 1) >= 66 * (aclockhp + 1) must be true +/* AI DAC sample period register (W): [13:0] dac rate */ +/* - vid_clock/(dperiod + 1) is the DAC sample rate */ +/* - (dperiod + 1) >= 66 * (aclockhp + 1) must be true */ #define AI_DACRATE_REG (AI_BASE_REG + 0x10) -// DAC rate = video clock / audio frequency -// - DAC rate >= (66 * Bit rate) must be true -#define AI_MAX_DAC_RATE 16384 // 14-bit+1 +/* DAC rate = video clock / audio frequency */ +/* - DAC rate >= (66 * Bit rate) must be true */ +#define AI_MAX_DAC_RATE 16384 /* 14-bit+1 */ #define AI_MIN_DAC_RATE 132 -// AI bit rate (W): [3:0] bit rate (abus clock half period register - aclockhp) -// - vid_clock/(2 * (aclockhp + 1)) is the DAC clock rate -// - The abus clock stops if aclockhp is zero +/* AI bit rate (W): [3:0] bit rate (abus clock half period register - aclockhp) */ +/* - vid_clock/(2 * (aclockhp + 1)) is the DAC clock rate */ +/* - The abus clock stops if aclockhp is zero */ #define AI_BITRATE_REG (AI_BASE_REG + 0x14) -// Bit rate <= (DAC rate / 66) -#define AI_MAX_BIT_RATE 16 // 4-bit+1 +/* Bit rate <= (DAC rate / 66) */ +#define AI_MAX_BIT_RATE 16 /* 4-bit+1 */ #define AI_MIN_BIT_RATE 2 /* @@ -600,14 +600,14 @@ * max frequency = (video clock / min dac rate) * min frequency = (video clock / max dac rate) */ -#define AI_NTSC_MAX_FREQ 368000 // 368 KHz -#define AI_NTSC_MIN_FREQ 3000 // 3 KHz ~ 2971 Hz +#define AI_NTSC_MAX_FREQ 368000 /* 368 KHz */ +#define AI_NTSC_MIN_FREQ 3000 /* 3 KHz ~ 2971 Hz */ -#define AI_PAL_MAX_FREQ 376000 // 376 KHz -#define AI_PAL_MIN_FREQ 3050 // 3 KHz ~ 3031 Hz +#define AI_PAL_MAX_FREQ 376000 /* 376 KHz */ +#define AI_PAL_MIN_FREQ 3050 /* 3 KHz ~ 3031 Hz */ -#define AI_MPAL_MAX_FREQ 368000 // 368 KHz -#define AI_MPAL_MIN_FREQ 3000 // 3 KHz ~ 2968 Hz +#define AI_MPAL_MAX_FREQ 368000 /* 368 KHz */ +#define AI_MPAL_MIN_FREQ 3000 /* 3 KHz ~ 2968 Hz */ /** @@ -615,44 +615,44 @@ */ #define PI_BASE_REG 0x04600000 -// PI DRAM address (R/W): [23:0] starting RDRAM address +/* PI DRAM address (R/W): [23:0] starting RDRAM address */ #define PI_DRAM_ADDR_REG (PI_BASE_REG + 0x00) -// PI pbus (cartridge) address (R/W): [31:0] starting AD16 address +/* PI pbus (cartridge) address (R/W): [31:0] starting AD16 address */ #define PI_CART_ADDR_REG (PI_BASE_REG + 0x04) -// PI read length (R/W): [23:0] read data length +/* PI read length (R/W): [23:0] read data length */ #define PI_RD_LEN_REG (PI_BASE_REG + 0x08) -// PI write length (R/W): [23:0] write data length +/* PI write length (R/W): [23:0] write data length */ #define PI_WR_LEN_REG (PI_BASE_REG + 0x0C) -// PI status (R): [3] interrupt flag, [2] error, [1] IO busy, [0] DMA busy -// (W): [1] clear intr, [0] reset controller (and abort current op) +/* PI status (R): [3] interrupt flag, [2] error, [1] IO busy, [0] DMA busy */ +/* (W): [1] clear intr, [0] reset controller (and abort current op) */ #define PI_STATUS_REG (PI_BASE_REG + 0x10) -// PI dom1 latency (R/W): [7:0] domain 1 device latency +/* PI dom1 latency (R/W): [7:0] domain 1 device latency */ #define PI_BSD_DOM1_LAT_REG (PI_BASE_REG + 0x14) -// PI dom1 pulse width (R/W): [7:0] domain 1 device R/W strobe pulse width +/* PI dom1 pulse width (R/W): [7:0] domain 1 device R/W strobe pulse width */ #define PI_BSD_DOM1_PWD_REG (PI_BASE_REG + 0x18) -// PI dom1 page size (R/W): [3:0] domain 1 device page size +/* PI dom1 page size (R/W): [3:0] domain 1 device page size */ #define PI_BSD_DOM1_PGS_REG (PI_BASE_REG + 0x1C) -// PI dom1 release (R/W): [1:0] domain 1 device R/W release duration +/* PI dom1 release (R/W): [1:0] domain 1 device R/W release duration */ #define PI_BSD_DOM1_RLS_REG (PI_BASE_REG + 0x20) -// PI dom2 latency (R/W): [7:0] domain 2 device latency +/* PI dom2 latency (R/W): [7:0] domain 2 device latency */ #define PI_BSD_DOM2_LAT_REG (PI_BASE_REG + 0x24) -// PI dom2 pulse width (R/W): [7:0] domain 2 device R/W strobe pulse width +/* PI dom2 pulse width (R/W): [7:0] domain 2 device R/W strobe pulse width */ #define PI_BSD_DOM2_PWD_REG (PI_BASE_REG + 0x28) -// PI dom2 page size (R/W): [3:0] domain 2 device page size +/* PI dom2 page size (R/W): [3:0] domain 2 device page size */ #define PI_BSD_DOM2_PGS_REG (PI_BASE_REG + 0x2C) -// PI dom2 release (R/W): [1:0] domain 2 device R/W release duration +/* PI dom2 release (R/W): [1:0] domain 2 device R/W release duration */ #define PI_BSD_DOM2_RLS_REG (PI_BASE_REG + 0x30) #define PI_DOMAIN1_REG PI_BSD_DOM1_LAT_REG @@ -719,30 +719,30 @@ */ #define RI_BASE_REG 0x04700000 -// RI mode (R/W): [3] stop R active, [2] stop T active, [1:0] operating mode +/* RI mode (R/W): [3] stop R active, [2] stop T active, [1:0] operating mode */ #define RI_MODE_REG (RI_BASE_REG + 0x00) -// RI config (R/W): [6] current control enable, [5:0] current control input +/* RI config (R/W): [6] current control enable, [5:0] current control input */ #define RI_CONFIG_REG (RI_BASE_REG + 0x04) -// RI current load (W): [] any write updates current control register +/* RI current load (W): [] any write updates current control register */ #define RI_CURRENT_LOAD_REG (RI_BASE_REG + 0x08) -// RI select (R/W): [3:2] receive select, [1:0] transmit select +/* RI select (R/W): [3:2] receive select, [1:0] transmit select */ #define RI_SELECT_REG (RI_BASE_REG + 0x0C) -// RI refresh (R/W): [16] refresh bank, [17] refresh enable, [18] refresh optimize -// [7:0] clean refresh delay, [15:8] dirty refresh dela +/* RI refresh (R/W): [16] refresh bank, [17] refresh enable, [18] refresh optimize */ +/* [7:0] clean refresh delay, [15:8] dirty refresh dela */ #define RI_REFRESH_REG (RI_BASE_REG + 0x10) #define RI_COUNT_REG RI_REFRESH_REG -// RI latency (R/W): [3:0] DMA latency/overlap +/* RI latency (R/W): [3:0] DMA latency/overlap */ #define RI_LATENCY_REG (RI_BASE_REG + 0x14) -// RI error (R): [1] ack error, [0] nack error +/* RI error (R): [1] ack error, [0] nack error */ #define RI_RERROR_REG (RI_BASE_REG + 0x18) -// RI error (W): [] any write clears all error bits +/* RI error (W): [] any write clears all error bits */ #define RI_WERROR_REG (RI_BASE_REG + 0x1C) @@ -751,27 +751,27 @@ */ #define SI_BASE_REG 0x04800000 -// SI DRAM address (R/W): [23:0] starting RDRAM address +/* SI DRAM address (R/W): [23:0] starting RDRAM address */ #define SI_DRAM_ADDR_REG (SI_BASE_REG + 0x00) -// SI address read 64B (W): [] write begins a 64B DMA write PIF RAM -> RDRAM +/* SI address read 64B (W): [] write begins a 64B DMA write PIF RAM -> RDRAM */ #define SI_PIF_ADDR_RD64B_REG (SI_BASE_REG + 0x04) -// Address SI_BASE_REG + (0x08, 0x0C, 0x14) are reserved +/* Address SI_BASE_REG + (0x08, 0x0C, 0x14) are reserved */ -// SI address write 64B (W): [] write begins a 64B DMA read RDRAM -> PIF RAM */ +/* SI address write 64B (W): [] write begins a 64B DMA read RDRAM -> PIF RAM */ #define SI_PIF_ADDR_WR64B_REG (SI_BASE_REG + 0x10) -// SI status (R/W): [] any write clears interrupt +/* SI status (R/W): [] any write clears interrupt */ #define SI_STATUS_REG (SI_BASE_REG + 0x18) /* * SI_STATUS_REG: read bits */ -#define SI_STATUS_DMA_BUSY (1 << 0) // DMA in progress -#define SI_STATUS_RD_BUSY (1 << 1) // IO access in progress -#define SI_STATUS_DMA_ERROR (1 << 3) // Overlapping DMA requests -#define SI_STATUS_INTERRUPT (1 << 12) // Interrupt is set +#define SI_STATUS_DMA_BUSY (1 << 0) /* DMA in progress */ +#define SI_STATUS_RD_BUSY (1 << 1) /* IO access in progress */ +#define SI_STATUS_DMA_ERROR (1 << 3) /* Overlapping DMA requests */ +#define SI_STATUS_INTERRUPT (1 << 12) /* Interrupt is set */ /** @@ -780,13 +780,13 @@ #define GIO_BASE_REG 0x18000000 -// Game to Host Interrupt +/* Game to Host Interrupt */ #define GIO_GIO_INTR_REG (GIO_BASE_REG+0x000) -// Game to Host SYNC +/* Game to Host SYNC */ #define GIO_GIO_SYNC_REG (GIO_BASE_REG+0x400) -// Host to Game Interrupt +/* Host to Game Interrupt */ #define GIO_CART_INTR_REG (GIO_BASE_REG+0x800) diff --git a/include/ultra64/regdef.h b/include/ultra64/regdef.h new file mode 100644 index 0000000000..a3b2832180 --- /dev/null +++ b/include/ultra64/regdef.h @@ -0,0 +1,164 @@ +#ifndef REGDEF_H +#define REGDEF_H + +#ifdef __GNUC__ +#define _MIPS_SIM_ABI32 _ABIO32 +#define _MIPS_SIM_NABI32 _ABIN32 +#define _MIPS_SIM_ABI64 _ABI64 +#endif + +#if (_MIPS_SIM == _MIPS_SIM_ABI32) +#define zero $0 +#define AT $at +#define v0 $2 +#define v1 $3 +#define a0 $4 +#define a1 $5 +#define a2 $6 +#define a3 $7 +#define t0 $8 +#define t1 $9 +#define t2 $10 +#define t3 $11 +#define t4 $12 +#define ta0 $12 +#define t5 $13 +#define ta1 $13 +#define t6 $14 +#define ta2 $14 +#define t7 $15 +#define ta3 $15 +#define s0 $16 +#define s1 $17 +#define s2 $18 +#define s3 $19 +#define s4 $20 +#define s5 $21 +#define s6 $22 +#define s7 $23 +#define t8 $24 +#define t9 $25 +#define jp $25 +#define k0 $26 +#define k1 $27 +#define gp $28 +#define sp $29 +#define fp $30 +#define s8 $30 +#define ra $31 +#endif + +#if (_MIPS_SIM == _MIPS_SIM_ABI64) +#define zero $0 +#define AT $at +#define v0 $2 +#define v1 $3 +#define a0 $4 +#define a1 $5 +#define a2 $6 +#define a3 $7 +#define a4 $8 +#define ta0 $8 +#define a5 $9 +#define ta1 $9 +#define a6 $10 +#define ta2 $10 +#define a7 $11 +#define ta3 $11 +#define t0 $12 +#define t1 $13 +#define t2 $14 +#define t3 $15 +#define s0 $16 +#define s1 $17 +#define s2 $18 +#define s3 $19 +#define s4 $20 +#define s5 $21 +#define s6 $22 +#define s7 $23 +#define t8 $24 +#define t9 $25 +#define jp $25 +#define k0 $26 +#define k1 $27 +#define gp $28 +#define sp $29 +#define fp $30 +#define s8 $30 +#define ra $31 +#endif + +#if (_MIPS_SIM == _MIPS_SIM_ABI32) +#define fv0 $f0 +#define fv0f $f1 +#define fv1 $f2 +#define fv1f $f3 +#define fa0 $f12 +#define fa0f $f13 +#define fa1 $f14 +#define fa1f $f15 +#define ft0 $f4 +#define ft0f $f5 +#define ft1 $f6 +#define ft1f $f7 +#define ft2 $f8 +#define ft2f $f9 +#define ft3 $f10 +#define ft3f $f11 +#define ft4 $f16 +#define ft4f $f17 +#define ft5 $f18 +#define ft5f $f19 +#define fs0 $f20 +#define fs0f $f21 +#define fs1 $f22 +#define fs1f $f23 +#define fs2 $f24 +#define fs2f $f25 +#define fs3 $f26 +#define fs3f $f27 +#define fs4 $f28 +#define fs4f $f29 +#define fs5 $f30 +#define fs5f $f31 +#endif + +#if (_MIPS_SIM == _MIPS_SIM_ABI64) +#define fv0 $f0 +#define fv1 $f2 +#define fa0 $f12 +#define fa1 $f13 +#define fa2 $f14 +#define fa3 $f15 +#define fa4 $f16 +#define fa5 $f17 +#define fa6 $f18 +#define fa7 $f19 +#define ft0 $f4 +#define ft1 $f5 +#define ft2 $f6 +#define ft3 $f7 +#define ft4 $f8 +#define ft5 $f9 +#define ft6 $f10 +#define ft7 $f11 +#define ft8 $f20 +#define ft9 $f21 +#define ft10 $f22 +#define ft11 $f23 +#define ft12 $f1 +#define ft13 $f3 +#define fs0 $f24 +#define fs1 $f25 +#define fs2 $f26 +#define fs3 $f27 +#define fs4 $f28 +#define fs5 $f29 +#define fs6 $f30 +#define fs7 $f31 +#endif + +#define fcr31 $31 + +#endif diff --git a/include/ultra64/thread.h b/include/ultra64/thread.h index 813fefaa97..3c2733f150 100644 --- a/include/ultra64/thread.h +++ b/include/ultra64/thread.h @@ -73,7 +73,7 @@ typedef struct __OSThreadTail { #else -// OSThread struct member offsets +/* OSThread struct member offsets */ #define THREAD_NEXT 0x00 #define THREAD_PRI 0x04 diff --git a/include/ultra64/version.h b/include/ultra64/version.h new file mode 100644 index 0000000000..00d772845e --- /dev/null +++ b/include/ultra64/version.h @@ -0,0 +1,14 @@ +#ifndef ULTRA64_VERSION_H +#define ULTRA64_VERSION_H + +#define LIBULTRA_VERSION_D 'D' +#define LIBULTRA_VERSION_E 'E' +#define LIBULTRA_VERSION_F 'F' +#define LIBULTRA_VERSION_G 'G' +#define LIBULTRA_VERSION_H 'H' +#define LIBULTRA_VERSION_I 'I' +#define LIBULTRA_VERSION_J 'J' +#define LIBULTRA_VERSION_K 'K' +#define LIBULTRA_VERSION_L 'L' + +#endif diff --git a/include/variables.h b/include/variables.h index 1097443c58..e37738a98f 100644 --- a/include/variables.h +++ b/include/variables.h @@ -143,8 +143,8 @@ extern s32 gSystemArenaLogSeverity; extern u8 __osPfsInodeCacheBank; extern s32 __osPfsLastChannel; -extern const TempoData gTempoData; -extern const AudioHeapInitSizes gAudioHeapInitSizes; +extern TempoData gTempoData; +extern AudioHeapInitSizes gAudioHeapInitSizes; extern s16 gOcarinaSongItemMap[]; extern AudioTable gSoundFontTable; extern u8 gSequenceFontTable[]; diff --git a/include/versions.h b/include/versions.h index 96ae716f06..620b27999e 100644 --- a/include/versions.h +++ b/include/versions.h @@ -15,6 +15,7 @@ #define GC_EU 11 #define GC_EU_MQ 12 #define GC_JP_CE 13 +#define IQUE_CN 14 // NTSC/PAL #if OOT_VERSION == PAL_1_0 || OOT_VERSION == PAL_1_1 || OOT_VERSION == GC_EU || OOT_VERSION == GC_EU_MQ || OOT_VERSION == GC_EU_MQ_DBG diff --git a/include/z64actor.h b/include/z64actor.h index 5f3241e729..f63e828bac 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -130,14 +130,25 @@ typedef struct ActorShape { // What actually matters is the presence or lack of `ACTOR_FLAG_HOSTILE`. #define ACTOR_FLAG_FRIENDLY (1 << 3) -// -#define ACTOR_FLAG_4 (1 << 4) - -// -#define ACTOR_FLAG_5 (1 << 5) - -// -#define ACTOR_FLAG_6 (1 << 6) +// Culling of the actor's update process is disabled. +// In other words, the actor will keep updating even if the actor is outside its own culling volume. +// See `Actor_CullingCheck` for more information about culling. +// See `Actor_CullingVolumeTest` for more information on the test used to determine if an actor should be culled. +#define ACTOR_FLAG_UPDATE_CULLING_DISABLED (1 << 4) + +// Culling of the actor's draw process is disabled. +// In other words, the actor will keep drawing even if the actor is outside its own culling volume. +// See `Actor_CullingCheck` for more information about culling. +// See `Actor_CullingVolumeTest` for more information on the test used to determine if an actor should be culled. +// (The original name for this flag is `NO_CULL_DRAW`, known from the Majora's Mask Debug ROM) +#define ACTOR_FLAG_DRAW_CULLING_DISABLED (1 << 5) + +// Set if the actor is currently within the bounds of its culling volume. +// In most cases, this flag can be used to determine whether or not an actor is currently culled. +// However this flag still updates even if `ACTOR_FLAG_UPDATE_CULLING_DISABLED` or `ACTOR_FLAG_DRAW_CULLING_DISABLED` +// are set. Meaning, the flag can still have a value of "false" even if it is not actually culled. +// (The original name for this flag is `NO_CULL_FLAG`, known from the Majora's Mask Debug ROM) +#define ACTOR_FLAG_INSIDE_CULLING_VOLUME (1 << 6) // hidden or revealed by Lens of Truth (depending on room lensMode) #define ACTOR_FLAG_REACT_TO_LENS (1 << 7) @@ -284,9 +295,9 @@ typedef struct Actor { /* 0x0B4 */ ActorShape shape; // Variables related to the physical shape of the actor /* 0x0E4 */ Vec3f projectedPos; // Position of the actor in projected space /* 0x0F0 */ f32 projectedW; // w component of the projected actor position - /* 0x0F4 */ f32 uncullZoneForward; // Amount to increase the uncull zone forward by (in projected space) - /* 0x0F8 */ f32 uncullZoneScale; // Amount to increase the uncull zone scale by (in projected space) - /* 0x0FC */ f32 uncullZoneDownward; // Amount to increase uncull zone downward by (in projected space) + /* 0x0F4 */ f32 cullingVolumeDistance; // Forward distance of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. + /* 0x0F8 */ f32 cullingVolumeScale; // Scale of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. + /* 0x0FC */ f32 cullingVolumeDownward; // Downward height of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. /* 0x100 */ Vec3f prevPos; // World position from the previous update cycle /* 0x10C */ u8 isLockedOn; // Set to true if the actor is currently locked-on by Player /* 0x10D */ u8 attentionPriority; // Lower values have higher priority. Resets to 0 when lock-on is released. @@ -766,6 +777,10 @@ typedef struct NpcInteractInfo { #define PARAMS_PACK(p, s, n) \ (((p) & NBITS_TO_MASK(n)) << (s)) +// Moves the value `p` to bit position `s` for building actor parameters by OR-ing these together. +#define PARAMS_PACK_NOMASK(p, s) \ + ((p) << (s)) + // Generates a bitmask for bit position `s` of length `n` #define PARAMS_MAKE_MASK(s, n) PARAMS_GET_NOSHIFT(~0, s, n) @@ -830,10 +845,10 @@ int func_8002DD78(struct Player* player); s32 func_8002DDE4(struct PlayState* play); s32 func_8002DDF4(struct PlayState* play); void Actor_SwapHookshotAttachment(struct PlayState* play, Actor* srcActor, Actor* destActor); -void func_8002DE74(struct PlayState* play, struct Player* player); +void Actor_RequestHorseCameraSetting(struct PlayState* play, struct Player* player); void Actor_MountHorse(struct PlayState* play, struct Player* player, Actor* horse); int func_8002DEEC(struct Player* player); -void func_8002DF18(struct PlayState* play, struct Player* player); +void Actor_InitPlayerHorse(struct PlayState* play, struct Player* player); s32 Player_SetCsAction(struct PlayState* play, Actor* csActor, u8 csAction); s32 Player_SetCsActionWithHaltedActors(struct PlayState* play, Actor* csActor, u8 csAction); void func_8002DF90(DynaPolyActor* dynaActor); @@ -860,7 +875,7 @@ s32 Actor_OfferTalkExchangeEquiCylinder(Actor* actor, struct PlayState* play, f3 s32 Actor_OfferTalk(Actor* actor, struct PlayState* play, f32 radius); s32 Actor_OfferTalkNearColChkInfoCylinder(Actor* actor, struct PlayState* play); u32 Actor_TextboxIsClosing(Actor* actor, struct PlayState* play); -s8 func_8002F368(struct PlayState* play); +s8 Actor_GetPlayerExchangeItemId(struct PlayState* play); void Actor_GetScreenPos(struct PlayState* play, Actor* actor, s16* x, s16* y); u32 Actor_HasParent(Actor* actor, struct PlayState* play); s32 Actor_OfferGetItem(Actor* actor, struct PlayState* play, s32 getItemId, f32 xzRange, f32 yRange); @@ -889,7 +904,7 @@ s32 func_8002F9EC(struct PlayState* play, Actor* actor, struct CollisionPoly* po void Actor_DisableLens(struct PlayState* play); void Actor_InitContext(struct PlayState* play, ActorContext* actorCtx, struct ActorEntry* playerEntry); void Actor_UpdateAll(struct PlayState* play, ActorContext* actorCtx); -s32 func_800314D4(struct PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3); +s32 Actor_CullingVolumeTest(struct PlayState* play, Actor* actor, Vec3f* projPos, f32 projW); void func_800315AC(struct PlayState* play, ActorContext* actorCtx); void Actor_KillAllWithMissingObject(struct PlayState* play, ActorContext* actorCtx); void func_80031B14(struct PlayState* play, ActorContext* actorCtx); @@ -939,7 +954,7 @@ void func_80034BA0(struct PlayState* play, SkelAnime* skelAnime, OverrideLimbDra PostLimbDraw postLimbDraw, Actor* actor, s16 alpha); void func_80034CC4(struct PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, Actor* actor, s16 alpha); -s16 func_80034DD4(Actor* actor, struct PlayState* play, s16 arg2, f32 arg3); +s16 Actor_UpdateAlphaByDistance(Actor* actor, struct PlayState* play, s16 alpha, f32 radius); void Actor_UpdateFidgetTables(struct PlayState* play, s16* fidgetTableY, s16* fidgetTableZ, s32 tableLen); void Actor_Noop(Actor* actor, struct PlayState* play); diff --git a/include/z64audio.h b/include/z64audio.h index 60ae4fb2a2..e02ce7b843 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -201,11 +201,9 @@ typedef struct AdpcmBookHeader { * The procedure used to design the codeBook is based on an adaptive clustering algorithm. * The size of the codeBook is (8 * order * numPredictors) and is 8-byte aligned */ -typedef s16 AdpcmBookData[]; - typedef struct AdpcmBook { /* 0x00 */ AdpcmBookHeader header; - /* 0x08 */ AdpcmBookData book; // size 8 * order * numPredictors. 8-byte aligned + /* 0x08 */ s16 book[1]; // size 8 * order * numPredictors. 8-byte aligned } AdpcmBook; // size >= 0x8 typedef struct Sample { diff --git a/include/z64cutscene.h b/include/z64cutscene.h index 381c5c58dd..270570e113 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -23,6 +23,7 @@ typedef enum CutsceneState { } CutsceneState; typedef enum CutsceneCmd { + /* 0xFFFF */ CS_CMD_END_OF_SCRIPT = -1, /* 0x0001 */ CS_CMD_CAM_EYE_SPLINE = 0x01, /* 0x0002 */ CS_CMD_CAM_AT_SPLINE, /* 0x0003 */ CS_CMD_MISC, @@ -152,7 +153,6 @@ typedef enum CutsceneCmd { /* 0x0090 */ CS_CMD_ACTOR_CUE_0_17, /* 0x03E8 */ CS_CMD_DESTINATION = 0x03E8, /* 0x03E9 */ CS_CMD_MOTION_BLUR, - /* 0xFFFF */ CS_CMD_END = 0xFFFF } CutsceneCmd; typedef enum CutsceneMiscType { @@ -176,8 +176,8 @@ typedef enum CutsceneMiscType { /* 0x11 */ CS_MISC_QUAKE_STOP, /* 0x12 */ CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY, /* 0x13 */ CS_MISC_SET_FLAG_FAST_WINDMILL, - /* 0x14 */ CS_MISC_SET_FLAG_WELL_DRAINED, - /* 0x15 */ CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED, + /* 0x14 */ CS_MISC_SET_FLAG_DRAINED_WELL, + /* 0x15 */ CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA, /* 0x16 */ CS_MISC_VISMONO_BLACK_AND_WHITE, /* 0x17 */ CS_MISC_VISMONO_SEPIA, /* 0x18 */ CS_MISC_HIDE_ROOM, diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h index 1e974b318a..64991b887c 100644 --- a/include/z64cutscene_commands.h +++ b/include/z64cutscene_commands.h @@ -37,9 +37,10 @@ #endif /** - * Marks the beginning of a cutscene script. + * Describes the length and the total number of command entries for a cutscene script. + * Required at the beginning of every script. */ -#define CS_BEGIN_CUTSCENE(totalEntries, frameCount) CMD_W(totalEntries), CMD_W(frameCount) +#define CS_HEADER(totalEntries, frameCount) CMD_W(totalEntries), CMD_W(frameCount) /** * Defines data for `CutsceneCameraPoint`, which can be used with any of the `eye` or `at` camera commands. @@ -291,9 +292,9 @@ CS_MOTION_BLUR(CS_MOTION_BLUR_DISABLE, 0, startFrame, endFrame) /** - * Marks the end of a cutscene script. + * Marks the end of a command list in a cutscene script. Processing for the current frame will finish. */ -#define CS_END() 0xFFFFFFFF, 0x00000000 +#define CS_END_OF_SCRIPT() CS_CMD_END_OF_SCRIPT, CMD_W(0) // most instances of this look like unimplemented actor cues. diff --git a/include/z64horse.h b/include/z64horse.h new file mode 100644 index 0000000000..d58de4b6d4 --- /dev/null +++ b/include/z64horse.h @@ -0,0 +1,16 @@ +#ifndef Z64HORSE_H +#define Z64HORSE_H + +#include "ultra64.h" +#include "z64math.h" + +struct PlayState; +struct Actor; +struct Player; + +void Horse_ResetHorseData(struct PlayState* play); +void Horse_FixLakeHyliaPosition(struct PlayState* play); +void Horse_InitPlayerHorse(struct PlayState* play, struct Player* player); +void Horse_RotateToPoint(struct Actor* actor, Vec3f* pos, s16 turnAmount); + +#endif diff --git a/include/z64player.h b/include/z64player.h index 732f02cbcb..619b41e5f9 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -8,7 +8,19 @@ struct Player; -#define PLAYER_GET_START_MODE(thisx) PARAMS_GET_S(thisx->params, 8, 4) +#define PLAYER_PARAMS(startMode, startBgCamIndex) (PARAMS_PACK_NOMASK(startMode, 8) | PARAMS_PACK_NOMASK(startBgCamIndex, 0)) + +// Determines behavior when spawning. See `PlayerStartMode`. +#define PLAYER_GET_START_MODE(thisx) PARAMS_GET_S((thisx)->params, 8, 4) + +// Sets initial `bgCamIndex`, which determines camera behavior. +// The value is used to index a list of `BgCamInfo` contained within the scene's collision data. +// See `PLAYER_START_BG_CAM_DEFAULT` for what a value of -1 does. +#define PLAYER_GET_START_BG_CAM_INDEX(thisx) PARAMS_GET_S((thisx)->params, 0, 8) + +// A value of -1 for `startBgCamIndex` indicates that default behavior should be used. +// This means the `bgCamIndex` will be read from the current floor polygon. +#define PLAYER_START_BG_CAM_DEFAULT ((u8)-1) typedef enum PlayerStartMode { /* 0 */ PLAYER_START_MODE_NOTHING, // Update is empty and draw function is NULL, nothing occurs. Useful in cutscenes, for example. diff --git a/include/z64save.h b/include/z64save.h index d36a93cd14..90d1545daf 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -476,7 +476,18 @@ typedef enum LinkAge { * SaveContext.eventChkInf */ -#define EVENTCHKINF_02 0x02 +#define EVENTCHKINF_INDEX(flag) ((flag) >> 4) +#define EVENTCHKINF_MASK(flag) (1 << ((flag) & 0xF)) + +#define GET_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX(flag)] & EVENTCHKINF_MASK(flag)) +#define SET_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX(flag)] |= EVENTCHKINF_MASK(flag)) +#define CLEAR_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX(flag)] &= ~EVENTCHKINF_MASK(flag)) + +// EVENTCHKINF 0x00-0x0F +#define EVENTCHKINF_INDEX_0 0 +#define EVENTCHKINF_00_UNUSED 0x00 // flag is set in the debug save, but has no functionality +#define EVENTCHKINF_01_UNUSED 0x01 // flag is set in the debug save, but has no functionality +#define EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS 0x02 #define EVENTCHKINF_03 0x03 #define EVENTCHKINF_04 0x04 #define EVENTCHKINF_05 0x05 @@ -511,19 +522,17 @@ typedef enum LinkAge { #define EVENTCHKINF_30 0x30 #define EVENTCHKINF_31 0x31 #define EVENTCHKINF_32 0x32 -#define EVENTCHKINF_33 0x33 +#define EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA 0x33 #define EVENTCHKINF_37 0x37 #define EVENTCHKINF_38 0x38 #define EVENTCHKINF_39 0x39 -#define EVENTCHKINF_3A 0x3A +#define EVENTCHKINF_OPENED_JABU_JABU 0x3A #define EVENTCHKINF_3B 0x3B -#define EVENTCHKINF_3C 0x3C +#define EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE 0x3C -// 0x40 -#define EVENTCHKINF_40_INDEX 4 -#define EVENTCHKINF_40_SHIFT 0 -#define EVENTCHKINF_40_MASK (1 << EVENTCHKINF_40_SHIFT) -#define EVENTCHKINF_40 ((EVENTCHKINF_40_INDEX << 4) | EVENTCHKINF_40_SHIFT) +// EVENTCHKINF 0x40 +#define EVENTCHKINF_INDEX_40 EVENTCHKINF_INDEX(EVENTCHKINF_40) +#define EVENTCHKINF_40 0x40 #define EVENTCHKINF_41 0x41 #define EVENTCHKINF_42 0x42 @@ -532,11 +541,11 @@ typedef enum LinkAge { #define EVENTCHKINF_48 0x48 #define EVENTCHKINF_49 0x49 #define EVENTCHKINF_4A 0x4A -#define EVENTCHKINF_4B 0x4B +#define EVENTCHKINF_OPENED_DOOR_OF_TIME 0x4B #define EVENTCHKINF_4C 0x4C -#define EVENTCHKINF_4D 0x4D -#define EVENTCHKINF_4E 0x4E -#define EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS 0x4F // Cutscene in Temple of Time as adult after pulling the Master Sword for the first time +#define EVENTCHKINF_CREATED_RAINBOW_BRIDGE 0x4D +#define EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS 0x4E // set but unused +#define EVENTCHKINF_REVEALED_MASTER_SWORD 0x4F // Cutscene in Temple of Time when entering the Master Sword chamber for the first time #define EVENTCHKINF_50 0x50 #define EVENTCHKINF_51 0x51 #define EVENTCHKINF_52 0x52 @@ -547,48 +556,66 @@ typedef enum LinkAge { #define EVENTCHKINF_5B 0x5B #define EVENTCHKINF_5C 0x5C #define EVENTCHKINF_65 0x65 -#define EVENTCHKINF_67 0x67 +#define EVENTCHKINF_DRAINED_WELL 0x67 #define EVENTCHKINF_68 0x68 -#define EVENTCHKINF_69 0x69 +#define EVENTCHKINF_RESTORED_LAKE_HYLIA 0x69 #define EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO 0x6A -// 0x6B -#define EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_INDEX 6 -#define EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_SHIFT 11 -#define EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_MASK (1 << EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_SHIFT) -#define EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO ((EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_INDEX << 4) | EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_SHIFT) +// EVENTCHKINF 0x6B +#define EVENTCHKINF_INDEX_TALON_RETURNED_FROM_KAKARIKO EVENTCHKINF_INDEX(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO) +#define EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO 0x6B #define EVENTCHKINF_6E 0x6E #define EVENTCHKINF_6F 0x6F -#define EVENTCHKINF_70 0x70 -#define EVENTCHKINF_71 0x71 -#define EVENTCHKINF_72 0x72 -#define EVENTCHKINF_73 0x73 -#define EVENTCHKINF_74 0x74 -#define EVENTCHKINF_75 0x75 -#define EVENTCHKINF_76 0x76 -#define EVENTCHKINF_77 0x77 -#define EVENTCHKINF_78 0x78 +#define EVENTCHKINF_BEGAN_GOHMA_BATTLE 0x70 +#define EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE 0x71 +#define EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE 0x72 +#define EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE 0x73 +#define EVENTCHKINF_BEGAN_MORPHA_BATTLE 0x74 +#define EVENTCHKINF_BEGAN_TWINROVA_BATTLE 0x75 +#define EVENTCHKINF_BEGAN_BARINADE_BATTLE 0x76 +#define EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE 0x77 +#define EVENTCHKINF_BEGAN_GANONDORF_BATTLE 0x78 #define EVENTCHKINF_80 0x80 #define EVENTCHKINF_82 0x82 -#define EVENTCHKINF_8C 0x8C -#define EVENTCHKINF_8D 0x8D -#define EVENTCHKINF_8E 0x8E -#define EVENTCHKINF_8F 0x8F - -// 0x90-0x93 -// carpenters freed from the gerudo -#define EVENTCHKINF_CARPENTERS_FREE_INDEX 9 -#define EVENTCHKINF_CARPENTERS_FREE_SHIFT(n) (0 + (n)) -#define EVENTCHKINF_CARPENTERS_FREE_MASK(n) (1 << EVENTCHKINF_CARPENTERS_FREE_SHIFT(n)) -#define EVENTCHKINF_CARPENTERS_FREE(n) ((EVENTCHKINF_CARPENTERS_FREE_INDEX << 4) | EVENTCHKINF_CARPENTERS_FREE_SHIFT(n)) -#define EVENTCHKINF_CARPENTERS_FREE_MASK_ALL (\ - EVENTCHKINF_CARPENTERS_FREE_MASK(0) \ - | EVENTCHKINF_CARPENTERS_FREE_MASK(1) \ - | EVENTCHKINF_CARPENTERS_FREE_MASK(2) \ - | EVENTCHKINF_CARPENTERS_FREE_MASK(3) ) -#define GET_EVENTCHKINF_CARPENTERS_FREE_ALL() \ - CHECK_FLAG_ALL(gSaveContext.save.info.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX], EVENTCHKINF_CARPENTERS_FREE_MASK_ALL) +#define EVENTCHKINF_PAID_BACK_KEATON_MASK 0x8C +#define EVENTCHKINF_PAID_BACK_SKULL_MASK 0x8D +#define EVENTCHKINF_PAID_BACK_SPOOKY_MASK 0x8E +#define EVENTCHKINF_PAID_BACK_BUNNY_HOOD 0x8F + +// EVENTCHKINF 0x90-0x93 +// Carpenters rescued from Gerudo Fortress +#define EVENTCHKINF_INDEX_CARPENTERS_RESCUED 0x9 +#define EVENTCHKINF_CARPENTER_0_RESCUED 0x90 +#define EVENTCHKINF_CARPENTER_1_RESCUED 0x91 +#define EVENTCHKINF_CARPENTER_2_RESCUED 0x92 +#define EVENTCHKINF_CARPENTER_3_RESCUED 0x93 + +#define EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK \ + (EVENTCHKINF_MASK(EVENTCHKINF_CARPENTER_0_RESCUED) | EVENTCHKINF_MASK(EVENTCHKINF_CARPENTER_1_RESCUED) | \ + EVENTCHKINF_MASK(EVENTCHKINF_CARPENTER_2_RESCUED) | EVENTCHKINF_MASK(EVENTCHKINF_CARPENTER_3_RESCUED)) + +#define GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED() \ + CHECK_FLAG_ALL(gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED], \ + EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK) + +#define GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED2() \ + CHECK_FLAG_ALL(gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED] & \ + (EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK | 0xF0), \ + EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK) + +#define ENDAIKU_CARPENTER_RESCUED_MASK(carpenterType) (1 << (carpenterType)) + +#define ENDAIKU_IS_CARPENTER_RESCUED(carpenterType) \ + gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED] & \ + ENDAIKU_CARPENTER_RESCUED_MASK(carpenterType) + +#define ENDAIKU_SET_CARPENTER_RESCUED(carpenterType) \ + gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED] |= \ + ENDAIKU_CARPENTER_RESCUED_MASK((carpenterType)) + +#define GET_EVENTCHKINF_CARPENTERS_RESCUED_FLAGS() \ + gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED] & EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK #define EVENTCHKINF_94 0x94 #define EVENTCHKINF_95 0x95 @@ -632,48 +659,35 @@ typedef enum LinkAge { #define EVENTCHKINF_C8 0xC8 #define EVENTCHKINF_C9 0xC9 -// 0xD0-0xD6 -#define EVENTCHKINF_SONGS_FOR_FROGS_INDEX 13 -#define EVENTCHKINF_SONGS_FOR_FROGS_CHOIR_SHIFT 0 -#define EVENTCHKINF_SONGS_FOR_FROGS_ZL_SHIFT 1 -#define EVENTCHKINF_SONGS_FOR_FROGS_EPONA_SHIFT 2 -#define EVENTCHKINF_SONGS_FOR_FROGS_SUNS_SHIFT 3 -#define EVENTCHKINF_SONGS_FOR_FROGS_SARIA_SHIFT 4 -#define EVENTCHKINF_SONGS_FOR_FROGS_SOT_SHIFT 5 -#define EVENTCHKINF_SONGS_FOR_FROGS_STORMS_SHIFT 6 -#define EVENTCHKINF_SONGS_FOR_FROGS_CHOIR_MASK (1 << EVENTCHKINF_SONGS_FOR_FROGS_CHOIR_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_ZL_MASK (1 << EVENTCHKINF_SONGS_FOR_FROGS_ZL_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_EPONA_MASK (1 << EVENTCHKINF_SONGS_FOR_FROGS_EPONA_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_SUNS_MASK (1 << EVENTCHKINF_SONGS_FOR_FROGS_SUNS_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_SARIA_MASK (1 << EVENTCHKINF_SONGS_FOR_FROGS_SARIA_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_SOT_MASK (1 << EVENTCHKINF_SONGS_FOR_FROGS_SOT_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_STORMS_MASK (1 << EVENTCHKINF_SONGS_FOR_FROGS_STORMS_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_CHOIR ((EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) | EVENTCHKINF_SONGS_FOR_FROGS_CHOIR_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_ZL ((EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) | EVENTCHKINF_SONGS_FOR_FROGS_ZL_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_EPONA ((EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) | EVENTCHKINF_SONGS_FOR_FROGS_EPONA_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_SUNS ((EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) | EVENTCHKINF_SONGS_FOR_FROGS_SUNS_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_SARIA ((EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) | EVENTCHKINF_SONGS_FOR_FROGS_SARIA_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_SOT ((EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) | EVENTCHKINF_SONGS_FOR_FROGS_SOT_SHIFT) -#define EVENTCHKINF_SONGS_FOR_FROGS_STORMS ((EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) | EVENTCHKINF_SONGS_FOR_FROGS_STORMS_SHIFT) - -// 0xDA-0xDE -#define EVENTCHKINF_DA_DB_DC_DD_DE_INDEX 13 -#define EVENTCHKINF_DA_MASK (1 << 10) -#define EVENTCHKINF_DB_MASK (1 << 11) -#define EVENTCHKINF_DC_MASK (1 << 12) -#define EVENTCHKINF_DD_MASK (1 << 13) -#define EVENTCHKINF_DE_MASK (1 << 14) - - -#define GET_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[(flag) >> 4] & (1 << ((flag) & 0xF))) -#define SET_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[(flag) >> 4] |= (1 << ((flag) & 0xF))) -#define CLEAR_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[(flag) >> 4] &= ~(1 << ((flag) & 0xF))) +// EVENTCHKINF 0xD0-0xD6 +#define EVENTCHKINF_INDEX_SONGS_FOR_FROGS EVENTCHKINF_INDEX(EVENTCHKINF_SONGS_FOR_FROGS_CHOIR) +#define EVENTCHKINF_SONGS_FOR_FROGS_CHOIR 0xD0 +#define EVENTCHKINF_SONGS_FOR_FROGS_ZL 0xD1 +#define EVENTCHKINF_SONGS_FOR_FROGS_EPONA 0xD2 +#define EVENTCHKINF_SONGS_FOR_FROGS_SUNS 0xD3 +#define EVENTCHKINF_SONGS_FOR_FROGS_SARIA 0xD4 +#define EVENTCHKINF_SONGS_FOR_FROGS_SOT 0xD5 +#define EVENTCHKINF_SONGS_FOR_FROGS_STORMS 0xD6 + +// EVENTCHKINF 0xDA-0xDE +#define EVENTCHKINF_INDEX_SKULLTULA_REWARD 0xD +#define EVENTCHKINF_SKULLTULA_REWARD_10 0xDA +#define EVENTCHKINF_SKULLTULA_REWARD_20 0xDB +#define EVENTCHKINF_SKULLTULA_REWARD_30 0xDC +#define EVENTCHKINF_SKULLTULA_REWARD_40 0xDD +#define EVENTCHKINF_SKULLTULA_REWARD_50 0xDE /* * SaveContext.itemGetInf */ +#define ITEMGETINF_INDEX(flag) ((flag) >> 4) +#define ITEMGETINF_MASK(flag) (1 << ((flag) & 0xF)) + +#define GET_ITEMGETINF(flag) (gSaveContext.save.info.itemGetInf[ITEMGETINF_INDEX(flag)] & ITEMGETINF_MASK(flag)) +#define SET_ITEMGETINF(flag) (gSaveContext.save.info.itemGetInf[ITEMGETINF_INDEX(flag)] |= ITEMGETINF_MASK(flag)) + #define ITEMGETINF_TALON_BOTTLE 0x02 #define ITEMGETINF_03 0x03 #define ITEMGETINF_04 0x04 @@ -696,23 +710,20 @@ typedef enum LinkAge { #define ITEMGETINF_16 0x16 #define ITEMGETINF_17 0x17 -// 0x18-0x1A -#define ITEMGETINF_18_19_1A_INDEX 1 -#define ITEMGETINF_18_SHIFT 8 -#define ITEMGETINF_19_SHIFT 9 -#define ITEMGETINF_1A_SHIFT 10 -#define ITEMGETINF_18_MASK (1 << ITEMGETINF_18_SHIFT) -#define ITEMGETINF_19_MASK (1 << ITEMGETINF_19_SHIFT) -#define ITEMGETINF_1A_MASK (1 << ITEMGETINF_1A_SHIFT) -#define ITEMGETINF_18 ((ITEMGETINF_18_19_1A_INDEX << 4) | ITEMGETINF_18_SHIFT) -#define ITEMGETINF_19 ((ITEMGETINF_18_19_1A_INDEX << 4) | ITEMGETINF_19_SHIFT) -#define ITEMGETINF_1A ((ITEMGETINF_18_19_1A_INDEX << 4) | ITEMGETINF_1A_SHIFT) +// ITEMGETINF 0x18-0x1A +#define ITEMGETINF_INDEX_18_19_1A 1 +#define ITEMGETINF_18 0x18 +#define ITEMGETINF_19 0x19 +#define ITEMGETINF_1A 0x1A #define ITEMGETINF_1B 0x1B #define ITEMGETINF_1C 0x1C #define ITEMGETINF_1D 0x1D -#define ITEMGETINF_1E 0x1E -#define ITEMGETINF_1F 0x1F +#define ITEMGETINF_FOREST_STAGE_STICK_UPGRADE 0x1E +// This flag is shared by two events; It is set when obtaining the Deku Nut upgrade at the Forest Stage and when obtaining Poachers Saw. +// This will make obtaining the Deku Nut upgrade impossible if Poachers Saw is obtained first. +// This flag is never read for the Poachers Saw event, so the overlap only causes an issue for the Deku Nut Upgrade. It will not prevent obtaining Poachers Saw. +#define ITEMGETINF_FOREST_STAGE_NUT_UPGRADE 0x1F #define ITEMGETINF_23 0x23 #define ITEMGETINF_24 0x24 #define ITEMGETINF_25 0x25 @@ -729,14 +740,19 @@ typedef enum LinkAge { #define ITEMGETINF_3F 0x3F -#define GET_ITEMGETINF(flag) (gSaveContext.save.info.itemGetInf[(flag) >> 4] & (1 << ((flag) & 0xF))) -#define SET_ITEMGETINF(flag) (gSaveContext.save.info.itemGetInf[(flag) >> 4] |= (1 << ((flag) & 0xF))) - - /* * SaveContext.infTable */ +#define INFTABLE_INDEX(flag) ((flag) >> 4) +#define INFTABLE_MASK(flag) (1 << ((flag) & 0xF)) + +#define GET_INFTABLE(flag) (gSaveContext.save.info.infTable[INFTABLE_INDEX(flag)] & INFTABLE_MASK(flag)) +#define SET_INFTABLE(flag) (gSaveContext.save.info.infTable[INFTABLE_INDEX(flag)] |= INFTABLE_MASK(flag)) +#define CLEAR_INFTABLE(flag) (gSaveContext.save.info.infTable[INFTABLE_INDEX(flag)] &= ~INFTABLE_MASK(flag)) + +// INFTABLE 0x0-0xF +#define INFTABLE_INDEX_0 0 #define INFTABLE_00 0x00 #define INFTABLE_01 0x01 #define INFTABLE_03 0x03 @@ -864,18 +880,18 @@ typedef enum LinkAge { #define INFTABLE_197 0x197 #define INFTABLE_198 0x198 -// 0x199-0x19F -#define INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX 25 -#define INFTABLE_199_MASK (1 << 9) -#define INFTABLE_19A_MASK (1 << 10) -#define INFTABLE_19B_MASK (1 << 11) -#define INFTABLE_19C_MASK (1 << 12) -#define INFTABLE_19D_MASK (1 << 13) -#define INFTABLE_19E_MASK (1 << 14) -#define INFTABLE_19F_MASK (1 << 15) - -// 0x1A0-0x1AF -#define INFTABLE_1AX_INDEX 26 +// INFTABLE 0x199-0x19F +#define INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F 25 +#define INFTABLE_199 0x199 +#define INFTABLE_19A 0x19A +#define INFTABLE_19B 0x19B +#define INFTABLE_19C 0x19C +#define INFTABLE_19D 0x19D +#define INFTABLE_19E 0x19E +#define INFTABLE_19F 0x19F + +// INFTABLE 0x1A0-0x1AF +#define INFTABLE_INDEX_1AX 26 #define INFTABLE_1A0_SHIFT 0 #define INFTABLE_1A1_SHIFT 1 #define INFTABLE_1A2_SHIFT 2 @@ -889,80 +905,78 @@ typedef enum LinkAge { #define INFTABLE_1AB_SHIFT 11 #define INFTABLE_1AD_SHIFT 13 -// 0x1D0-0x1DF -#define INFTABLE_1DX_INDEX 29 - - -#define GET_INFTABLE(flag) (gSaveContext.save.info.infTable[(flag) >> 4] & (1 << ((flag) & 0xF))) -#define SET_INFTABLE(flag) (gSaveContext.save.info.infTable[(flag) >> 4] |= (1 << ((flag) & 0xF))) -#define CLEAR_INFTABLE(flag) (gSaveContext.save.info.infTable[(flag) >> 4] &= ~(1 << ((flag) & 0xF))) +// INFTABLE 0x1D0-0x1DF +#define INFTABLE_INDEX_1DX INFTABLE_INDEX(INFTABLE_1D0) +#define INFTABLE_1D0 0x1D0 /* * SaveContext.eventInf */ -// 0x00-0x0F -// horses related -#define EVENTINF_HORSES_INDEX 0 -#define EVENTINF_HORSES_STATE_SHIFT 0 -#define EVENTINF_HORSES_HORSETYPE_SHIFT 4 -#define EVENTINF_HORSES_05_SHIFT 5 -#define EVENTINF_HORSES_06_SHIFT 6 -#define EVENTINF_HORSES_08_SHIFT 8 -#define EVENTINF_HORSES_0A_SHIFT 10 -#define EVENTINF_HORSES_0F_SHIFT 15 // unused? -#define EVENTINF_HORSES_STATE_MASK (0xF << EVENTINF_HORSES_STATE_SHIFT) -#define EVENTINF_HORSES_HORSETYPE_MASK (1 << EVENTINF_HORSES_HORSETYPE_SHIFT) -#define EVENTINF_HORSES_05_MASK (1 << EVENTINF_HORSES_05_SHIFT) -#define EVENTINF_HORSES_06_MASK (1 << EVENTINF_HORSES_06_SHIFT) -#define EVENTINF_HORSES_0F_MASK (1 << EVENTINF_HORSES_0F_SHIFT) -#define EVENTINF_HORSES_05 ((EVENTINF_HORSES_INDEX << 4) | EVENTINF_HORSES_05_SHIFT) -#define EVENTINF_HORSES_06 ((EVENTINF_HORSES_INDEX << 4) | EVENTINF_HORSES_06_SHIFT) +#define EVENTINF_INDEX(flag) ((flag) >> 4) +#define EVENTINF_MASK(flag) (1 << ((flag) & 0xF)) + +#define GET_EVENTINF(flag) (gSaveContext.eventInf[EVENTINF_INDEX(flag)] & EVENTINF_MASK(flag)) +#define SET_EVENTINF(flag) (gSaveContext.eventInf[EVENTINF_INDEX(flag)] |= EVENTINF_MASK(flag)) +#define CLEAR_EVENTINF(flag) (gSaveContext.eventInf[EVENTINF_INDEX(flag)] &= ~EVENTINF_MASK(flag)) + +// EVENTINF 0x00-0x0F +// Ingo Race, Lon Lon Ranch minigames, and Horseback Archery minigame flags +#define EVENTINF_INDEX_HORSES 0 +// EVENTINF 0x00-0x03 reserved for IngoRaceState +#define EVENTINF_INGO_RACE_STATE_MASK (0xF << 0x00) +typedef enum IngoRaceState { + /* 0 */ INGO_RACE_STATE_OFFER_RENTAL, + /* 1 */ INGO_RACE_STATE_HORSE_RENTAL_PERIOD, + /* 2 */ INGO_RACE_STATE_RACING, + /* 3 */ INGO_RACE_STATE_PLAYER_LOSE, + /* 4 */ INGO_RACE_STATE_FIRST_WIN, + /* 5 */ INGO_RACE_STATE_TRAPPED_WIN_UNUSED, + /* 6 */ INGO_RACE_STATE_TRAPPED_WIN_EPONA, // Ingo Traps you in Lon Lon + /* 7 */ INGO_RACE_STATE_REMATCH +} IngoRaceState; + +#define EVENTINF_INGO_RACE_HORSETYPE 0x04 +#define EVENTINF_INGO_RACE_LOST_ONCE 0x05 +#define EVENTINF_INGO_RACE_SECOND_RACE 0x06 // Used in z_en_ta (Talon) to store Cucco game winning status // and in z_en_ge1 (Gerudo) to store archery in-progress status -#define EVENTINF_HORSES_08 ((EVENTINF_HORSES_INDEX << 4) | EVENTINF_HORSES_08_SHIFT) +#define EVENTINF_HORSES_08 0x08 #define EVENTINF_CUCCO_GAME_WON EVENTINF_HORSES_08 // Used in z_en_ta (Talon) and z_en_ma3 (Malon) to store minigame finishing status -#define EVENTINF_HORSES_0A ((EVENTINF_HORSES_INDEX << 4) | EVENTINF_HORSES_0A_SHIFT) +#define EVENTINF_HORSES_0A 0x0A #define EVENTINF_CUCCO_GAME_FINISHED EVENTINF_HORSES_0A - -typedef enum EventInfHorsesState { - /* 0 */ EVENTINF_HORSES_STATE_0, - /* 1 */ EVENTINF_HORSES_STATE_1, - /* 2 */ EVENTINF_HORSES_STATE_2, - /* 3 */ EVENTINF_HORSES_STATE_3, - /* 4 */ EVENTINF_HORSES_STATE_4, - /* 5 */ EVENTINF_HORSES_STATE_5, - /* 6 */ EVENTINF_HORSES_STATE_6, - /* 7 */ EVENTINF_HORSES_STATE_7 -} EventInfHorsesState; +#define EVENTINF_INGO_RACE_0F 0x0F // unused? // "InRaceSeq" -#define GET_EVENTINF_HORSES_STATE() \ - ((gSaveContext.eventInf[EVENTINF_HORSES_INDEX] & EVENTINF_HORSES_STATE_MASK) >> EVENTINF_HORSES_STATE_SHIFT) -#define SET_EVENTINF_HORSES_STATE(v) \ - gSaveContext.eventInf[EVENTINF_HORSES_INDEX] = \ - (gSaveContext.eventInf[EVENTINF_HORSES_INDEX] & ~EVENTINF_HORSES_STATE_MASK) | \ - ((v) << EVENTINF_HORSES_STATE_SHIFT) +#define GET_EVENTINF_INGO_RACE_STATE() (gSaveContext.eventInf[EVENTINF_INDEX_HORSES] & EVENTINF_INGO_RACE_STATE_MASK) -#define GET_EVENTINF_HORSES_HORSETYPE() \ - ((gSaveContext.eventInf[EVENTINF_HORSES_INDEX] & EVENTINF_HORSES_HORSETYPE_MASK) >> EVENTINF_HORSES_HORSETYPE_SHIFT) -#define SET_EVENTINF_HORSES_HORSETYPE(v) \ - gSaveContext.eventInf[EVENTINF_HORSES_INDEX] = \ - (gSaveContext.eventInf[EVENTINF_HORSES_INDEX] & ~EVENTINF_HORSES_HORSETYPE_MASK) | \ - ((v) << EVENTINF_HORSES_HORSETYPE_SHIFT) +#define SET_EVENTINF_INGO_RACE_STATE(v) \ + gSaveContext.eventInf[EVENTINF_INDEX_HORSES] = \ + (gSaveContext.eventInf[EVENTINF_INDEX_HORSES] & ~EVENTINF_INGO_RACE_STATE_MASK) | (v) -#define SET_EVENTINF_HORSES_0F(v) \ - gSaveContext.eventInf[EVENTINF_HORSES_INDEX] = \ - (gSaveContext.eventInf[EVENTINF_HORSES_INDEX] & ~EVENTINF_HORSES_0F_MASK) | ((v) << EVENTINF_HORSES_0F_SHIFT) +#define GET_EVENTINF_INGO_RACE_FLAG(flag) \ + ((gSaveContext.eventInf[EVENTINF_INDEX_HORSES] & EVENTINF_MASK(flag)) >> ((flag) & 0xF)) +#define SET_EVENTINF_INGO_RACE_FLAG(flag) \ + gSaveContext.eventInf[EVENTINF_INDEX_HORSES] = \ + (gSaveContext.eventInf[EVENTINF_INDEX_HORSES] & 0xFFFF) | EVENTINF_MASK(flag) + +#define WRITE_EVENTINF_INGO_RACE_FLAG(flag, v) \ + gSaveContext.eventInf[EVENTINF_INDEX_HORSES] = \ + (gSaveContext.eventInf[EVENTINF_INDEX_HORSES] & ~EVENTINF_MASK(flag)) | ((v) << ((flag) & 0xF)) + +#define GET_EVENTINF_INGO_RACE_HORSETYPE() GET_EVENTINF_INGO_RACE_FLAG(EVENTINF_INGO_RACE_HORSETYPE) +#define WRITE_EVENTINF_INGO_RACE_HORSETYPE(v) WRITE_EVENTINF_INGO_RACE_FLAG(EVENTINF_INGO_RACE_HORSETYPE, v) + +#define WRITE_EVENTINF_INGO_RACE_0F(v) WRITE_EVENTINF_INGO_RACE_FLAG(EVENTINF_INGO_RACE_0F, v) // Is the running man race active #define EVENTINF_MARATHON_ACTIVE 0x10 -// 0x20-0x24 -#define EVENTINF_20_21_22_23_24_INDEX 2 +// EVENTINF 0x20-0x24 +#define EVENTINF_INDEX_20_21_22_23_24 2 #define EVENTINF_20_MASK (1 << 0) #define EVENTINF_21_MASK (1 << 1) #define EVENTINF_22_MASK (1 << 2) @@ -972,11 +986,6 @@ typedef enum EventInfHorsesState { #define EVENTINF_30 0x30 -#define GET_EVENTINF(flag) (gSaveContext.eventInf[(flag) >> 4] & (1 << ((flag) & 0xF))) -#define SET_EVENTINF(flag) (gSaveContext.eventInf[(flag) >> 4] |= (1 << ((flag) & 0xF))) -#define CLEAR_EVENTINF(flag) (gSaveContext.eventInf[(flag) >> 4] &= ~(1 << ((flag) & 0xF))) - - extern SaveContext gSaveContext; #endif diff --git a/linker_scripts/makerom.ld b/linker_scripts/makerom.ld new file mode 100644 index 0000000000..a898c6b34f --- /dev/null +++ b/linker_scripts/makerom.ld @@ -0,0 +1,13 @@ +#include "boot.h" + +/* These are only here due to iQue entry.s using ori to load the lower halves of symbols + * rather than addiu, so the usual relocation operators %hi() and %lo() can't be used. */ + +_bootSegmentBssStart_HI = _bootSegmentBssStart >> 16; + +_bootSegmentBssSize_HI = _bootSegmentBssSize >> 16; + +bootproc_HI = bootproc >> 16; + +BOOT_STACK_TOP = (sBootThreadStack + BOOT_STACK_SIZE); +BOOT_STACK_TOP_HI = BOOT_STACK_TOP >> 16; diff --git a/linker_scripts/soundfont.ld b/linker_scripts/soundfont.ld index d914a7de31..c480e36867 100644 --- a/linker_scripts/soundfont.ld +++ b/linker_scripts/soundfont.ld @@ -4,14 +4,15 @@ OUTPUT_ARCH (mips) SECTIONS { - .rodata : + .rodata ALIGN(16) : { *(.data*) *(.rodata*) . = ALIGN(16); - __LEN__ = . - ADDR(.rodata); } + __LEN__ = ABSOLUTE(SIZEOF(.rodata)); + /DISCARD/ : { *(*); diff --git a/mod_assets/scenes/example/example_scene_cs_0.c b/mod_assets/scenes/example/example_scene_cs_0.c index 3f09e7549d..9ddaf16d1f 100644 --- a/mod_assets/scenes/example/example_scene_cs_0.c +++ b/mod_assets/scenes/example/example_scene_cs_0.c @@ -4,7 +4,7 @@ CutsceneData gExampleCS[] = { - CS_BEGIN_CUTSCENE(23, 308), + CS_HEADER(23, 308), // CS_DESTINATION(CS_DEST_KOKIRI_FOREST_FARORE, 99, 0), CS_TEXT_LIST(2), CS_TEXT(0x1234, 0, 0, CS_TEXT_CHOICE, 0x0001, 0x0002), @@ -117,6 +117,6 @@ CutsceneData gExampleCS[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0, 30, 60.0f, 0, 42, 502, 0), CS_CAM_POINT(CS_CAM_CONTINUE, 0, 30, 60.0f, 0, 41, 502, 0), CS_CAM_POINT(CS_CAM_STOP, 0, 0, 0.0f, 0, 0, 0, 0), - CS_END(), + CS_END_OF_SCRIPT(), }; diff --git a/requirements.txt b/requirements.txt index 806233c045..e510f0d935 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Setup and compression -crunch64>=0.3.1,<1.0.0 +crunch64>=0.5.1,<1.0.0 ipl3checksum>=1.2.0,<2.0.0 pyyaml>=6.0.1,<7.0.0 diff --git a/spec b/spec index 8575e33809..4d57f16563 100644 --- a/spec +++ b/spec @@ -590,8 +590,8 @@ beginseg include "$(BUILD_DIR)/src/code/z_actor.o" include "$(BUILD_DIR)/src/code/z_actor_dlftbls.o" include "$(BUILD_DIR)/src/code/z_bgcheck.o" - include "$(BUILD_DIR)/src/code/code_800430A0.o" - include "$(BUILD_DIR)/src/code/code_80043480.o" + include "$(BUILD_DIR)/src/code/z_bg_collect.o" + include "$(BUILD_DIR)/src/code/z_bg_item.o" include "$(BUILD_DIR)/src/code/z_camera.o" include "$(BUILD_DIR)/src/code/z_collision_btltbls.o" include "$(BUILD_DIR)/src/code/z_collision_check.o" @@ -599,12 +599,12 @@ beginseg include "$(BUILD_DIR)/src/code/z_debug.o" include "$(BUILD_DIR)/src/code/z_debug_display.o" include "$(BUILD_DIR)/src/code/z_demo.o" - include "$(BUILD_DIR)/src/code/code_80069420.o" + include "$(BUILD_DIR)/src/code/z_memory_utils.o" include "$(BUILD_DIR)/src/code/z_draw.o" include "$(BUILD_DIR)/src/code/z_sfx_source.o" include "$(BUILD_DIR)/src/code/z_elf_message.o" include "$(BUILD_DIR)/src/code/z_face_reaction.o" - include "$(BUILD_DIR)/src/code/code_8006C3A0.o" + include "$(BUILD_DIR)/src/code/z_env_flags.o" include "$(BUILD_DIR)/src/code/z_fcurve_data.o" include "$(BUILD_DIR)/src/code/z_fcurve_data_skelanime.o" include "$(BUILD_DIR)/src/code/z_game_dlftbls.o" @@ -638,7 +638,7 @@ beginseg include "$(BUILD_DIR)/src/code/z_rcp.o" include "$(BUILD_DIR)/src/code/z_room.o" include "$(BUILD_DIR)/src/code/z_sample.o" - include "$(BUILD_DIR)/src/code/code_80097A00.o" + include "$(BUILD_DIR)/src/code/z_inventory.o" include "$(BUILD_DIR)/src/code/z_scene.o" include "$(BUILD_DIR)/src/code/object_table.o" include "$(BUILD_DIR)/src/code/z_scene_table.o" @@ -670,7 +670,7 @@ beginseg #if IS_CAMERA_DEBUG_ENABLED include "$(BUILD_DIR)/src/code/db_camera.o" #endif - include "$(BUILD_DIR)/src/code/code_800BB0A0.o" + include "$(BUILD_DIR)/src/code/z_cutscene_spline.o" #if ENABLE_MEMPAK include "$(BUILD_DIR)/src/code/mempak.o" #endif @@ -701,7 +701,10 @@ beginseg include "$(BUILD_DIR)/src/code/sys_matrix.o" include "$(BUILD_DIR)/src/code/sys_ucode.o" include "$(BUILD_DIR)/src/code/sys_rumble.o" - include "$(BUILD_DIR)/src/code/code_800D31A0.o" + include "$(BUILD_DIR)/src/code/sys_freeze.o" +#if DEBUG_FEATURES + include "$(BUILD_DIR)/src/code/sys_debug_controller.o" +#endif include "$(BUILD_DIR)/src/code/irqmgr.o" #if PLATFORM_N64 include "$(BUILD_DIR)/src/code/code_n64dd_800AD410.o" @@ -747,6 +750,7 @@ beginseg include "$(BUILD_DIR)/src/audio/sequence.o" include "$(BUILD_DIR)/src/audio/data.o" include "$(BUILD_DIR)/src/audio/session_config.o" + include "$(BUILD_DIR)/src/audio/session_init.o" #if PLATFORM_N64 include "$(BUILD_DIR)/src/libu64/gfxprint.o" include "$(BUILD_DIR)/src/libu64/rcp_utils.o" @@ -757,7 +761,7 @@ beginseg include "$(BUILD_DIR)/src/libu64/mtxuty-cvt.o" #endif include "$(BUILD_DIR)/src/libu64/pad.o" - include "$(BUILD_DIR)/src/libu64/code_800FC620.o" + include "$(BUILD_DIR)/src/libu64/system_heap.o" include "$(BUILD_DIR)/src/libu64/padsetup.o" #else include "$(BUILD_DIR)/src/libu64/logseverity_gc.o" @@ -769,7 +773,7 @@ beginseg #endif include "$(BUILD_DIR)/src/libu64/relocation_gc.o" include "$(BUILD_DIR)/src/libu64/load_gc.o" - include "$(BUILD_DIR)/src/libu64/code_800FC620.o" + include "$(BUILD_DIR)/src/libu64/system_heap.o" include "$(BUILD_DIR)/src/libu64/pad.o" include "$(BUILD_DIR)/src/libu64/padsetup.o" #endif @@ -899,7 +903,7 @@ beginseg include "$(BUILD_DIR)/src/libultra/mgu/translate.o" #endif include "$(BUILD_DIR)/src/libultra/io/contramwrite.o" -#if OOT_VERSION == NTSC_1_2 || (PLATFORM_GC && !DEBUG_FEATURES) +#if OOT_VERSION >= PAL_1_0 && !(OOT_PAL_N64 || DEBUG_FEATURES) include "$(BUILD_DIR)/src/libultra/io/vimodefpallan1.o" #endif #if !DEBUG_FEATURES diff --git a/src/audio/general.c b/src/audio/general.c index a95ec453f4..1c0f000dad 100644 --- a/src/audio/general.c +++ b/src/audio/general.c @@ -6,6 +6,8 @@ #define AUDIO_PRINTF osSyncPrintf #elif IDO_PRINTF_WORKAROUND #define AUDIO_PRINTF(args) (void)0 +#elif defined(__GNUC__) && __GNUC__ < 3 +#define AUDIO_PRINTF(format, args...) (void)0 #else #define AUDIO_PRINTF(format, ...) (void)0 #endif @@ -1189,7 +1191,7 @@ u8 D_8016B9F3; u8 sFanfareStartTimer; u16 sFanfareSeqId; -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) u16 sPrevAmbienceSeqId; #endif @@ -1707,7 +1709,7 @@ void AudioOcarina_PlayControllerInput(u8 unused) { } else { // no bending or vibrato for recording state OCARINA_RECORD_SCARECROW_SPAWN sCurOcarinaBendIndex = 0; -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) sCurOcarinaVibrato = 0; #endif sCurOcarinaBendFreq = 1.0f; // No bend @@ -1854,7 +1856,7 @@ void AudioOcarina_PlaybackSong(void) { } // Update vibrato -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 if (sNotePlaybackVibrato != sPlaybackSong[sPlaybackNotePos].vibrato) { sNotePlaybackVibrato = sPlaybackSong[sPlaybackNotePos].vibrato; // Sets vibrato to io port 6 @@ -2145,7 +2147,7 @@ void AudioOcarina_RecordSong(void) { } else if (sRecordOcarinaVolume != sCurOcarinaVolume) { noteChanged = true; } else if (sRecordOcarinaVibrato != sCurOcarinaVibrato) { -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (sRecordingState != OCARINA_RECORD_SCARECROW_SPAWN) { noteChanged = true; } @@ -2153,7 +2155,7 @@ void AudioOcarina_RecordSong(void) { noteChanged = true; #endif } else if (sRecordOcarinaBendIndex != sCurOcarinaBendIndex) { -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (sRecordingState != OCARINA_RECORD_SCARECROW_SPAWN) { noteChanged = true; } @@ -2494,7 +2496,7 @@ f32 Audio_ComputeSfxFreqScale(u8 bankId, u8 entryIdx) { switch (bankId) { case BANK_VOICE: -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (((entry->sfxId & 0xFF) < 0x40) && (sAudioBaseFilter2 != 0)) { phi_v0 = true; } else if (((entry->sfxId & 0xFF) >= 0x40) && (sAudioExtraFilter2 != 0)) { @@ -2615,7 +2617,7 @@ void Audio_SetSfxProperties(u8 bankId, u8 entryIdx, u8 channelIndex) { f32 behindScreenZ; u8 baseFilter = 0; SfxBankEntry* entry = &gSfxBanks[bankId][entryIdx]; -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) s32 pad; #endif @@ -2656,7 +2658,7 @@ void Audio_SetSfxProperties(u8 bankId, u8 entryIdx, u8 channelIndex) { } } if (sAudioBaseFilter != 0) { -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if ((bankId == BANK_PLAYER) || (bankId == BANK_ITEM) || ((bankId == BANK_VOICE) && ((entry->sfxId & 0xFF) < 0x40))) #else @@ -3240,7 +3242,7 @@ void Audio_PlaySceneSequence(u16 seqId) { AUDIOCMD_GLOBAL_STOP_AUDIOCMDS(); } -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (Audio_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) != NA_BGM_DISABLED) { Audio_StopSequence(SEQ_PLAYER_BGM_MAIN, 0); AUDIOCMD_GLOBAL_STOP_AUDIOCMDS(); @@ -3384,7 +3386,7 @@ void func_800F5B58(void) { if (sPrevMainBgmSeqId == NA_BGM_DISABLED) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0); } else { -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (sPrevMainBgmSeqId == NA_BGM_NATURE_AMBIENCE) { sPrevMainBgmSeqId = sPrevAmbienceSeqId; } @@ -3520,7 +3522,7 @@ void Audio_SetSequenceMode(u8 seqMode) { volumeFadeInTimer); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_SUB, 10, 8, NA_BGM_ENEMY); -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 if (seqId != NA_BGM_NATURE_AMBIENCE) #else if (seqId > NA_BGM_NATURE_AMBIENCE) @@ -3545,7 +3547,7 @@ void Audio_SetSequenceMode(u8 seqMode) { sPrevSeqMode = seqMode + 0x80; } else { -#if OOT_VERSION < NTSC_1_1 || PLATFORM_GC +#if OOT_VERSION < NTSC_1_1 || !PLATFORM_N64 // Empty #elif OOT_VERSION < PAL_1_0 if ((seqMode == SEQ_MODE_ENEMY) && (seqId != NA_BGM_FIELD_LOGIC) && @@ -3601,7 +3603,7 @@ void Audio_SetBgmEnemyVolume(f32 dist) { sAudioEnemyVol = ((350.0f - adjDist) * 127.0f) / 350.0f; Audio_SetVolumeScale(SEQ_PLAYER_BGM_SUB, VOL_SCALE_INDEX_BGM_SUB, sAudioEnemyVol, 10); -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 if (gActiveSeqs[SEQ_PLAYER_BGM_MAIN].seqId != NA_BGM_NATURE_AMBIENCE) #else if (gActiveSeqs[SEQ_PLAYER_BGM_MAIN].seqId > NA_BGM_NATURE_AMBIENCE) @@ -3611,7 +3613,7 @@ void Audio_SetBgmEnemyVolume(f32 dist) { } } -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 if (gActiveSeqs[SEQ_PLAYER_BGM_MAIN].seqId != NA_BGM_NATURE_AMBIENCE) #else if (gActiveSeqs[SEQ_PLAYER_BGM_MAIN].seqId > NA_BGM_NATURE_AMBIENCE) @@ -3929,7 +3931,7 @@ void func_800F6C34(void) { sFanfareStartTimer = 0; D_8016B9F3 = 1; sMalonSingingDisabled = false; -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) sPrevAmbienceSeqId = NA_BGM_DISABLED; #endif } @@ -3990,7 +3992,7 @@ void Audio_StartNatureAmbienceSequence(u16 playerIO, u16 channelMask) { } #endif -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if ((Audio_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) != NA_BGM_DISABLED) && (Audio_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) != NA_BGM_NATURE_AMBIENCE)) { Audio_StopSequence(SEQ_PLAYER_BGM_MAIN, 0); @@ -4024,7 +4026,7 @@ void Audio_PlayNatureAmbienceSequence(u8 natureAmbienceId) { if ((gActiveSeqs[SEQ_PLAYER_BGM_MAIN].seqId == NA_BGM_DISABLED) || !(sSeqFlags[gActiveSeqs[SEQ_PLAYER_BGM_MAIN].seqId & 0xFF & 0xFF] & SEQ_FLAG_NO_AMBIENCE)) { -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (gActiveSeqs[SEQ_PLAYER_BGM_MAIN].seqId != NA_BGM_NATURE_AMBIENCE) { sPrevAmbienceSeqId = gActiveSeqs[SEQ_PLAYER_BGM_MAIN].seqId; } diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c index 3e66c79329..0aa3324d73 100644 --- a/src/audio/lib/load.c +++ b/src/audio/lib/load.c @@ -1250,8 +1250,7 @@ void AudioLoad_Init(void* heap, u32 heapSize) { ramAddr = AudioHeap_Alloc(&gAudioCtx.initPool, gAudioHeapInitSizes.permanentPoolSize); if (ramAddr == NULL) { - // cast away const from gAudioHeapInitSizes - *((u32*)&gAudioHeapInitSizes.permanentPoolSize) = 0; + gAudioHeapInitSizes.permanentPoolSize = 0; } AudioHeap_InitPool(&gAudioCtx.permanentPool, ramAddr, gAudioHeapInitSizes.permanentPoolSize); diff --git a/src/audio/lib/seqplayer.c b/src/audio/lib/seqplayer.c index 71132797e2..a7091b24b3 100644 --- a/src/audio/lib/seqplayer.c +++ b/src/audio/lib/seqplayer.c @@ -437,7 +437,7 @@ void AudioSeq_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer) { void AudioSeq_SequencePlayerDisable(SequencePlayer* seqPlayer) { s32 finished = 0; -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (seqPlayer->finished == 1) { finished = 1; } @@ -457,7 +457,7 @@ void AudioSeq_SequencePlayerDisable(SequencePlayer* seqPlayer) { } if (AudioLoad_IsFontLoadComplete(seqPlayer->defaultFont)) { -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (finished == 1) { AudioHeap_ReleaseNotesForFont(seqPlayer->defaultFont); } diff --git a/src/audio/lib/synthesis.c b/src/audio/lib/synthesis.c index d19ed4ae5f..85fb8d2610 100644 --- a/src/audio/lib/synthesis.c +++ b/src/audio/lib/synthesis.c @@ -644,7 +644,7 @@ Acmd* AudioSynth_DoOneAudioUpdate(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updat // Leak reverb between the left and right channels -#if OOT_VERSION < NTSC_1_1 || PLATFORM_GC +#if OOT_VERSION < NTSC_1_1 || !PLATFORM_N64 if ((reverb->leakRtl != 0) || (reverb->leakLtr != 0)) #else if (((reverb->leakRtl != 0) || (reverb->leakLtr != 0)) && (gAudioCtx.soundMode != SOUNDMODE_MONO)) @@ -785,7 +785,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS samplesLenFixedPoint = (resamplingRateFixedPoint * aiBufLen * 2) + synthState->samplePosFrac; numSamplesToLoad = samplesLenFixedPoint >> 16; -#if !(OOT_VERSION < NTSC_1_1 || PLATFORM_GC) +#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64) if (numSamplesToLoad == 0) { skipBytes = false; } diff --git a/src/audio/lib/thread.c b/src/audio/lib/thread.c index c074f596a1..f47dbade7e 100644 --- a/src/audio/lib/thread.c +++ b/src/audio/lib/thread.c @@ -17,7 +17,7 @@ AudioTask* AudioThread_Update(void) { return AudioThread_UpdateImpl(); } -#if !(OOT_VERSION < PAL_1_0 || PLATFORM_GC) +#if !(OOT_VERSION < PAL_1_0 || !PLATFORM_N64) static s32 sMaxAbiCmdCnt = 0x80; static AudioTask* sWaitingAudioTask = NULL; #endif @@ -26,7 +26,7 @@ static AudioTask* sWaitingAudioTask = NULL; * This is Audio_Update for the audio thread */ AudioTask* AudioThread_UpdateImpl(void) { -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 static s32 sMaxAbiCmdCnt = 0x80; static AudioTask* sWaitingAudioTask = NULL; #endif diff --git a/src/audio/session_config.c b/src/audio/session_config.c index 8c2824eee4..a531d6c27b 100644 --- a/src/audio/session_config.c +++ b/src/audio/session_config.c @@ -4,32 +4,6 @@ AudioContext gAudioCtx; AudioCustomUpdateFunction gAudioCustomUpdateFunction; s32 D_801755D8[3]; // unused -const TempoData gTempoData = { - 0x1C00, // unk_00 - SEQTICKS_PER_BEAT, // seqTicksPerBeat -}; - -// TODO: Extract from table? -#define NUM_SOUNDFONTS 38 -#define SFX_SEQ_SIZE 0x6A90 -#define SFX_SOUNDFONT_1_SIZE 0x3AA0 -#define SFX_SOUNDFONT_2_SIZE 0x17B0 - -// Sizes of everything on the init pool -#define AI_BUFFERS_SIZE (AIBUF_SIZE * ARRAY_COUNT(gAudioCtx.aiBuffers)) -#define SOUNDFONT_LIST_SIZE (NUM_SOUNDFONTS * sizeof(SoundFont)) -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC -#define PERMANENT_POOL_SIZE (SFX_SEQ_SIZE + SFX_SOUNDFONT_1_SIZE + SFX_SOUNDFONT_2_SIZE) -#else -#define PERMANENT_POOL_SIZE (SFX_SEQ_SIZE + SFX_SOUNDFONT_1_SIZE + SFX_SOUNDFONT_2_SIZE + 0x10) -#endif - -const AudioHeapInitSizes gAudioHeapInitSizes = { - ALIGN16(sizeof(gAudioHeap) - 0x100), // audio heap size - ALIGN16(PERMANENT_POOL_SIZE + AI_BUFFERS_SIZE + SOUNDFONT_LIST_SIZE), // init pool size - ALIGN16(PERMANENT_POOL_SIZE), // permanent pool size -}; - #define DEFAULT_REVERB_SETTINGS \ { 1, 0x30, 0x3000, 0, 0, 0x7FFF, 0x0000, 0x0000, 0xFF, 0x3000, 0x0, 0x0 } diff --git a/src/audio/session_init.c b/src/audio/session_init.c new file mode 100644 index 0000000000..a6e67f40d4 --- /dev/null +++ b/src/audio/session_init.c @@ -0,0 +1,26 @@ +#include "global.h" +#include "assets/audio/sequence_sizes.h" +#include "assets/audio/soundfont_sizes.h" + +#define SFX_SEQ_SIZE Sequence_0_SIZE +#define SFX_SOUNDFONTS_SIZE (Soundfont_0_SIZE + Soundfont_1_SIZE) + +TempoData gTempoData = { + 0x1C00, // unk_00 + SEQTICKS_PER_BEAT, // seqTicksPerBeat +}; + +// Sizes of everything on the init pool +#define AI_BUFFERS_SIZE (AIBUF_SIZE * ARRAY_COUNT(gAudioCtx.aiBuffers)) +#define SOUNDFONT_LIST_SIZE (NUM_SOUNDFONTS * sizeof(SoundFont)) +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 +#define PERMANENT_POOL_SIZE (SFX_SEQ_SIZE + SFX_SOUNDFONTS_SIZE) +#else +#define PERMANENT_POOL_SIZE (SFX_SEQ_SIZE + SFX_SOUNDFONTS_SIZE + 0x10) +#endif + +AudioHeapInitSizes gAudioHeapInitSizes = { + ALIGN16(sizeof(gAudioHeap) - 0x100), // audio heap size + ALIGN16(PERMANENT_POOL_SIZE + AI_BUFFERS_SIZE + SOUNDFONT_LIST_SIZE), // init pool size + ALIGN16(PERMANENT_POOL_SIZE), // permanent pool size +}; diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 01d6952db0..f034283c1e 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -342,7 +342,7 @@ void Audio_ChooseActiveSfx(u8 bankId) { entry->sfxId, entry->posX, entry->posZ, *entry->posX, *entry->posY, *entry->posZ); } entry->priority = (u32)entry->dist + (SQ(0xFF - sfxImportance) * SQ(76)); -#if OOT_VERSION < NTSC_1_1 || PLATFORM_GC +#if OOT_VERSION < NTSC_1_1 || !PLATFORM_N64 temp3 = entry->sfxId; // fake entry->priority = entry->priority + temp3 - temp3; #endif diff --git a/src/boot/driverominit.c b/src/boot/driverominit.c index 7d1441cdd9..5ed69abe07 100644 --- a/src/boot/driverominit.c +++ b/src/boot/driverominit.c @@ -3,7 +3,14 @@ OSPiHandle __DriveRomHandle; OSPiHandle* osDriveRomInit(void) { +#if PLATFORM_IQUE && defined(NON_MATCHING) + // On iQue, the compiled output of this file is patched so that the + // `!first` check is always taken. For non-matching builds, we edit the + // source code instead. + static u32 first = false; +#else static u32 first = true; +#endif register s32 status; register u32 value; register u32 prevInt; diff --git a/src/boot/mio0.s b/src/boot/mio0.s index a3fb8eba26..a6c2eee6bc 100644 --- a/src/boot/mio0.s +++ b/src/boot/mio0.s @@ -1,10 +1,7 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noreorder - -.section .text - -.balign 16 +.text /** * void Mio0_Decompress(void* src, void* dst); @@ -12,53 +9,56 @@ * Decompress Mio0 chunk */ LEAF(Mio0_Decompress) - lw $a3, 8($a0) // compressed offset - lw $t9, 0xC($a0) // uncompressed offset - lw $t8, 4($a0) // decompressed length - add $a3, $a3, $a0 // compressed start - add $t9, $t9, $a0 // uncompressed start - move $a2, $zero // 0 - addi $a0, $a0, 0x10 // move past header - add $t8, $t8, $a1 // dst + decompressed length = end + lw a3, 0x08(a0) /* compressed offset */ + lw t9, 0x0C(a0) /* uncompressed offset */ + lw t8, 0x04(a0) /* decompressed length */ + add a3, a3, a0 /* compressed start */ + add t9, t9, a0 /* uncompressed start */ + move a2, zero /* 0 */ + addi a0, a0, 0x10 /* move past header */ + add t8, t8, a1 /* dst + decompressed length = end */ mainloop: - bnez $a2, 1f - nop - lw $t0, ($a0) - li $a2, 32 - addi $a0, $a0, 4 + bnez a2, 1f + + lw t0, (a0) + li a2, 32 + addi a0, a0, 4 1: - slt $t1, $t0, $zero - beqz $t1, read_comp - nop - lb $t2, ($t9) // read 1 byte from uncompressed data - addi $t9, $t9, 1 // advance uncompressed start - addi $a1, $a1, 1 + slt t1, t0, zero + beqz t1, read_comp + + lb t2, (t9) /* read 1 byte from uncompressed data */ + sb t2, (a1) /* store uncompressed byte */ + addi t9, t9, 1 /* advance uncompressed start */ + addi a1, a1, 1 b next_iter - sb $t2, -1($a1) // store uncompressed byte + read_comp: - lhu $t2, ($a3) // read 2 bytes from compressed data - addi $a3, $a3, 2 // advance compressed start - srl $t3, $t2, 0xC - andi $t2, $t2, 0xFFF - beqz $t3, 3f - sub $t1, $a1, $t2 - addi $t3, $t3, 2 + lhu t2, (a3) /* read 2 bytes from compressed data */ + addi a3, a3, 2 /* advance compressed start */ + srl t3, t2, 0xC + andi t2, t2, 0xFFF + sub t1, a1, t2 + beqz t3, 3f + + addi t3, t3, 2 2: - lb $t2, -1($t1) - addi $t3, $t3, -1 - addi $t1, $t1, 1 - addi $a1, $a1, 1 - bnez $t3, 2b - sb $t2, -1($a1) + lb t2, -1(t1) + addi t3, t3, -1 + addi t1, t1, 1 + sb t2, (a1) + addi a1, a1, 1 + bnez t3, 2b + next_iter: - sll $t0, $t0, 1 - bne $a1, $t8, mainloop // continue until decompressed length is reached - addi $a2, $a2, -1 - jr $ra - nop + sll t0, t0, 1 + addi a2, a2, -1 + bne a1, t8, mainloop /* continue until decompressed length is reached */ + + jr ra 3: - lbu $t3, ($t9) - addi $t9, $t9, 1 + lbu t3, (t9) + addi t9, t9, 1 + addi t3, t3, 0x12 b 2b - addi $t3, $t3, 0x12 END(Mio0_Decompress) diff --git a/src/boot/vimodepal60lan1.c b/src/boot/vimodepal60lan1.c index 5a7bf692be..de95a66d99 100644 --- a/src/boot/vimodepal60lan1.c +++ b/src/boot/vimodepal60lan1.c @@ -23,7 +23,7 @@ OSViMode gCustomViModePal60Lan1 = { { // comRegs VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 | - VI_CTRL_PIXEL_ADV_3, // ctrl + VI_CTRL_PIXEL_ADV(3), // ctrl WIDTH(320), // width BURST(58, 30, 4, 69), // burst // Ideally VSYNC would be 525 but this produces marginally-too-slow retraces. 519 is the closest value that diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c index 82be71b2fd..d95e917610 100644 --- a/src/boot/z_locale.c +++ b/src/boot/z_locale.c @@ -2,6 +2,7 @@ #include "region.h" #include "terminal.h" #include "versions.h" +#include "line_numbers.h" s32 gCurrentRegion = 0; @@ -55,15 +56,7 @@ void Locale_Init(void) { PRINTF(VT_COL(RED, WHITE)); PRINTF(T("z_locale_init: 日本用かアメリカ用か判別できません\n", "z_locale_init: Can't tell if it's for Japan or America\n")); -#if OOT_VERSION < NTSC_1_1 - LogUtils_HungupThread("../z_locale.c", 86); -#elif OOT_VERSION < PAL_1_0 - LogUtils_HungupThread("../z_locale.c", 92); -#elif OOT_VERSION < GC_JP - LogUtils_HungupThread("../z_locale.c", 101); -#else - LogUtils_HungupThread("../z_locale.c", 118); -#endif + LogUtils_HungupThread("../z_locale.c", LN4(86, 92, 101, 118, UNK_LINE)); PRINTF(VT_RST); break; } diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index f2195d8206..bfafd48aef 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -23,12 +23,13 @@ #include "stack.h" #include "terminal.h" #include "compression.h" +#include "line_numbers.h" #if PLATFORM_N64 #include "n64dd.h" #endif #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.2:88 pal-1.0:86 pal-1.1:86" + "ntsc-1.2:82 pal-1.0:80 pal-1.1:80" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; @@ -297,14 +298,9 @@ NORETURN void DmaMgr_Error(DmaRequest* req, const char* filename, const char* er Fault_AddHungupAndCrashImpl(buff1, buff2); } -#define DMA_ERROR(req, filename, errorName, errorDesc, file, line1, line2, line3) \ - DmaMgr_Error(req, filename, errorName, errorDesc) -#elif OOT_VERSION < NTSC_1_1 -#define DMA_ERROR(req, filename, errorName, errorDesc, file, line1, line2, line3) Fault_AddHungupAndCrash(file, line1) -#elif OOT_VERSION < GC_JP -#define DMA_ERROR(req, filename, errorName, errorDesc, file, line1, line2, line3) Fault_AddHungupAndCrash(file, line2) +#define DMA_ERROR(req, filename, errorName, errorDesc, file, line) DmaMgr_Error(req, filename, errorName, errorDesc) #else -#define DMA_ERROR(req, filename, errorName, errorDesc, file, line1, line2, line3) Fault_AddHungupAndCrash(file, line3) +#define DMA_ERROR(req, filename, errorName, errorDesc, file, line) Fault_AddHungupAndCrash(file, line) #endif #if PLATFORM_GC @@ -410,7 +406,7 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { DMA_ERROR(req, filename, "Segment Alignment Error", T("セグメント境界をまたがってＤＭＡ転送することはできません", "DMA transfers cannot cross segment boundaries"), - "../z_std_dma.c", 575, 578, 726); + "../z_std_dma.c", LN3(575, 578, 726)); } DmaMgr_DmaRomToRam(iter->romStart + (vrom - iter->file.vromStart), ram, size); @@ -431,7 +427,7 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { DMA_ERROR(req, filename, "Can't Transfer Segment", T("圧縮されたセグメントの途中からはＤＭＡ転送することはできません", "DMA transfer cannot be performed from the middle of a compressed segment"), - "../z_std_dma.c", 595, 598, 746); + "../z_std_dma.c", LN3(595, 598, 746)); } if (size != iter->file.vromEnd - iter->file.vromStart) { @@ -440,7 +436,7 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { DMA_ERROR(req, filename, "Can't Transfer Segment", T("圧縮されたセグメントの一部だけをＤＭＡ転送することはできません", "It is not possible to DMA only part of a compressed segment"), - "../z_std_dma.c", 601, 604, 752); + "../z_std_dma.c", LN3(601, 604, 752)); } // Reduce the thread priority and decompress the file, the decompression routine handles the DMA @@ -479,8 +475,8 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { // Error, rom is compressed so DMA may only be requested within the filesystem bounds DMA_ERROR(req, NULL, "DATA DON'T EXIST", - T("該当するデータが存在しません", "Corresponding data does not exist"), "../z_std_dma.c", 621, - 624, 771); + T("該当するデータが存在しません", "Corresponding data does not exist"), "../z_std_dma.c", + LN3(621, 624, 771)); return; } else { // ROM is uncompressed, allow arbitrary DMA even if the region is not marked in the filesystem @@ -550,7 +546,7 @@ s32 DmaMgr_RequestAsync(DmaRequest* req, void* ram, uintptr_t vrom, size_t size, (size == 0) || (size & 1)) { //! @bug `req` is passed to `DMA_ERROR` without rom, ram and size being set DMA_ERROR(req, NULL, "ILLIGAL DMA-FUNCTION CALL", T("パラメータ異常です", "Parameter error"), "../z_std_dma.c", - UNK_LINE, UNK_LINE, UNK_LINE); + UNK_LINE); } #endif @@ -655,13 +651,7 @@ void DmaMgr_Init(void) { PRINTF("_bootSegmentRomStart(%08x) != dma_rom_ad[0].rom_b(%08x)\n", _bootSegmentRomStart, gDmaDataTable[0].file.vromEnd); //! @bug The main code file where fault.c resides is not yet loaded -#if OOT_VERSION < NTSC_1_1 - Fault_AddHungupAndCrash("../z_std_dma.c", 837); -#elif OOT_VERSION < GC_JP - Fault_AddHungupAndCrash("../z_std_dma.c", 840); -#else - Fault_AddHungupAndCrash("../z_std_dma.c", 1055); -#endif + Fault_AddHungupAndCrash("../z_std_dma.c", LN3(837, 840, 1055)); } // Start the DMA manager diff --git a/src/boot/zlib.c b/src/boot/zlib.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/boot/zlib.c @@ -0,0 +1 @@ + diff --git a/src/code/PreRender.c b/src/code/PreRender.c index 6c650b82a6..2e83e0b1ab 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -522,11 +522,11 @@ void PreRender_CopyImageRegion(PreRender* this, Gfx** gfxP) { * This filter performs a linear interpolation on partially covered pixels between the current pixel color (called * foreground color) and a "background" pixel color obtained by sampling fully covered pixels at the six highlighted * points in the following 5x3 neighborhood: - * _ _ _ _ _ + * - - - - - * | o o | * | o X o | * | o o | - * ‾ ‾ ‾ ‾ ‾ + * - - - - - * Whether a pixel is partially covered is determined by reading the coverage values associated with the image. * Coverage is a measure of how many subpixels the last drawn primitive covered. A fully covered pixel is one with a * full coverage value, the entire pixel was covered by the primitive. diff --git a/src/code/code_800D31A0.c b/src/code/code_800D31A0.c deleted file mode 100644 index e7bd207d75..0000000000 --- a/src/code/code_800D31A0.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "global.h" -#include "terminal.h" - -#if DEBUG_FEATURES -u32 gIsCtrlr2Valid = false; -#endif - -NORETURN void func_800D31A0(void) { - PRINTF(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST); - for (;;) { - Sleep_Msec(1000); - } -} - -#if DEBUG_FEATURES -void func_800D31F0(void) { - gIsCtrlr2Valid = (gPadMgr.validCtrlrsMask & 2) != 0; -} - -void func_800D3210(void) { - gIsCtrlr2Valid = false; -} -#endif diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index 7b28ffefa3..e69b3f1760 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -40,10 +40,10 @@ * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen. * DPad-Down disables sending fault pages over osSyncPrintf. */ -#if PLATFORM_GC +#if !PLATFORM_N64 -#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-eu-mq-dbg:176 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192" \ - "gc-us-mq:192" +#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:160 gc-jp:176 gc-jp-ce:176 gc-jp-mq:176 gc-us:176" \ + "gc-us-mq:176" #include "global.h" #include "alloca.h" diff --git a/src/code/fault_gc_drawer.c b/src/code/fault_gc_drawer.c index 808b258497..ba294f52d9 100644 --- a/src/code/fault_gc_drawer.c +++ b/src/code/fault_gc_drawer.c @@ -9,7 +9,7 @@ #include "terminal.h" #pragma increment_block_number "gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" -#if PLATFORM_GC +#if !PLATFORM_N64 typedef struct FaultDrawer { /* 0x00 */ u16* fb; diff --git a/src/code/game.c b/src/code/game.c index 7b7636145f..3c2d3a06e6 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -3,6 +3,7 @@ #include "libc64/os_malloc.h" #include "terminal.h" #include "versions.h" +#include "line_numbers.h" #if PLATFORM_N64 #include "n64dd.h" #endif @@ -407,15 +408,7 @@ void GameState_InitArena(GameState* gameState, size_t size) { } else { THA_Init(&gameState->tha, NULL, 0); PRINTF(T("ハイラル確保失敗\n", "Failure to secure Hyrule\n")); -#if OOT_VERSION < NTSC_1_1 - HUNGUP_AND_CRASH("../game.c", 895); -#elif OOT_VERSION < PAL_1_0 - HUNGUP_AND_CRASH("../game.c", 898); -#elif OOT_VERSION < GC_JP - HUNGUP_AND_CRASH("../game.c", 985); -#else - HUNGUP_AND_CRASH("../game.c", 999); -#endif + HUNGUP_AND_CRASH("../game.c", LN4(895, 898, 985, 999, 999)); } } @@ -456,15 +449,7 @@ void GameState_Realloc(GameState* gameState, size_t size) { SystemArena_Display(); #endif -#if OOT_VERSION < NTSC_1_1 - HUNGUP_AND_CRASH("../game.c", 940); -#elif OOT_VERSION < PAL_1_0 - HUNGUP_AND_CRASH("../game.c", 943); -#elif OOT_VERSION < GC_JP - HUNGUP_AND_CRASH("../game.c", 1030); -#else - HUNGUP_AND_CRASH("../game.c", 1044); -#endif + HUNGUP_AND_CRASH("../game.c", LN4(940, 943, 1030, 1044, 1044)); } } diff --git a/src/code/graph.c b/src/code/graph.c index 150d307753..9121bd0b4e 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -3,12 +3,13 @@ #include "terminal.h" #include "ucode_disas.h" #include "versions.h" +#include "line_numbers.h" #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:160" \ + "ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160" /** * The time at which the previous `Graph_Update` ended. @@ -382,30 +383,15 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { PRINTF("%c", BEL); PRINTF(VT_COL(RED, WHITE) T("ダイナミック領域先頭が破壊されています\n", "Dynamic area head is destroyed\n") VT_RST); -#if OOT_VERSION < NTSC_1_1 - Fault_AddHungupAndCrash("../graph.c", 937); -#elif OOT_VERSION < PAL_1_0 - Fault_AddHungupAndCrash("../graph.c", 940); -#elif OOT_VERSION < GC_JP - Fault_AddHungupAndCrash("../graph.c", 951); -#else - Fault_AddHungupAndCrash("../graph.c", 1070); -#endif + Fault_AddHungupAndCrash("../graph.c", LN4(937, 940, 951, 1070, 1067)); } + if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) { problem = true; PRINTF("%c", BEL); PRINTF(VT_COL(RED, WHITE) T("ダイナミック領域末尾が破壊されています\n", "Dynamic region tail is destroyed\n") VT_RST); -#if OOT_VERSION < NTSC_1_1 - Fault_AddHungupAndCrash("../graph.c", 943); -#elif OOT_VERSION < PAL_1_0 - Fault_AddHungupAndCrash("../graph.c", 946); -#elif OOT_VERSION < GC_JP - Fault_AddHungupAndCrash("../graph.c", 957); -#else - Fault_AddHungupAndCrash("../graph.c", 1076); -#endif + Fault_AddHungupAndCrash("../graph.c", LN4(943, 946, 957, 1076, 1073)); } } @@ -490,14 +476,8 @@ void Graph_ThreadEntry(void* arg0) { sprintf(faultMsg, "CLASS SIZE= %d bytes", size); Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg); -#elif OOT_VERSION < NTSC_1_1 - Fault_AddHungupAndCrash("../graph.c", 1067); -#elif OOT_VERSION < PAL_1_0 - Fault_AddHungupAndCrash("../graph.c", 1070); -#elif OOT_VERSION < GC_JP - Fault_AddHungupAndCrash("../graph.c", 1081); #else - Fault_AddHungupAndCrash("../graph.c", 1200); + Fault_AddHungupAndCrash("../graph.c", LN4(1067, 1070, 1081, 1200, 1197)); #endif } diff --git a/src/code/kanread.s b/src/code/kanread.s index a163f9ead7..fdf69ed9be 100644 --- a/src/code/kanread.s +++ b/src/code/kanread.s @@ -1,11 +1,7 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text /** * s32 Kanji_OffsetFromShiftJIS(s32 sjis); @@ -26,64 +22,57 @@ * @remark Almost identical to "LeoGetKadr" from libleo. */ LEAF(Kanji_OffsetFromShiftJIS) - // Characters with codepoints >= 0x8800 are kanji. Arrangement is regular, - // so convert index directly. - li $at, 0x8800 - slt $at, $a0, $at - bnez $at, .nonkanji - // 0xBC is number of glyphs in one block in the `kanji` file: - // 0x100 possible codepoints with the same byte1 - // - 0x40 unused at beginning - // - 1 unused at 0x7F - // - 3 unused at 0xFD, 0xFE, 0xFF - li $a2, 0xBC - // Get byte1 and adjust so starts at 0 - srl $a1, $a0, 8 - addi $a1, $a1, -0x88 - multu $a2, $a1 - // Get byte2 and adjust so starts at 0 - andi $a3, $a0, 0xFF - addi $a3, $a3, -0x40 - slti $at, $a3, (0x80 - 0x40) - mflo $a2 - // 0x__7F is always empty and elided in the file, so decrement if larger - bnezl $at, .kanji_lower_halfblock - mflo $a2 - addi $a3, $a3, -1 - mflo $a2 + /* Characters with codepoints >= 0x8800 are kanji. Arrangement is regular, */ + /* so convert index directly. */ + li a2, 0xBC + blt a0, 0x8800, .nonkanji + /* 0xBC is number of glyphs in one block in the `kanji` file: */ + /* 0x100 possible codepoints with the same byte1 */ + /* - 0x40 unused at beginning */ + /* - 1 unused at 0x7F */ + /* - 3 unused at 0xFD, 0xFE, 0xFF */ + /* Get byte1 and adjust so starts at 0 */ + srl a1, a0, 8 + addi a1, a1, -0x88 + /* Get byte2 and adjust so starts at 0 */ + andi a3, a0, 0xFF + addi a3, a3, -0x40 + mul a2, a2, a1 + blt a3, 0x40, .kanji_lower_halfblock + + /* 0x__7F is always empty and elided in the file, so decrement if larger */ + addi a3, a3, -1 .kanji_lower_halfblock: - addi $a3, $a3, 0x30A - add $a3, $a3, $a2 - jr $ra - sll $v0, $a3, 7 - // returns (0x30A + (adjusted byte2) + (adjusted byte1) * 0xBC) * FONT_CHAR_TEX_SIZE + mflo a2 /* Unncessary mflo: the pseudo-op `mul` already performs mflo */ + addi a3, a3, 0x30A + add a3, a3, a2 + /* returns (0x30A + (adjusted byte2) + (adjusted byte1) * 0xBC) * FONT_CHAR_TEX_SIZE */ + sll v0, a3, 7 + jr ra -// Non-kanji are arranged with irregular gaps, use the lookup table. +/* Non-kanji are arranged with irregular gaps, use the lookup table. */ .nonkanji: - // Get byte1 and adjust so starts at 0 - srl $a1, $a0, 8 - addi $a1, $a1, -0x81 - multu $a2, $a1 - // Get byte2 and adjust so starts at 0 - andi $a3, $a0, 0xFF - addi $a3, $a3, -0x40 - slti $at, $a3, (0x80 - 0x40) - mflo $a2 - // 0x__7F is always empty and elided in the file, so decrement if larger - bnezl $at, .nonkanji_lower_halfblock - mflo $a2 - addi $a3, $a3, -1 - mflo $a2 + /* Get byte1 and adjust so starts at 0 */ + srl a1, a0, 8 + addi a1, a1, -0x81 + /* Get byte2 and adjust so starts at 0 */ + andi a3, a0, 0xFF + addi a3, a3, -0x40 + mul a2, a2, a1 + blt a3, 0x40, .nonkanji_lower_halfblock + + /* 0x__7F is always empty and elided in the file, so decrement if larger */ + addi a3, a3, -1 .nonkanji_lower_halfblock: - add $a3, $a3, $a2 - lui $a2, %hi(sNonKanjiIndices) - sll $a3, $a3, 1 - addiu $a2, %lo(sNonKanjiIndices) - add $a3, $a3, $a2 - lh $a2, ($a3) - jr $ra - sll $v0, $a2, 7 - // returns sNonKanjiIndices[(adjusted byte2) + (adjusted byte1) * 0xBC] * FONT_CHAR_TEX_SIZE + mflo a2 /* Unncessary mflo: the pseudo-op `mul` already performs mflo */ + add a3, a3, a2 + sll a3, a3, 1 + la a2, sNonKanjiIndices + add a3, a3, a2 + lh a2, (a3) + /* returns sNonKanjiIndices[(adjusted byte2) + (adjusted byte1) * 0xBC] * FONT_CHAR_TEX_SIZE */ + sll v0, a2, 7 + jr ra END(Kanji_OffsetFromShiftJIS) /** @@ -116,7 +105,7 @@ END(Kanji_OffsetFromShiftJIS) * into blocks by high byte. */ DATA(sNonKanjiIndices) -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x814_ */ .half 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F /* 0x815_ */ .half 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F /* 0x816_ */ .half 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F @@ -130,7 +119,7 @@ DATA(sNonKanjiIndices) /* 0x81E_ */ .half 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x81F_ */ .half 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0000, 0x0000, 0x0000, 0x0000, 0x0091 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x824_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0092 /* 0x825_ */ .half 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x826_ */ .half 0x009C, 0x009D, 0x009E, 0x009F, 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB @@ -144,7 +133,7 @@ DATA(sNonKanjiIndices) /* 0x82E_ */ .half 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118, 0x0119, 0x011A, 0x011B, 0x011C, 0x011D, 0x011E, 0x011F, 0x0120 /* 0x82F_ */ .half 0x0121, 0x0122, 0x0123, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x834_ */ .half 0x0124, 0x0125, 0x0126, 0x0127, 0x0128, 0x0129, 0x012A, 0x012B, 0x012C, 0x012D, 0x012E, 0x012F, 0x0130, 0x0131, 0x0132, 0x0133 /* 0x835_ */ .half 0x0134, 0x0135, 0x0136, 0x0137, 0x0138, 0x0139, 0x013A, 0x013B, 0x013C, 0x013D, 0x013E, 0x013F, 0x0140, 0x0141, 0x0142, 0x0143 /* 0x836_ */ .half 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149, 0x014A, 0x014B, 0x014C, 0x014D, 0x014E, 0x014F, 0x0150, 0x0151, 0x0152, 0x0153 @@ -158,7 +147,7 @@ DATA(sNonKanjiIndices) /* 0x83E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x83F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x844_ */ .half 0x01AB, 0x01AC, 0x01AD, 0x01AE, 0x01AF, 0x01B0, 0x01B1, 0x01B2, 0x01B3, 0x01B4, 0x01B5, 0x01B6, 0x01B7, 0x01B8, 0x01B9, 0x01BA /* 0x845_ */ .half 0x01BB, 0x01BC, 0x01BD, 0x01BE, 0x01BF, 0x01C0, 0x01C1, 0x01C2, 0x01C3, 0x01C4, 0x01C5, 0x01C6, 0x01C7, 0x01C8, 0x01C9, 0x01CA /* 0x846_ */ .half 0x01CB, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 @@ -172,7 +161,7 @@ DATA(sNonKanjiIndices) /* 0x84E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x84F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x854_ */ .half 0x020E, 0x020F, 0x0210, 0x0211, 0x0212, 0x0213, 0x0214, 0x0215, 0x0216, 0x0217, 0x0218, 0x0219, 0x021A, 0x021B, 0x021C, 0x021D /* 0x855_ */ .half 0x021E, 0x021F, 0x0220, 0x0221, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0222, 0x0223 /* 0x856_ */ .half 0x0224, 0x0225, 0x0226, 0x0227, 0x0228, 0x0229, 0x022A, 0x022B, 0x022C, 0x022D, 0x022E, 0x022F, 0x0230, 0x0231, 0x0232, 0x0233 @@ -186,7 +175,7 @@ DATA(sNonKanjiIndices) /* 0x85E_ */ .half 0x026C, 0x026D, 0x026E, 0x026F, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0275, 0x0276, 0x0277, 0x0278, 0x0279, 0x027A, 0x027B /* 0x85F_ */ .half 0x027C, 0x027D, 0x027E, 0x027F, 0x0280, 0x0281, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x864_ */ .half 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0287, 0x0288, 0x0289, 0x028A, 0x028B, 0x028C, 0x028D, 0x028E, 0x028F, 0x0290, 0x0291 /* 0x865_ */ .half 0x0292, 0x0293, 0x0294, 0x0295, 0x0296, 0x0297, 0x0298, 0x0299, 0x029A, 0x029B, 0x029C, 0x029D, 0x029E, 0x029F, 0x0000, 0x0000 /* 0x866_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 @@ -200,7 +189,7 @@ DATA(sNonKanjiIndices) /* 0x86E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x86F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x874_ */ .half 0x02C0, 0x02C1, 0x02C2, 0x02C3, 0x02C4, 0x02C5, 0x02C6, 0x02C7, 0x02C8, 0x02C9, 0x02CA, 0x02CB, 0x02CC, 0x02CD, 0x02CE, 0x02CF /* 0x875_ */ .half 0x02D0, 0x02D1, 0x02D2, 0x02D3, 0x02D4, 0x02D5, 0x02D6, 0x02D7, 0x02D8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x876_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 diff --git a/src/code/main.c b/src/code/main.c index ee6515bd22..0857dec164 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -24,7 +24,7 @@ extern struct IrqMgr gIrqMgr; #endif #pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ - "ntsc-1.0:148 ntsc-1.1:148 ntsc-1.2:148 pal-1.0:146 pal-1.1:146" + "ntsc-1.0:142 ntsc-1.1:142 ntsc-1.2:142 pal-1.0:140 pal-1.1:140" extern u8 _buffersSegmentEnd[]; diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 4486e541a0..33a5056639 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -31,6 +31,7 @@ #include "global.h" #include "fault.h" #include "terminal.h" +#include "line_numbers.h" #define PADMGR_LOG(controllerNum, msg) \ if (DEBUG_FEATURES) { \ @@ -326,13 +327,7 @@ void PadMgr_UpdateInputs(PadMgr* padMgr) { default: // Unknown error response LOG_HEX("padnow1->errno", pad->errno, "../padmgr.c", 396); -#if OOT_VERSION < NTSC_1_1 - Fault_AddHungupAndCrash("../padmgr.c", 379); -#elif OOT_VERSION < GC_JP - Fault_AddHungupAndCrash("../padmgr.c", 382); -#else - Fault_AddHungupAndCrash("../padmgr.c", 397); -#endif + Fault_AddHungupAndCrash("../padmgr.c", LN3(379, 382, 397)); break; } diff --git a/src/code/sched.c b/src/code/sched.c index fd82aa3d3e..012e452275 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -62,6 +62,8 @@ vs32 sSchedDebugPrintfEnabled = false; PRINTF #elif IDO_PRINTF_WORKAROUND #define SCHED_DEBUG_PRINTF(args) (void)0 +#elif defined(__GNUC__) && __GNUC__ < 3 +#define SCHED_DEBUG_PRINTF(format, args...) (void)0 #else #define SCHED_DEBUG_PRINTF(format, ...) (void)0 #endif diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index b3c01f97b5..0d92c001ba 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -1,5 +1,6 @@ #include "global.h" #include "config.h" +#include "line_numbers.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "pal-1.1:128" @@ -30,15 +31,7 @@ void SysCfb_Init(s32 n64dd) { PRINTF("RAM4M mode\n"); sSysCfbEnd = 0x80400000; } else { -#if OOT_VERSION < NTSC_1_1 - LogUtils_HungupThread("../sys_cfb.c", 305); -#elif OOT_VERSION < PAL_1_0 - LogUtils_HungupThread("../sys_cfb.c", 308); -#elif OOT_VERSION < GC_JP - LogUtils_HungupThread("../sys_cfb.c", 322); -#else - LogUtils_HungupThread("../sys_cfb.c", 354); -#endif + LogUtils_HungupThread("../sys_cfb.c", LN4(305, 308, 322, 354, 341)); } screenSize = SCREEN_WIDTH * SCREEN_HEIGHT; diff --git a/src/code/sys_debug_controller.c b/src/code/sys_debug_controller.c new file mode 100644 index 0000000000..eb1398ff24 --- /dev/null +++ b/src/code/sys_debug_controller.c @@ -0,0 +1,11 @@ +#include "global.h" + +u32 gIsCtrlr2Valid = false; + +void func_800D31F0(void) { + gIsCtrlr2Valid = (gPadMgr.validCtrlrsMask & 2) != 0; +} + +void func_800D3210(void) { + gIsCtrlr2Valid = false; +} diff --git a/src/code/sys_freeze.c b/src/code/sys_freeze.c new file mode 100644 index 0000000000..f7cb515cfe --- /dev/null +++ b/src/code/sys_freeze.c @@ -0,0 +1,9 @@ +#include "global.h" +#include "terminal.h" + +NORETURN void func_800D31A0(void) { + PRINTF(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST); + for (;;) { + Sleep_Msec(1000); + } +} diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 96b352d693..082c62fc71 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -5,7 +5,7 @@ #include "macros.h" #include "sys_math3d.h" -#pragma increment_block_number "gc-eu:103 gc-eu-mq:103 gc-jp:103 gc-jp-ce:103 gc-jp-mq:103 gc-us:103 gc-us-mq:103" \ +#pragma increment_block_number "gc-eu:99 gc-eu-mq:99 gc-jp:99 gc-jp-ce:99 gc-jp-mq:99 gc-us:99 gc-us-mq:99" \ "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:79 pal-1.0:80 pal-1.1:80" s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 37baa9f23c..b401f186d3 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4,6 +4,7 @@ #include "rand.h" #include "terminal.h" #include "versions.h" +#include "z64horse.h" #include "config.h" #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" @@ -24,6 +25,8 @@ static s32 sCurCeilingBgId; PRINTF #elif IDO_PRINTF_WORKAROUND #define ACTOR_DEBUG_PRINTF(args) (void)0 +#elif defined(__GNUC__) && __GNUC__ < 3 +#define ACTOR_DEBUG_PRINTF(format, args...) (void)0 #else #define ACTOR_DEBUG_PRINTF(format, ...) (void)0 #endif @@ -903,9 +906,9 @@ void Actor_Init(Actor* actor, PlayState* play) { actor->minVelocityY = -20.0f; actor->xyzDistToPlayerSq = MAXFLOAT; actor->naviEnemyId = NAVI_ENEMY_NONE; - actor->uncullZoneForward = 1000.0f; - actor->uncullZoneScale = 350.0f; - actor->uncullZoneDownward = 700.0f; + actor->cullingVolumeDistance = 1000.0f; + actor->cullingVolumeScale = 350.0f; + actor->cullingVolumeDownward = 700.0f; CollisionCheck_InitInfo(&actor->colChkInfo); actor->floorBgId = BGCHECK_SCENE; ActorShape_Init(&actor->shape, 0.0f, NULL, 0.0f); @@ -1146,7 +1149,7 @@ void Actor_SwapHookshotAttachment(PlayState* play, Actor* srcActor, Actor* destA srcActor->flags &= ~ACTOR_FLAG_HOOKSHOT_ATTACHED; } -void func_8002DE74(PlayState* play, Player* player) { +void Actor_RequestHorseCameraSetting(PlayState* play, Player* player) { if ((play->roomCtx.curRoom.type != ROOM_TYPE_4) && Play_CamIsNotFixed(play)) { Camera_RequestSetting(Play_GetCamera(play, CAM_ID_MAIN), CAM_SET_HORSE); } @@ -1163,8 +1166,8 @@ int func_8002DEEC(Player* player) { (player->csAction != PLAYER_CSACTION_NONE); } -void func_8002DF18(PlayState* play, Player* player) { - func_8006DC68(play, player); +void Actor_InitPlayerHorse(PlayState* play, Player* player) { + Horse_InitPlayerHorse(play, player); } /** @@ -1775,7 +1778,7 @@ u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play) { } } -s8 func_8002F368(PlayState* play) { +s8 Actor_GetPlayerExchangeItemId(PlayState* play) { Player* player = GET_PLAYER(play); return player->exchangeItemId; @@ -2193,7 +2196,8 @@ void Actor_DrawFaroresWindPointer(PlayState* play) { if (D_8015BC18 == 0.0f) { gSaveContext.respawn[RESPAWN_MODE_TOP] = gSaveContext.respawn[RESPAWN_MODE_DOWN]; - gSaveContext.respawn[RESPAWN_MODE_TOP].playerParams = 0x06FF; + gSaveContext.respawn[RESPAWN_MODE_TOP].playerParams = + PLAYER_PARAMS(PLAYER_START_MODE_FARORES_WIND, PLAYER_START_BG_CAM_DEFAULT); gSaveContext.respawn[RESPAWN_MODE_TOP].data = 40; } @@ -2453,7 +2457,8 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) { actor->yawTowardsPlayer = Actor_WorldYawTowardActor(actor, &player->actor); actor->flags &= ~ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT; - if ((DECR(actor->freezeTimer) == 0) && (actor->flags & (ACTOR_FLAG_4 | ACTOR_FLAG_6))) { + if ((DECR(actor->freezeTimer) == 0) && + (actor->flags & (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_INSIDE_CULLING_VOLUME))) { if (actor == player->focusActor) { actor->isLockedOn = true; } else { @@ -2725,19 +2730,92 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis CLOSE_DISPS(gfxCtx, "../z_actor.c", 6284); } -s32 func_800314B0(PlayState* play, Actor* actor) { - return func_800314D4(play, actor, &actor->projectedPos, actor->projectedW); +/** + * Checks if an actor should be culled or not, by seeing if it is contained within its own culling volume. + * For more details on the culling test, see `Actor_CullingVolumeTest`. + * + * Returns true if the actor is inside its culling volume. In other words, it should not cull. + * + * "Culling" in this context refers to the removal of something for the sake of improving performance. + * For actors, being culled means that their Update and Draw processes are halted. + * While halted, an Actor's update state is frozen and it will not draw, making it invisible. + * + * Actors that are within the bounds of their culling volume may update and draw, while actors that are + * out of bounds of its culling volume may be excluded from updating and drawing until they are within bounds. + * + * It is possible for actors to opt out of update culling or draw culling. + * This is set per-actor with `ACTOR_FLAG_UPDATE_CULLING_DISABLED` and `ACTOR_FLAG_DRAW_CULLING_DISABLED`. + * + * Note: Even if either `ACTOR_FLAG_UPDATE_CULLING_DISABLED` or `ACTOR_FLAG_DRAW_CULLING_DISABLED` are set, the actor + * will still undergo the culling test and set `ACTOR_FLAG_INSIDE_CULLING_VOLUME` accordingly. + * So, `ACTOR_FLAG_INSIDE_CULLING_VOLUME` cannot be used on it own to determine if an actor is actually culled. + * It simply says whether or not they are physically located within the bounds of the culling volume. + */ +s32 Actor_CullingCheck(PlayState* play, Actor* actor) { + return Actor_CullingVolumeTest(play, actor, &actor->projectedPos, actor->projectedW); } -s32 func_800314D4(PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3) { - f32 var; - - if ((arg2->z > -actor->uncullZoneScale) && (arg2->z < (actor->uncullZoneForward + actor->uncullZoneScale))) { - var = (arg3 < 1.0f) ? 1.0f : 1.0f / arg3; - - if ((((fabsf(arg2->x) - actor->uncullZoneScale) * var) < 1.0f) && - (((arg2->y + actor->uncullZoneDownward) * var) > -1.0f) && - (((arg2->y - actor->uncullZoneScale) * var) < 1.0f)) { +/** + * Tests if an actor is currently within the bounds of its own culling volume. + * + * The culling volume is a 3D shape composed of a frustum with a box attached to the end of it. The frustum sits at the + * camera's position and projects forward, encompassing the player's current view; the box extrudes behind the camera, + * allowing actors in the immediate vicinity behind and to the sides of the camera to be detected. + * + * This function returns true if the actor is within bounds, false if not. + * The comparison is done in projected space against the actor's projected position as the viewing frustum + * in world space transforms to a box in projected space, making the calculation easy. + * + * Every actor can set properties for their own culling volume, changing its dimensions to suit the needs of + * it and its environment. These properties are in units of projected space (i.e. compared to the actor's position + * after perspective projection is applied) are therefore not directly comparable to world units. + * These depend on the current view parameters (fov, aspect, scale, znear, zfar). + * The default parameters considered are (60 degrees, 4/3, 1.0, 10, 12800). + * + * cullingVolumeDistance: Configures how far forward the far plane of the frustum should extend. + * This along with cullingVolumeScale determines the maximum distance from + * the camera eye that the actor can be detected at. This quantity is related + * to world units by a factor of + * (znear - zfar) / ((znear + zfar) * scale). + * For default view parameters, increasing this property by 1 increases the + * distance by ~0.995 world units. + * + * cullingVolumeScale: Scales the entire culling volume in all directions except the downward + * direction. Both the frustum and the box will scale in size. This quantity is + * related to world units by different factors based on direction: + * - For the forward and backward directions, they are related in the same way + * as above. For default view parameters, increasing this property by 1 increases + * the forward and backward scales by ~0.995 world units. + * - For the sideways directions, the relation to world units is + * (aspect / scale) * tan(0.5 * fov) + * For default view parameters, increasing this property by 1 increases the + * sideways scales by ~0.77 world units. + * - For the upward direction, the relation to world units is + * (1 / scale) * tan(0.5 * fov) + * For default view parameters, increasing this property by 1 increases the + * scale by ~0.58 world units. + * + * cullingVolumeDownward: Sets the height of the culling volume in the downward direction. Increasing + * this value will make actors below the camera more easily detected. This + * quantity is related to world units by the same factor as the upward scale. + * For default view parameters, increasing this property by 1 increases the + * downward height by ~0.58 world units. + * + * This interactive 3D graph visualizes the shape of the culling volume and has sliders for the 3 properties mentioned + * above: https://www.desmos.com/3d/4ztkxqky2a. + */ +s32 Actor_CullingVolumeTest(PlayState* play, Actor* actor, Vec3f* projPos, f32 projW) { + f32 invW; + + if ((projPos->z > -actor->cullingVolumeScale) && + (projPos->z < (actor->cullingVolumeDistance + actor->cullingVolumeScale))) { + // Clamping `projW` affects points behind the camera, so that the culling volume has + // a frustum shape in front of the camera and a box shape behind the camera. + invW = (projW < 1.0f) ? 1.0f : 1.0f / projW; + + if ((((fabsf(projPos->x) - actor->cullingVolumeScale) * invW) < 1.0f) && + (((projPos->y + actor->cullingVolumeDownward) * invW) > -1.0f) && + (((projPos->y - actor->cullingVolumeScale) * invW) < 1.0f)) { return true; } } @@ -2784,17 +2862,18 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) { } if (!DEBUG_FEATURES || (HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(70) == 0)) { - if (func_800314B0(play, actor)) { - actor->flags |= ACTOR_FLAG_6; + if (Actor_CullingCheck(play, actor)) { + actor->flags |= ACTOR_FLAG_INSIDE_CULLING_VOLUME; } else { - actor->flags &= ~ACTOR_FLAG_6; + actor->flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; } } actor->isDrawn = false; if (!DEBUG_FEATURES || (HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(71) == 0)) { - if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & (ACTOR_FLAG_5 | ACTOR_FLAG_6))) { + if ((actor->init == NULL) && (actor->draw != NULL) && + (actor->flags & (ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_INSIDE_CULLING_VOLUME))) { if ((actor->flags & ACTOR_FLAG_REACT_TO_LENS) && ((play->roomCtx.curRoom.lensMode == LENS_MODE_SHOW_ACTORS) || play->actorCtx.lensActive || (actor->room != play->roomCtx.curRoom.num))) { @@ -4430,25 +4509,25 @@ void func_80034CC4(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overr CLOSE_DISPS(play->state.gfxCtx, "../z_actor.c", 8904); } -s16 func_80034DD4(Actor* actor, PlayState* play, s16 arg2, f32 arg3) { +s16 Actor_UpdateAlphaByDistance(Actor* actor, PlayState* play, s16 alpha, f32 radius) { Player* player = GET_PLAYER(play); - f32 var; + f32 distance; if ((play->csCtx.state != CS_STATE_IDLE) || IS_DEBUG_CAM_ENABLED) { - var = Math_Vec3f_DistXYZ(&actor->world.pos, &play->view.eye) * 0.25f; + distance = Math_Vec3f_DistXYZ(&actor->world.pos, &play->view.eye) * 0.25f; } else { - var = Math_Vec3f_DistXYZ(&actor->world.pos, &player->actor.world.pos); + distance = Math_Vec3f_DistXYZ(&actor->world.pos, &player->actor.world.pos); } - if (arg3 < var) { + if (radius < distance) { actor->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - Math_SmoothStepToS(&arg2, 0, 6, 0x14, 1); + Math_SmoothStepToS(&alpha, 0, 6, 0x14, 1); } else { actor->flags |= ACTOR_FLAG_ATTENTION_ENABLED; - Math_SmoothStepToS(&arg2, 0xFF, 6, 0x14, 1); + Math_SmoothStepToS(&alpha, 0xFF, 6, 0x14, 1); } - return arg2; + return alpha; } void Animation_ChangeByInfo(SkelAnime* skelAnime, AnimationInfo* animationInfo, s32 index) { @@ -4794,7 +4873,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { retTextId = 0x1047; } } else { - if (Flags_GetEventChkInf(EVENTCHKINF_02)) { + if (Flags_GetEventChkInf(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS)) { if (Flags_GetInfTable(INFTABLE_03)) { retTextId = 0x1032; } else { @@ -5404,7 +5483,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { case 53: if (Flags_GetEventChkInf(EVENTCHKINF_37)) { retTextId = 0x402D; - } else if (Flags_GetEventChkInf(EVENTCHKINF_33)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) { retTextId = 0x4010; } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) { retTextId = 0x400F; @@ -5538,7 +5617,7 @@ void func_80036E50(u16 textId, s16 arg1) { case 1: switch (textId) { case 0x102F: - Flags_SetEventChkInf(EVENTCHKINF_02); + Flags_SetEventChkInf(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS); Flags_SetInfTable(INFTABLE_0C); return; case 0x1033: @@ -5750,7 +5829,7 @@ void func_80036E50(u16 textId, s16 arg1) { return; case 55: if (textId == 0x401B) { - Flags_SetEventChkInf(EVENTCHKINF_33); + Flags_SetEventChkInf(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA); Flags_SetInfTable(INFTABLE_138); } return; diff --git a/src/code/code_800430A0.c b/src/code/z_bg_collect.c similarity index 100% rename from src/code/code_800430A0.c rename to src/code/z_bg_collect.c diff --git a/src/code/code_80043480.c b/src/code/z_bg_item.c similarity index 100% rename from src/code/code_80043480.c rename to src/code/z_bg_item.c diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index b84ef15a77..40d20c4fb9 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -1,7 +1,8 @@ #include "global.h" #include "terminal.h" +#include "line_numbers.h" -#pragma increment_block_number "ntsc-1.0:136 ntsc-1.1:136 ntsc-1.2:136" +#pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128" u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList); void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector); @@ -1605,13 +1606,11 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader colCtx->subdivAmount.x * sizeof(StaticLookup) * colCtx->subdivAmount.y * colCtx->subdivAmount.z, ALIGNOF_MASK(StaticLookup)); + if (colCtx->lookupTbl == NULL) { -#if OOT_VERSION < NTSC_1_1 - LogUtils_HungupThread("../z_bgcheck.c", 4173); -#else - LogUtils_HungupThread("../z_bgcheck.c", 4176); -#endif + LogUtils_HungupThread("../z_bgcheck.c", LN1(4173, 4176)); } + colCtx->minBounds.x = colCtx->colHeader->minBounds.x; colCtx->minBounds.y = colCtx->colHeader->minBounds.y; colCtx->minBounds.z = colCtx->colHeader->minBounds.z; @@ -1628,17 +1627,14 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader colCtx->colHeader->numPolygons * sizeof(u8) + colCtx->dyna.polyNodesMax * sizeof(SSNode) + colCtx->dyna.polyListMax * sizeof(CollisionPoly) + colCtx->dyna.vtxListMax * sizeof(Vec3s) + sizeof(CollisionContext); + if (customNodeListMax > 0) { // tblMax is set without checking if customNodeListMax will result in a memory overflow // this is a non-issue as long as sceneSubdivisionList.nodeListMax is -1 tblMax = customNodeListMax; } else { if (colCtx->memSize < memSize) { -#if OOT_VERSION < NTSC_1_1 - LogUtils_HungupThread("../z_bgcheck.c", 4227); -#else - LogUtils_HungupThread("../z_bgcheck.c", 4230); -#endif + LogUtils_HungupThread("../z_bgcheck.c", LN1(4227, 4230)); } tblMax = (colCtx->memSize - memSize) / sizeof(SSNode); } diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 3cd1830ce9..5c146b8c2f 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -6,7 +6,7 @@ #include "config.h" #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ - "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" + "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags); s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange); @@ -3637,7 +3637,7 @@ s32 Camera_KeepOn3(Camera* camera) { } #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.0:90 ntsc-1.1:90 ntsc-1.2:90 pal-1.0:88 pal-1.1:88" + "ntsc-1.0:145 ntsc-1.1:145 ntsc-1.2:145 pal-1.0:143 pal-1.1:143" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 7534cd5ba7..fb65e52700 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -16,7 +16,7 @@ #include "z_lib.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.0:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:104 pal-1.1:104" + "ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96" typedef s32 (*ColChkResetFunc)(PlayState*, Collider*); typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*); diff --git a/src/code/code_800BB0A0.c b/src/code/z_cutscene_spline.c similarity index 100% rename from src/code/code_800BB0A0.c rename to src/code/z_cutscene_spline.c diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 33f31e84d1..8a433edc0e 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -15,8 +15,8 @@ typedef struct InputCombo { /* 0x2 */ u16 press; } InputCombo; // size = 0x4 -#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ - "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" +#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ + "ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160" RegEditor* gRegEditor; // ``gRegEditor->data`` is used by non-debug features in normal gameplay diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 16edfa5e3d..dc1eb49bd9 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1,3 +1,5 @@ +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ + "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" #include "global.h" #include "quake.h" #include "z64camera.h" @@ -100,7 +102,7 @@ EntranceCutscene sEntranceCutsceneTable[] = { { ENTR_GERUDO_VALLEY_0, 2, EVENTCHKINF_B2, gGerudoValleyIntroCs }, { ENTR_GERUDOS_FORTRESS_0, 2, EVENTCHKINF_B3, gGerudoFortressIntroCs }, { ENTR_LON_LON_RANCH_0, 2, EVENTCHKINF_B4, gLonLonRanchIntroCs }, - { ENTR_JABU_JABU_0, 2, EVENTCHKINF_B5, gJabuJabuIntroCs }, + { ENTR_JABU_JABU_0, 2, EVENTCHKINF_B5, gJabuIntroCs }, { ENTR_GRAVEYARD_0, 2, EVENTCHKINF_B6, gGraveyardIntroCs }, { ENTR_ZORAS_FOUNTAIN_2, 2, EVENTCHKINF_B7, gZorasFountainIntroCs }, { ENTR_DESERT_COLOSSUS_0, 2, EVENTCHKINF_B8, gDesertColossusIntroCs }, @@ -116,11 +118,11 @@ EntranceCutscene sEntranceCutsceneTable[] = { { ENTR_SPIRIT_TEMPLE_BOSS_0, 0, EVENTCHKINF_C0, gSpiritBossNabooruKnuckleIntroCs }, { ENTR_GERUDOS_FORTRESS_17, 0, EVENTCHKINF_C7, gGerudoFortressFirstCaptureCs }, { ENTR_DEATH_MOUNTAIN_CRATER_1, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs }, - { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutCs }, + { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutPart3Cs }, }; void* sCutscenesUnknownList[] = { - gDekuTreeIntroCs, gJabuJabuIntroCs, gDcOpeningCs, gSpiritBossNabooruKnuckleDefeatCs, + gDekuTreeIntroCs, gJabuIntroCs, gDcOpeningCs, gSpiritBossNabooruKnuckleDefeatCs, gIceCavernSerenadeCs, gTowerBarrierCs, }; @@ -129,8 +131,8 @@ u16 gCamAtSplinePointsAppliedFrame; u16 gCamEyePointAppliedFrame; u16 gCamAtPointAppliedFrame; -#pragma increment_block_number "gc-eu:186 gc-eu-mq:176 gc-jp:188 gc-jp-ce:188 gc-jp-mq:176 gc-us:188 gc-us-mq:176" \ - "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:80 pal-1.1:80" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:188 gc-jp-ce:188 gc-jp-mq:0 gc-us:188 gc-us-mq:0" \ + "ntsc-1.0:128 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:80 pal-1.1:80" // Cam ID to return to when a scripted cutscene is finished s16 sReturnToCamId; @@ -414,12 +416,12 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) { SET_EVENTCHKINF(EVENTCHKINF_65); break; - case CS_MISC_SET_FLAG_WELL_DRAINED: - SET_EVENTCHKINF(EVENTCHKINF_67); + case CS_MISC_SET_FLAG_DRAINED_WELL: + SET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL); break; - case CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED: - SET_EVENTCHKINF(EVENTCHKINF_69); + case CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA: + SET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA); break; case CS_MISC_VISMONO_BLACK_AND_WHITE: @@ -752,7 +754,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti case CS_DEST_TEMPLE_OF_TIME_AFTER_LIGHT_MEDALLION: #if DEBUG_FEATURES - SET_EVENTCHKINF(EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS); + SET_EVENTCHKINF(EVENTCHKINF_REVEALED_MASTER_SWORD); #endif play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_4; play->transitionTrigger = TRANS_TRIGGER_START; @@ -923,7 +925,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti case CS_DEST_TEMPLE_OF_TIME_AFTER_LIGHT_MEDALLION_ALT: #if DEBUG_FEATURES - SET_EVENTCHKINF(EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS); + SET_EVENTCHKINF(EVENTCHKINF_REVEALED_MASTER_SWORD); #endif play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_4; play->transitionTrigger = TRANS_TRIGGER_START; @@ -1154,7 +1156,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti play->transitionType = TRANS_TYPE_FADE_BLACK; break; - case CS_DEST_LON_LON_RANCH_CREDITS_PART_5: + case CS_DEST_LON_LON_RANCH_CREDITS_PART_6: play->linkAgeOnLoad = LINK_AGE_CHILD; play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; play->transitionTrigger = TRANS_TRIGGER_START; @@ -1162,7 +1164,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti play->transitionType = TRANS_TYPE_FADE_BLACK; break; - case CS_DEST_LON_LON_RANCH_CREDITS_PART_6: + case CS_DEST_LON_LON_RANCH_CREDITS_PART_5: play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.save.cutsceneIndex = 0xFFF7; @@ -1864,7 +1866,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script) MemCpy(&cmdType, script, sizeof(cmdType)); script += sizeof(cmdType); - if (cmdType == CS_CAM_STOP) { + if (cmdType == CS_CMD_END_OF_SCRIPT) { return; } diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index 3c1adf4cb6..2a64a23f4a 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -30,7 +30,7 @@ void func_80026400(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) { Gfx* displayListHead; f32 cos; -#if !PLATFORM_N64 +#if PLATFORM_GC if (arg3 == 0) { return; } diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index c90a7eb3bb..23d77075dd 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -2,7 +2,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_d_hsblock/object_d_hsblock.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnAObj_Init(Actor* thisx, PlayState* play); void EnAObj_Destroy(Actor* thisx, PlayState* play); @@ -114,8 +114,8 @@ void EnAObj_Init(Actor* thisx, PlayState* play) { this->dyna.bgId = BGACTOR_NEG_ONE; this->dyna.interactFlags = 0; this->dyna.transformFlags = 0; - thisx->uncullZoneDownward = 1200.0f; - thisx->uncullZoneScale = 200.0f; + thisx->cullingVolumeDownward = 1200.0f; + thisx->cullingVolumeScale = 200.0f; switch (thisx->params) { case A_OBJ_BLOCK_LARGE: @@ -288,8 +288,8 @@ void EnAObj_BoulderFragment(EnAObj* this, PlayState* play) { } void EnAObj_SetupBlock(EnAObj* this, s16 type) { - this->dyna.actor.uncullZoneDownward = 1200.0f; - this->dyna.actor.uncullZoneScale = 720.0f; + this->dyna.actor.cullingVolumeDownward = 1200.0f; + this->dyna.actor.cullingVolumeScale = 720.0f; EnAObj_SetupAction(this, EnAObj_Block); } diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index a5dddbb9f3..6f44ba5fee 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -3,7 +3,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-eu-mq-dbg:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128" \ +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-eu-mq-dbg:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128" \ "gc-us-mq:128 ntsc-1.2:128" #define FLAGS 0 @@ -75,64 +75,293 @@ static void* sItemDropTex[] = { }; static u8 sItemDropIds[] = { - ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NONE, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, - ITEM00_MAGIC_SMALL, ITEM00_FLEXIBLE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_RUPEE_BLUE, ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, - ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_NONE, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, - ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, - ITEM00_NONE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_NONE, ITEM00_FLEXIBLE, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, - ITEM00_NUTS, ITEM00_NONE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NUTS, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_NONE, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_RUPEE_GREEN, - ITEM00_RUPEE_GREEN, ITEM00_SEEDS, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_BOMBS_A, - ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_SMALL, - ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NONE, ITEM00_RUPEE_GREEN, - ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_ARROWS_SMALL, ITEM00_NONE, ITEM00_ARROWS_MEDIUM, ITEM00_MAGIC_SMALL, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_MAGIC_LARGE, ITEM00_RUPEE_GREEN, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_NONE, ITEM00_RUPEE_GREEN, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_BOMBS_A, - ITEM00_ARROWS_SMALL, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_SMALL, - ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_LARGE, ITEM00_ARROWS_LARGE, ITEM00_ARROWS_MEDIUM, - ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, ITEM00_FLEXIBLE, ITEM00_ARROWS_SMALL, - ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, - ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_LARGE, ITEM00_ARROWS_LARGE, ITEM00_MAGIC_LARGE, - ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, - ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, - ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, - ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_FLEXIBLE, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_NONE, - ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, - ITEM00_BOMBS_A, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, - ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, - ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, - ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, - ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_NUTS, ITEM00_NONE, ITEM00_STICK, ITEM00_NONE, ITEM00_NONE, - ITEM00_SEEDS, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_NUTS, - ITEM00_NONE, ITEM00_NUTS, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_RECOVERY_HEART, - ITEM00_NONE, ITEM00_SEEDS, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, - ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_FLEXIBLE, + // 0 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_BLUE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_GREEN, + ITEM00_MAGIC_SMALL, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + ITEM00_FLEXIBLE, + ITEM00_SEEDS, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_RUPEE_BLUE, + + // 1 + ITEM00_RUPEE_GREEN, + ITEM00_MAGIC_SMALL, + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_BLUE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_FLEXIBLE, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + + // 2 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_GREEN, + ITEM00_MAGIC_SMALL, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_FLEXIBLE, + ITEM00_MAGIC_SMALL, + + // 3 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_GREEN, + ITEM00_NUTS, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_SEEDS, + ITEM00_NUTS, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_FLEXIBLE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + + // 4 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_GREEN, + ITEM00_SEEDS, + ITEM00_BOMBS_A, + ITEM00_MAGIC_SMALL, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + + // 5 + ITEM00_RUPEE_GREEN, + ITEM00_MAGIC_SMALL, + ITEM00_RUPEE_GREEN, + ITEM00_NONE, + ITEM00_RUPEE_BLUE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_FLEXIBLE, + ITEM00_SEEDS, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + + // 6 + ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_BLUE, + ITEM00_NONE, + ITEM00_RUPEE_GREEN, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_ARROWS_SMALL, + ITEM00_NONE, + ITEM00_ARROWS_MEDIUM, + ITEM00_MAGIC_SMALL, + ITEM00_FLEXIBLE, + ITEM00_NONE, + ITEM00_MAGIC_LARGE, + + // 7 + ITEM00_RUPEE_GREEN, + ITEM00_NONE, + ITEM00_RUPEE_BLUE, + ITEM00_NONE, + ITEM00_RUPEE_GREEN, + ITEM00_RECOVERY_HEART, + ITEM00_FLEXIBLE, + ITEM00_BOMBS_A, + ITEM00_ARROWS_SMALL, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_MAGIC_SMALL, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_MAGIC_LARGE, + + // 8 + ITEM00_ARROWS_LARGE, + ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_FLEXIBLE, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_LARGE, + ITEM00_ARROWS_LARGE, + + // 9 + ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, + + // 10 + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_FLEXIBLE, + ITEM00_BOMBS_A, + ITEM00_BOMBS_A, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_BOMBS_A, + ITEM00_NONE, + ITEM00_BOMBS_A, + + // 11 + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + + // 12 + ITEM00_RUPEE_RED, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, + + // 13 + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_NUTS, + ITEM00_NONE, + ITEM00_STICK, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_NUTS, + ITEM00_NONE, + ITEM00_NUTS, + ITEM00_RECOVERY_HEART, + ITEM00_SEEDS, + + // 14 + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_SEEDS, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_NONE, + ITEM00_RECOVERY_HEART, + ITEM00_SEEDS, + ITEM00_FLEXIBLE, }; static u8 sDropQuantities[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 1, 1, 3, 1, 3, 1, 1, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, // 3 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, // 4 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, // 5 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 6 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 7 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 8 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 9 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, // 10 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 11 + 3, 3, 3, 1, 3, 3, 3, 1, 1, 3, 1, 3, 1, 1, 1, 3, // 12 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 13 + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, // 14 }; void EnItem00_SetupAction(EnItem00* this, EnItem00ActionFunc actionFunc) { @@ -984,7 +1213,7 @@ EnItem00* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, s16 params) { (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { spawnedActor->actor.room = -1; } - spawnedActor->actor.flags |= ACTOR_FLAG_4; + spawnedActor->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } } @@ -1016,7 +1245,7 @@ EnItem00* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s16 params) { spawnedActor->actor.speed = 0.0f; spawnedActor->actor.gravity = param4000 ? 0.0f : -0.9f; spawnedActor->actor.world.rot.y = Rand_CenteredFloat(65536.0f); - spawnedActor->actor.flags |= ACTOR_FLAG_4; + spawnedActor->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } } @@ -1130,7 +1359,7 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP spawnedActor->actor.world.rot.y = Rand_ZeroOne() * 40000.0f; Actor_SetScale(&spawnedActor->actor, 0.0f); EnItem00_SetupAction(spawnedActor, func_8001E304); - spawnedActor->actor.flags |= ACTOR_FLAG_4; + spawnedActor->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if ((spawnedActor->actor.params != ITEM00_SMALL_KEY) && (spawnedActor->actor.params != ITEM00_HEART_PIECE) && (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { diff --git a/src/code/code_8006C3A0.c b/src/code/z_env_flags.c similarity index 100% rename from src/code/code_8006C3A0.c rename to src/code/z_env_flags.c diff --git a/src/code/z_horse.c b/src/code/z_horse.c index d3d66c3de6..2935a66f89 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -1,30 +1,47 @@ -#include "global.h" #include "terminal.h" +#include "z_lib.h" +#include "regs.h" +#include "z64horse.h" +#include "z64play.h" +#include "z64player.h" #include "src/overlays/actors/ovl_En_Horse/z_en_horse.h" -s32 func_8006CFC0(s32 sceneId) { +/** + * Tests if the player horse can be spawned + * + * @param sceneId the checked scene + * @return true if the player horse can appear in the scene, else false + */ +s32 Horse_CanSpawn(s32 sceneId) { s32 validSceneIds[] = { SCENE_HYRULE_FIELD, SCENE_LAKE_HYLIA, SCENE_GERUDO_VALLEY, SCENE_GERUDOS_FORTRESS, SCENE_LON_LON_RANCH }; s32 i; for (i = 0; i < ARRAY_COUNT(validSceneIds); i++) { if (sceneId == validSceneIds[i]) { - return 1; + return true; } } - return 0; + return false; } -void func_8006D074(PlayState* play) { +/** + * Sets horseData to a neutral spawn in Hyrule Field + */ +void Horse_ResetHorseData(PlayState* play) { gSaveContext.save.info.horseData.sceneId = SCENE_HYRULE_FIELD; gSaveContext.save.info.horseData.pos.x = -1840; gSaveContext.save.info.horseData.pos.y = 72; gSaveContext.save.info.horseData.pos.z = 5497; - gSaveContext.save.info.horseData.angle = -27353; + gSaveContext.save.info.horseData.angle = -0x6AD9; } -void func_8006D0AC(PlayState* play) { +/** + * Forces the player horse to spawn in a safe spot if the current spawn is in Lake Hylia + * This prevents the horse from spawning underwater after obtaining the Water Medallion + */ +void Horse_FixLakeHyliaPosition(PlayState* play) { if (gSaveContext.save.info.horseData.sceneId == SCENE_LAKE_HYLIA) { gSaveContext.save.info.horseData.sceneId = SCENE_LAKE_HYLIA; gSaveContext.save.info.horseData.pos.x = -2065; @@ -41,49 +58,59 @@ typedef struct HorseSpawn { /* 0x0A */ s16 type; } HorseSpawn; -void func_8006D0EC(PlayState* play, Player* player) { +void Horse_SetupInGameplay(PlayState* play, Player* player) { s32 i; HorseSpawn horseSpawns[] = { - { SCENE_HYRULE_FIELD, -460, 100, 6640, 0, 2 }, { SCENE_LAKE_HYLIA, -1929, -1025, 768, 0, 2 }, - { SCENE_GERUDO_VALLEY, 2566, -259, 767, 0, 2 }, { SCENE_GERUDOS_FORTRESS, -328, 10, 953, 0, 2 }, - { SCENE_LON_LON_RANCH, 928, 0, -2280, 0, 2 }, + { SCENE_HYRULE_FIELD, -460, 100, 6640, 0, HORSE_PTYPE_INACTIVE }, + { SCENE_LAKE_HYLIA, -1929, -1025, 768, 0, HORSE_PTYPE_INACTIVE }, + { SCENE_GERUDO_VALLEY, 2566, -259, 767, 0, HORSE_PTYPE_INACTIVE }, + { SCENE_GERUDOS_FORTRESS, -328, 10, 953, 0, HORSE_PTYPE_INACTIVE }, + { SCENE_LON_LON_RANCH, 928, 0, -2280, 0, HORSE_PTYPE_INACTIVE }, }; - if ((AREG(6) != 0) && (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || (DREG(1) != 0))) { - player->rideActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, player->actor.world.pos.x, - player->actor.world.pos.y, player->actor.world.pos.z, player->actor.shape.rot.x, - player->actor.shape.rot.y, player->actor.shape.rot.z, 9); + if (R_EXITED_SCENE_RIDING_HORSE && + (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED)) { + // Player entering scene on top of horse + player->rideActor = + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, player->actor.world.pos.x, player->actor.world.pos.y, + player->actor.world.pos.z, player->actor.shape.rot.x, player->actor.shape.rot.y, + player->actor.shape.rot.z, HORSE_PTYPE_PLAYER_SPAWNED_RIDING); ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 343); Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); gSaveContext.save.info.horseData.sceneId = play->sceneId; - if (play->sceneId == SCENE_GERUDOS_FORTRESS) { player->rideActor->room = -1; } } else if ((play->sceneId == SCENE_GERUDOS_FORTRESS) && (gSaveContext.minigameState == 3)) { + // Completed Horseback Archery Minigame Actor* horseActor; gSaveContext.minigameState = 0; - horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 3586.0f, 1413.0f, -402.0f, 0, 0x4000, 0, 1); + horseActor = + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 3586.0f, 1413.0f, -402.0f, 0, 0x4000, 0, HORSE_PTYPE_1); horseActor->room = -1; } else if ((gSaveContext.save.entranceIndex == ENTR_LON_LON_RANCH_7) && GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) { + // Completed Horse Race Actor* horseActor = - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, 1); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, HORSE_PTYPE_1); ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 389); } else if ((play->sceneId == gSaveContext.save.info.horseData.sceneId) && - (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || DREG(1) != 0)) { + (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED)) { + // Player enters a scene where the horse was left previously PRINTF(T("馬存在によるセット %d %d %d\n", "Set by existence of horse %d %d %d\n"), - gSaveContext.save.info.horseData.sceneId, Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED), DREG(1)); + gSaveContext.save.info.horseData.sceneId, Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED), + R_DEBUG_FORCE_EPONA_OBTAINED); - if (func_8006CFC0(gSaveContext.save.info.horseData.sceneId)) { + if (Horse_CanSpawn(gSaveContext.save.info.horseData.sceneId)) { Actor* horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, gSaveContext.save.info.horseData.pos.x, gSaveContext.save.info.horseData.pos.y, gSaveContext.save.info.horseData.pos.z, 0, - gSaveContext.save.info.horseData.angle, 0, 1); + gSaveContext.save.info.horseData.angle, 0, HORSE_PTYPE_1); ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 414); + if (play->sceneId == SCENE_GERUDOS_FORTRESS) { horseActor->room = -1; } @@ -93,13 +120,16 @@ void func_8006D0EC(PlayState* play, Player* player) { T("Horse_SetNormal():%d セットスポットまずいです。\n", "Horse_SetNormal():%d set spot is no good.\n"), gSaveContext.save.info.horseData.sceneId); PRINTF(VT_RST); - func_8006D074(play); + Horse_ResetHorseData(play); } - } else if ((play->sceneId == SCENE_LON_LON_RANCH) && !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && - (DREG(1) == 0)) { - Actor* horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, 1); + } else if ((play->sceneId == SCENE_LON_LON_RANCH) && + !(Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED)) { + // Player spawns in Lon-Lon Ranch without owning Epona + Actor* horseActor = + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, HORSE_PTYPE_1); ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 443); - } else if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || (DREG(1) != 0)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED) { + // Player owns Epona, but isn't riding her and the current scene is not the same as the horse's last location. for (i = 0; i < ARRAY_COUNT(horseSpawns); i++) { HorseSpawn* horseSpawn = &horseSpawns[i]; if (horseSpawn->sceneId == play->sceneId) { @@ -107,134 +137,145 @@ void func_8006D0EC(PlayState* play, Player* player) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, horseSpawn->pos.x, horseSpawn->pos.y, horseSpawn->pos.z, 0, horseSpawn->angle, 0, horseSpawn->type); ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 466); + if (play->sceneId == SCENE_GERUDOS_FORTRESS) { horseActor->room = -1; } - break; } } - } else if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) { - if ((DREG(1) == 0) && (play->sceneId == SCENE_LON_LON_BUILDINGS) && !IS_DAY) { - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 0.0f, 0.0f, -60.0f, 0, 0x7360, 0, 1); - } + } else if (!(Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED) && + (play->sceneId == SCENE_LON_LON_BUILDINGS) && !IS_DAY) { + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 0.0f, 0.0f, -60.0f, 0, 0x7360, 0, HORSE_PTYPE_1); } } -typedef struct struct_8011F9B8 { +typedef struct HorseCutsceneSpawn { /* 0x00 */ s16 sceneId; /* 0x04 */ s32 cutsceneIndex; /* 0x08 */ Vec3s pos; /* 0x0E */ s16 angle; /* 0x10 */ s16 type; -} struct_8011F9B8; - -void func_8006D684(PlayState* play, Player* player) { - static struct_8011F9B8 D_8011F9B8[] = { - { SCENE_GERUDOS_FORTRESS, 0xFFF0, { 3600, 1413, 360 }, 0x8001, 8 }, - { SCENE_LON_LON_RANCH, 0xFFF0, { -250, 1, -1580 }, 0x4000, 6 }, - { SCENE_LON_LON_RANCH, 0xFFF1, { 0, 0, 0 }, 0x0000, 5 }, - { SCENE_LON_LON_RANCH, 0xFFF5, { 0, 0, 0 }, 0x0000, 7 }, - { SCENE_HYRULE_FIELD, 0xFFF3, { -2961, 313, 7700 }, 0x0000, 7 }, - { SCENE_HYRULE_FIELD, 0xFFF4, { -1900, 313, 7015 }, 0x0000, 7 }, - { SCENE_HYRULE_FIELD, 0xFFF5, { -4043, 313, 6933 }, 0x0000, 7 }, - { SCENE_HYRULE_FIELD, 0xFFF6, { -4043, 313, 6933 }, 0x0000, 7 }, +} HorseCutsceneSpawn; + +void Horse_SetupInCutscene(PlayState* play, Player* player) { + static HorseCutsceneSpawn horseSpawns[] = { + { SCENE_GERUDOS_FORTRESS, 0xFFF0, { 3600, 1413, 360 }, 0x8001, HORSE_PTYPE_HORSEBACK_ARCHERY }, + { SCENE_LON_LON_RANCH, 0xFFF0, { -250, 1, -1580 }, 0x4000, HORSE_PTYPE_6 }, // Horse Race + { SCENE_LON_LON_RANCH, 0xFFF1, { 0, 0, 0 }, 0x0000, HORSE_PTYPE_5 }, // Learned Epona's Song + { SCENE_LON_LON_RANCH, 0xFFF5, { 0, 0, 0 }, 0x0000, HORSE_PTYPE_7 }, // Credits + { SCENE_HYRULE_FIELD, 0xFFF3, { -2961, 313, 7700 }, 0x0000, HORSE_PTYPE_7 }, // Title Screen + { SCENE_HYRULE_FIELD, 0xFFF4, { -1900, 313, 7015 }, 0x0000, HORSE_PTYPE_7 }, + { SCENE_HYRULE_FIELD, 0xFFF5, { -4043, 313, 6933 }, 0x0000, HORSE_PTYPE_7 }, // Credits + { SCENE_HYRULE_FIELD, 0xFFF6, { -4043, 313, 6933 }, 0x0000, HORSE_PTYPE_7 }, // Unused. Hopping Lon Lon + // Ranch North Gate }; s32 pad; s32 i; - Vec3s spawnPos; if ((gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_11 || gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_12 || gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_13 || gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_15) && (gSaveContext.respawnFlag == 0)) { + // Epona hopping over one of the Lon Lon Ranch fences + Vec3s spawnPos; Vec3s spawnPositions[] = { - { -2961, 313, 7700 }, - { -1900, 313, 7015 }, - { -4043, 313, 6933 }, - { -2313, 313, 5990 }, + // Note: The east and west positions are paired with the wrong entranceIndex. However, the subsequent + // cutscene repositions the horse will override these coordinates while the horse is still obstructed, so no + // visual glitch occurs. + { -2961, 313, 7700 }, // South + { -1900, 313, 7015 }, // East + { -4043, 313, 6933 }, // West + { -2313, 313, 5990 }, // North-East }; + // South of Lon Lon player spawn if (gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_11) { spawnPos = spawnPositions[0]; + // West of Lon Lon player spawn } else if (gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_12) { spawnPos = spawnPositions[1]; + // East of Lon Lon player spawn } else if (gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_13) { spawnPos = spawnPositions[2]; + // Lon Lon exit player spawn } else { spawnPos = spawnPositions[3]; } player->rideActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, spawnPos.x, spawnPos.y, spawnPos.z, 0, - player->actor.world.rot.y, 0, 7); + player->actor.world.rot.y, 0, HORSE_PTYPE_7); ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 561); Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); gSaveContext.save.info.horseData.sceneId = play->sceneId; - } else if ((play->sceneId == SCENE_LON_LON_RANCH) && (GET_EVENTINF_HORSES_STATE() == EVENTINF_HORSES_STATE_6) && - !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && (DREG(1) == 0)) { + } else if ((play->sceneId == SCENE_LON_LON_RANCH) && + (GET_EVENTINF_INGO_RACE_STATE() == INGO_RACE_STATE_TRAPPED_WIN_EPONA) && + !(Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED)) { player->rideActor = - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 894.0f, 0.0f, -2084.0f, 0, -0x7FFF, 0, 5); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 894.0f, 0.0f, -2084.0f, 0, -0x7FFF, 0, HORSE_PTYPE_5); ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 582); Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); gSaveContext.save.info.horseData.sceneId = play->sceneId; if (play->sceneId == SCENE_GERUDOS_FORTRESS) { player->rideActor->room = -1; } } else { - for (i = 0; i < ARRAY_COUNT(D_8011F9B8); i++) { - if ((play->sceneId == D_8011F9B8[i].sceneId) && - (((void)0, gSaveContext.save.cutsceneIndex) == D_8011F9B8[i].cutsceneIndex)) { - if (D_8011F9B8[i].type == 7) { + for (i = 0; i < ARRAY_COUNT(horseSpawns); i++) { + if ((play->sceneId == horseSpawns[i].sceneId) && + (((void)0, gSaveContext.save.cutsceneIndex) == horseSpawns[i].cutsceneIndex)) { + if (horseSpawns[i].type == HORSE_PTYPE_7) { if ((play->sceneId == SCENE_LON_LON_RANCH) && (((void)0, gSaveContext.save.cutsceneIndex) == 0xFFF1)) { - D_8011F9B8[i].pos.x = player->actor.world.pos.x; - D_8011F9B8[i].pos.y = player->actor.world.pos.y; - D_8011F9B8[i].pos.z = player->actor.world.pos.z; + horseSpawns[i].pos.x = player->actor.world.pos.x; + horseSpawns[i].pos.y = player->actor.world.pos.y; + horseSpawns[i].pos.z = player->actor.world.pos.z; } player->rideActor = - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, - D_8011F9B8[i].pos.z, 0, player->actor.world.rot.y, 0, D_8011F9B8[i].type); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, horseSpawns[i].pos.x, horseSpawns[i].pos.y, + horseSpawns[i].pos.z, 0, player->actor.world.rot.y, 0, horseSpawns[i].type); ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 628); Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); - } else if ((D_8011F9B8[i].type == 5) || (D_8011F9B8[i].type == 6) || (D_8011F9B8[i].type == 8)) { - Vec3f sp54; - s32 temp = 0; - - if (GET_EVENTINF_HORSES_HORSETYPE() != HORSE_EPONA && D_8011F9B8[i].type == 6) { - temp = 0x8000; + Actor_RequestHorseCameraSetting(play, player); + } else if ((horseSpawns[i].type == HORSE_PTYPE_5) || (horseSpawns[i].type == HORSE_PTYPE_6) || + (horseSpawns[i].type == HORSE_PTYPE_HORSEBACK_ARCHERY)) { + Vec3f eye; + s32 paramFlag = 0; + + if (GET_EVENTINF_INGO_RACE_HORSETYPE() != HORSE_EPONA && horseSpawns[i].type == HORSE_PTYPE_6) { + // HORSE_HNI + paramFlag = 0x8000; } player->rideActor = - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, - D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0, D_8011F9B8[i].type | temp); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, horseSpawns[i].pos.x, horseSpawns[i].pos.y, + horseSpawns[i].pos.z, 0, horseSpawns[i].angle, 0, horseSpawns[i].type | paramFlag); ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 667); - player->actor.world.pos.x = D_8011F9B8[i].pos.x; - player->actor.world.pos.y = D_8011F9B8[i].pos.y; - player->actor.world.pos.z = D_8011F9B8[i].pos.z; + player->actor.world.pos.x = horseSpawns[i].pos.x; + player->actor.world.pos.y = horseSpawns[i].pos.y; + player->actor.world.pos.z = horseSpawns[i].pos.z; player->actor.shape.rot.x = player->actor.shape.rot.z = 0; - player->actor.shape.rot.y = D_8011F9B8[i].angle; + player->actor.shape.rot.y = horseSpawns[i].angle; Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); - sp54.x = player->actor.world.pos.x - 200.0f; - sp54.y = player->actor.world.pos.y + 100.0f; - sp54.z = player->actor.world.pos.z; + eye.x = player->actor.world.pos.x - 200.0f; + eye.y = player->actor.world.pos.y + 100.0f; + eye.z = player->actor.world.pos.z; - Play_SetCameraAtEye(play, play->activeCamId, &player->actor.world.pos, &sp54); + Play_SetCameraAtEye(play, play->activeCamId, &player->actor.world.pos, &eye); } else { - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, - D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0, D_8011F9B8[i].type); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, horseSpawns[i].pos.x, horseSpawns[i].pos.y, + horseSpawns[i].pos.z, 0, horseSpawns[i].angle, 0, horseSpawns[i].type); } break; } @@ -242,41 +283,49 @@ void func_8006D684(PlayState* play, Player* player) { } } -void func_8006DC68(PlayState* play, Player* player) { +/** + * Initializes the player's horse, but only if required. + * + * This function should be called during `Play_Init`. + */ +void Horse_InitPlayerHorse(PlayState* play, Player* player) { if (LINK_IS_ADULT) { - if (!func_8006CFC0(gSaveContext.save.info.horseData.sceneId)) { + if (!Horse_CanSpawn(gSaveContext.save.info.horseData.sceneId)) { PRINTF(VT_COL(RED, WHITE)); PRINTF( T("Horse_Set_Check():%d セットスポットまずいです。\n", "Horse_Set_Check():%d set spot is no good.\n"), gSaveContext.save.info.horseData.sceneId); PRINTF(VT_RST); - func_8006D074(play); + Horse_ResetHorseData(play); } - if (func_8006CFC0(play->sceneId)) { + if (Horse_CanSpawn(play->sceneId)) { if (IS_CUTSCENE_LAYER || + // has hopped over one of the Lon-Lon Ranch fences ((gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_11 || gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_12 || gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_13 || gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_15) && (gSaveContext.respawnFlag == 0)) || - ((play->sceneId == SCENE_LON_LON_RANCH) && (GET_EVENTINF_HORSES_STATE() == EVENTINF_HORSES_STATE_6) && - !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && (DREG(1) == 0))) { - func_8006D684(play, player); + // trapped in Lon Lon Ranch + ((play->sceneId == SCENE_LON_LON_RANCH) && + (GET_EVENTINF_INGO_RACE_STATE() == INGO_RACE_STATE_TRAPPED_WIN_EPONA) && + !(Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED))) { + Horse_SetupInCutscene(play, player); } else { - func_8006D0EC(play, player); + Horse_SetupInGameplay(play, player); } } } } -void func_8006DD9C(Actor* actor, Vec3f* arg1, s16 arg2) { - s16 x = Math_Vec3f_Yaw(&actor->world.pos, arg1) - actor->world.rot.y; +void Horse_RotateToPoint(Actor* actor, Vec3f* pos, s16 turnAmount) { + s16 x = Math_Vec3f_Yaw(&actor->world.pos, pos) - actor->world.rot.y; - if (x > arg2) { - actor->world.rot.y += arg2; - } else if (x < -arg2) { - actor->world.rot.y -= arg2; + if (x > turnAmount) { + actor->world.rot.y += turnAmount; + } else if (x < -turnAmount) { + actor->world.rot.y -= turnAmount; } else { actor->world.rot.y += x; } diff --git a/src/code/code_80097A00.c b/src/code/z_inventory.c similarity index 99% rename from src/code/code_80097A00.c rename to src/code/z_inventory.c index b452a92e16..2f89c0565b 100644 --- a/src/code/code_80097A00.c +++ b/src/code/z_inventory.c @@ -299,7 +299,7 @@ u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) { if (equipment == EQUIP_TYPE_SWORD) { gSaveContext.save.info.equips.buttonItems[0] = ITEM_NONE; - gSaveContext.save.info.infTable[INFTABLE_1DX_INDEX] = 1; + gSaveContext.save.info.infTable[INFTABLE_INDEX_1DX] = 1; } Player_SetEquipmentData(play, player); diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index e040a840e0..db2356c41a 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -1,5 +1,5 @@ -#pragma increment_block_number "gc-eu:244 gc-eu-mq:244 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \ - "ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:248 pal-1.1:248" +#pragma increment_block_number "gc-eu:232 gc-eu-mq:232 gc-jp:212 gc-jp-ce:212 gc-jp-mq:212 gc-us:212 gc-us-mq:212" \ + "ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:240 pal-1.1:240" #include "global.h" #include "ultra64.h" diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index b400100bc9..98a3303f93 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -122,11 +122,11 @@ void Map_InitData(PlayState* play, s16 room) { extendedMapIndex = 0x15; } } else if (play->sceneId == SCENE_GERUDO_VALLEY) { - if ((LINK_AGE_IN_YEARS == YEARS_ADULT) && !GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) { + if ((LINK_AGE_IN_YEARS == YEARS_ADULT) && !GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) { extendedMapIndex = 0x16; } } else if (play->sceneId == SCENE_GERUDOS_FORTRESS) { - if (GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) { + if (GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) { extendedMapIndex = 0x17; } } @@ -497,7 +497,7 @@ void Minimap_Draw(PlayState* play) { (LINK_AGE_IN_YEARS != YEARS_ADULT)) { if ((gMapData->owEntranceFlag[sEntranceIconMapIndex] == 0xFFFF) || ((gMapData->owEntranceFlag[sEntranceIconMapIndex] != 0xFFFF) && - (gSaveContext.save.info.infTable[INFTABLE_1AX_INDEX] & + (gSaveContext.save.info.infTable[INFTABLE_INDEX_1AX] & gBitFlags[gMapData->owEntranceFlag[mapIndex]]))) { gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, @@ -517,7 +517,7 @@ void Minimap_Draw(PlayState* play) { } if ((play->sceneId == SCENE_ZORAS_FOUNTAIN) && - (gSaveContext.save.info.infTable[INFTABLE_1AX_INDEX] & gBitFlags[INFTABLE_1A9_SHIFT])) { + (gSaveContext.save.info.infTable[INFTABLE_INDEX_1AX] & gBitFlags[INFTABLE_1A9_SHIFT])) { gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); diff --git a/src/code/code_80069420.c b/src/code/z_memory_utils.c similarity index 100% rename from src/code/code_80069420.c rename to src/code/z_memory_utils.c diff --git a/src/code/z_message.c b/src/code/z_message.c index c1ab75e2d3..91eb8bbc56 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -8,7 +8,7 @@ #endif #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:112 pal-1.0:128 pal-1.1:128" + "ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:128 pal-1.1:128" #if N64_BTN_COLORS #define OCARINA_BUTTON_A_PRIM_1_R 80 @@ -907,7 +907,7 @@ f32 sFontWidths[144] = { 5.0f, // '|' 7.0f, // '}' 10.0f, // '~' - 10.0f, // '‾' + 10.0f, // ' ' 12.0f, // 'À' #if OOT_NTSC 12.0f, // 'î' @@ -3472,7 +3472,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { if (msgCtx->disableWarpSongs || interfaceCtx->restrictions.warpSongs == 3) { Message_StartTextbox(play, 0x88C, NULL); // "You can't warp here!" play->msgCtx.ocarinaMode = OCARINA_MODE_04; - } else if (GET_EVENTINF_HORSES_STATE() != EVENTINF_HORSES_STATE_1) { + } else if (GET_EVENTINF_INGO_RACE_STATE() != INGO_RACE_STATE_HORSE_RENTAL_PERIOD) { Message_StartTextbox(play, msgCtx->lastPlayedSong + 0x88D, NULL); // "Warp to [place name]?" play->msgCtx.ocarinaMode = OCARINA_MODE_01; @@ -4286,7 +4286,7 @@ void Message_Update(PlayState* play) { if (Message_ShouldAdvance(play)) { PRINTF("OCARINA_MODE=%d -> ", play->msgCtx.ocarinaMode); play->msgCtx.ocarinaMode = (msgCtx->choiceIndex == 0) ? OCARINA_MODE_02 : OCARINA_MODE_04; - PRINTF("InRaceSeq=%d(%d) OCARINA_MODE=%d --> ", GET_EVENTINF_HORSES_STATE(), 1, + PRINTF("InRaceSeq=%d(%d) OCARINA_MODE=%d --> ", GET_EVENTINF_INGO_RACE_STATE(), 1, play->msgCtx.ocarinaMode); Message_CloseTextbox(play); PRINTF("OCARINA_MODE=%d\n", play->msgCtx.ocarinaMode); diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 5ed3ecab6a..a1fb6f1fe5 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,6 +1,7 @@ #include "global.h" #include "terminal.h" #include "versions.h" +#include "z64horse.h" #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/do_action_static/do_action_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" @@ -1108,7 +1109,7 @@ void func_80083108(PlayState* play) { gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE; Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_ALL); } - } else if (GET_EVENTINF_HORSES_STATE() == EVENTINF_HORSES_STATE_1) { + } else if (GET_EVENTINF_INGO_RACE_STATE() == INGO_RACE_STATE_HORSE_RENTAL_PERIOD) { if (player->stateFlags1 & PLAYER_STATE1_23) { if ((gSaveContext.save.info.equips.buttonItems[0] != ITEM_NONE) && (gSaveContext.save.info.equips.buttonItems[0] != ITEM_BOW)) { @@ -1169,7 +1170,7 @@ void func_80083108(PlayState* play) { (gSaveContext.save.info.equips.buttonItems[0] == ITEM_BOMBCHU) || (gSaveContext.save.info.equips.buttonItems[0] == ITEM_NONE)) { if ((gSaveContext.save.info.equips.buttonItems[0] != ITEM_NONE) || - (gSaveContext.save.info.infTable[INFTABLE_1DX_INDEX] == 0)) { + (gSaveContext.save.info.infTable[INFTABLE_INDEX_1DX] == 0)) { gSaveContext.save.info.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; sp28 = true; @@ -1193,7 +1194,7 @@ void func_80083108(PlayState* play) { (gSaveContext.save.info.equips.buttonItems[0] == ITEM_BOMBCHU) || (gSaveContext.save.info.equips.buttonItems[0] == ITEM_NONE)) { if ((gSaveContext.save.info.equips.buttonItems[0] != ITEM_NONE) || - (gSaveContext.save.info.infTable[INFTABLE_1DX_INDEX] == 0)) { + (gSaveContext.save.info.infTable[INFTABLE_INDEX_1DX] == 0)) { gSaveContext.save.info.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; sp28 = true; @@ -1665,7 +1666,7 @@ void func_80084BF4(PlayState* play, u16 flag) { } } else if (gSaveContext.save.info.equips.buttonItems[0] == ITEM_NONE) { if ((gSaveContext.save.info.equips.buttonItems[0] != ITEM_NONE) || - (gSaveContext.save.info.infTable[INFTABLE_1DX_INDEX] == 0)) { + (gSaveContext.save.info.infTable[INFTABLE_INDEX_1DX] == 0)) { gSaveContext.save.info.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; Interface_LoadItemIcon1(play, 0); } @@ -1707,7 +1708,7 @@ u8 Item_Give(PlayState* play, u8 item) { PRINTF(VT_RST); if (item == ITEM_MEDALLION_WATER) { - func_8006D0AC(play); + Horse_FixLakeHyliaPosition(play); } return ITEM_NONE; @@ -2148,7 +2149,8 @@ u8 Item_Give(PlayState* play, u8 item) { } } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) { if (!FIX_ANNOYING_GLITCH && item == ITEM_POACHERS_SAW) { - SET_ITEMGETINF(ITEMGETINF_1F); + //! @bug Setting this shared flag makes getting the Deku Nut upgrade impossible + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE); } temp = INV_CONTENT(item); @@ -3932,10 +3934,11 @@ void Interface_Draw(PlayState* play) { for (svar1 = 0; svar1 < ARRAY_COUNT(gSpoilingItems); svar1++) { if (INV_CONTENT(ITEM_TRADE_ADULT) == gSpoilingItems[svar1]) { #if OOT_VERSION >= NTSC_1_1 - gSaveContext.eventInf[EVENTINF_HORSES_INDEX] &= - (u16) ~(EVENTINF_HORSES_STATE_MASK | EVENTINF_HORSES_HORSETYPE_MASK | EVENTINF_HORSES_05_MASK | - EVENTINF_HORSES_06_MASK | EVENTINF_HORSES_0F_MASK); - PRINTF("EVENT_INF=%x\n", gSaveContext.eventInf[EVENTINF_HORSES_INDEX]); + gSaveContext.eventInf[EVENTINF_INDEX_HORSES] &= + (u16) ~(EVENTINF_INGO_RACE_STATE_MASK | EVENTINF_MASK(EVENTINF_INGO_RACE_HORSETYPE) | + EVENTINF_MASK(EVENTINF_INGO_RACE_LOST_ONCE) | + EVENTINF_MASK(EVENTINF_INGO_RACE_SECOND_RACE) | EVENTINF_MASK(EVENTINF_INGO_RACE_0F)); + PRINTF("EVENT_INF=%x\n", gSaveContext.eventInf[EVENTINF_INDEX_HORSES]); #endif play->nextEntranceIndex = spoilingItemEntrances[svar1]; INV_CONTENT(gSpoilingItemReverts[svar1]) = gSpoilingItemReverts[svar1]; diff --git a/src/code/z_play.c b/src/code/z_play.c index 1c2bc924ff..ebeda310b2 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -5,6 +5,7 @@ #include "terminal.h" #include "config.h" #include "versions.h" +#include "line_numbers.h" #if PLATFORM_N64 #include "n64dd.h" #endif @@ -181,21 +182,7 @@ void Play_SetupTransition(PlayState* this, s32 transitionType) { break; default: -#if OOT_VERSION < NTSC_1_1 - HUNGUP_AND_CRASH("../z_play.c", 2263); -#elif OOT_VERSION < PAL_1_0 - HUNGUP_AND_CRASH("../z_play.c", 2266); -#elif OOT_VERSION < PAL_1_1 - HUNGUP_AND_CRASH("../z_play.c", 2269); -#elif OOT_VERSION < GC_JP - HUNGUP_AND_CRASH("../z_play.c", 2272); -#elif OOT_VERSION < GC_EU_MQ_DBG - HUNGUP_AND_CRASH("../z_play.c", 2287); -#elif OOT_VERSION < GC_JP_CE - HUNGUP_AND_CRASH("../z_play.c", 2290); -#else - HUNGUP_AND_CRASH("../z_play.c", 2293); -#endif + HUNGUP_AND_CRASH("../z_play.c", LN5(2263, 2266, 2269, 2272, 2287, 2290, 2293)); break; } } @@ -517,8 +504,9 @@ void Play_Init(GameState* thisx) { CutsceneManager_StoreCamera(&this->mainCamera); #endif - playerStartBgCamIndex = PARAMS_GET_U(player->actor.params, 0, 8); - if (playerStartBgCamIndex != 0xFF) { + playerStartBgCamIndex = PLAYER_GET_START_BG_CAM_INDEX(&player->actor); + + if (playerStartBgCamIndex != PLAYER_START_BG_CAM_DEFAULT) { PRINTF("player has start camera ID (" VT_FGCOL(BLUE) "%d" VT_RST ")\n", playerStartBgCamIndex); Camera_RequestBgCam(&this->mainCamera, playerStartBgCamIndex); } @@ -535,7 +523,7 @@ void Play_Init(GameState* thisx) { Environment_PlaySceneSequence(this); gSaveContext.seqId = this->sceneSequences.seqId; gSaveContext.natureAmbienceId = this->sceneSequences.natureAmbienceId; - func_8002DF18(this, GET_PLAYER(this)); + Actor_InitPlayerHorse(this, GET_PLAYER(this)); AnimTaskQueue_Update(this, &this->animTaskQueue); gSaveContext.respawnFlag = 0; @@ -2192,6 +2180,7 @@ void Play_LoadToLastEntrance(PlayState* this) { (gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_12) || (gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_13) || (gSaveContext.save.entranceIndex == ENTR_HYRULE_FIELD_15)) { + // Avoid re-triggering the hop over Lon Lon fence cutscenes this->nextEntranceIndex = ENTR_HYRULE_FIELD_6; #endif } else { @@ -2202,7 +2191,7 @@ void Play_LoadToLastEntrance(PlayState* this) { } void Play_TriggerRespawn(PlayState* this) { - Play_SetupRespawnPoint(this, RESPAWN_MODE_DOWN, 0xDFF); + Play_SetupRespawnPoint(this, RESPAWN_MODE_DOWN, PLAYER_PARAMS(PLAYER_START_MODE_IDLE, PLAYER_START_BG_CAM_DEFAULT)); Play_LoadToLastEntrance(this); } diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index d6a473120e..b922f56638 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -1,8 +1,8 @@ #include "global.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES) #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ntsc-1.2:128 pal-1.1:128" diff --git a/src/code/z_room.c b/src/code/z_room.c index 6d523137cc..0005386348 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -2,6 +2,7 @@ #include "fault.h" #include "terminal.h" #include "versions.h" +#include "line_numbers.h" #if PLATFORM_N64 #include "n64dd.h" #endif @@ -458,14 +459,11 @@ RoomShapeImageMultiBgEntry* Room_GetImageMultiBgEntry(RoomShapeImageMulti* roomS PRINTF(VT_COL(RED, WHITE) T("z_room.c:カメラＩＤに一致するデータが存在しません camid=%d\n", "z_room.c: Data consistent with camera id does not exist camid=%d\n") VT_RST, bgCamIndex); -#if OOT_VERSION < NTSC_1_1 - Fault_AddHungupAndCrash("../z_room.c", 724); -#elif OOT_VERSION < PAL_1_0 - Fault_AddHungupAndCrash("../z_room.c", 727); -#elif OOT_VERSION < GC_JP - Fault_AddHungupAndCrash("../z_room.c", 721); -#else + +#if !PLATFORM_N64 LogUtils_HungupThread("../z_room.c", 726); +#else + Fault_AddHungupAndCrash("../z_room.c", LN2(724, 727, 721)); #endif return NULL; @@ -549,14 +547,10 @@ void Room_DrawImage(PlayState* play, Room* room, u32 flags) { } else if (roomShape->amountType == ROOM_SHAPE_IMAGE_AMOUNT_MULTI) { Room_DrawImageMulti(play, room, flags); } else { -#if OOT_VERSION < NTSC_1_1 - Fault_AddHungupAndCrash("../z_room.c", 849); -#elif OOT_VERSION < PAL_1_0 - Fault_AddHungupAndCrash("../z_room.c", 852); -#elif OOT_VERSION < GC_JP - Fault_AddHungupAndCrash("../z_room.c", 836); -#else +#if !PLATFORM_N64 LogUtils_HungupThread("../z_room.c", 841); +#else + Fault_AddHungupAndCrash("../z_room.c", LN2(849, 852, 836)); #endif } } diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index cf391ab121..bcdffb2f23 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1237,7 +1237,7 @@ void Scene_DrawConfigLakeHylia(PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7058); - if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69))) { + if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA))) { play->roomCtx.drawParams[0] = 87; } diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index a953bdb214..d219815102 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -849,7 +849,7 @@ AnimTask* AnimTaskQueue_NewTask(AnimTaskQueue* animTaskQueue, s32 type) { return task; } -#if PLATFORM_N64 +#if !PLATFORM_GC #define LINK_ANIMATION_OFFSET(addr, offset) \ (((uintptr_t)_link_animetionSegmentRomStart) + SEGMENT_OFFSET(addr) + (offset)) #else diff --git a/src/code/z_sram.c b/src/code/z_sram.c index fe500027bc..377615e10b 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -162,7 +162,7 @@ void Sram_InitNewSave(void) { gSaveContext.save.info.horseData.pos.z = 5497; gSaveContext.save.info.horseData.angle = -0x6AD9; gSaveContext.save.info.playerData.magicLevel = 0; - gSaveContext.save.info.infTable[INFTABLE_1DX_INDEX] = 1; + gSaveContext.save.info.infTable[INFTABLE_INDEX_1DX] = 1; gSaveContext.save.info.sceneFlags[SCENE_WATER_TEMPLE].swch = 0x40000000; } @@ -325,8 +325,15 @@ void Sram_InitDebugSave(void) { gSaveContext.save.info.horseData.pos.y = 72; gSaveContext.save.info.horseData.pos.z = 5497; gSaveContext.save.info.horseData.angle = -0x6AD9; - gSaveContext.save.info.infTable[0] |= 0x5009; - gSaveContext.save.info.eventChkInf[0] |= 0x123F; + gSaveContext.save.info.infTable[INFTABLE_INDEX_0] |= INFTABLE_MASK(INFTABLE_00) | INFTABLE_MASK(INFTABLE_03) | + INFTABLE_MASK(INFTABLE_0C) | INFTABLE_MASK(INFTABLE_0E); + + gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_0] |= + EVENTCHKINF_MASK(EVENTCHKINF_00_UNUSED) | EVENTCHKINF_MASK(EVENTCHKINF_01_UNUSED) | + EVENTCHKINF_MASK(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS) | EVENTCHKINF_MASK(EVENTCHKINF_03) | + EVENTCHKINF_MASK(EVENTCHKINF_04) | EVENTCHKINF_MASK(EVENTCHKINF_05) | EVENTCHKINF_MASK(EVENTCHKINF_09) | + EVENTCHKINF_MASK(EVENTCHKINF_0C); + SET_EVENTCHKINF(EVENTCHKINF_80); SET_EVENTCHKINF(EVENTCHKINF_C4); @@ -498,8 +505,8 @@ void Sram_OpenSave(SramContext* sramCtx) { // if zelda cutscene has been watched but lullaby was not obtained, restore cutscene and take away letter if (GET_EVENTCHKINF(EVENTCHKINF_40) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) { - i = gSaveContext.save.info.eventChkInf[EVENTCHKINF_40_INDEX] & ~EVENTCHKINF_40_MASK; - gSaveContext.save.info.eventChkInf[EVENTCHKINF_40_INDEX] = i; + i = gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_40] & ~EVENTCHKINF_MASK(EVENTCHKINF_40); + gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_40] = i; INV_CONTENT(ITEM_ZELDAS_LETTER) = ITEM_CHICKEN; diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index 59fa5df2d0..0d2f5716fa 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -86,7 +86,7 @@ void ViMode_Configure(ViMode* viMode, s32 type, s32 tvType, s32 loRes, s32 antia yScaleHiOddField = modeF ? (loResInterlaced ? (F210(0.75) << 16) : (F210(0.5) << 16)) : 0; viMode->customViMode.type = type; - viMode->customViMode.comRegs.ctrl = VI_CTRL_PIXEL_ADV_3 | VI_CTRL_GAMMA_ON | VI_CTRL_GAMMA_DITHER_ON | + viMode->customViMode.comRegs.ctrl = VI_CTRL_PIXEL_ADV(3) | VI_CTRL_GAMMA_ON | VI_CTRL_GAMMA_DITHER_ON | (!loResDeinterlaced ? VI_CTRL_SERRATE_ON : 0) | (antialiasOn ? VI_CTRL_DIVOT_ON : 0) | (fb32Bit ? VI_CTRL_TYPE_32 : VI_CTRL_TYPE_16); diff --git a/src/elf_message/elf_message_field.c b/src/elf_message/elf_message_field.c index bcdb71caf8..505649afda 100644 --- a/src/elf_message/elf_message_field.c +++ b/src/elf_message/elf_message_field.c @@ -11,7 +11,7 @@ QuestHintCmd gOverworldNaviQuestHints[] = { QUEST_HINT_STRENGTH_UPG(CHECK, 0, true, 0x46), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_25, false, 0x47), QUEST_HINT_MAGIC(CHECK, false, 0x48), - QUEST_HINT_FLAG(CHECK, EVENTCHKINF_33, false, 0x49), + QUEST_HINT_FLAG(CHECK, EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA, false, 0x49), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_37, false, 0x4A), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_80, false, 0x4B), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_43, false, 0x4C), diff --git a/src/libc/absf.s b/src/libc/absf.s index b423334614..58450e7791 100644 --- a/src/libc/absf.s +++ b/src/libc/absf.s @@ -1,15 +1,9 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -#if DEBUG_FEATURES -.set noreorder -#endif - -.section .text - -.balign 16 +.text LEAF(absf) - abs.s $f0, $f12 - jr $ra - nop + abs.s fv0, fa0 + jr ra END(absf) diff --git a/src/libc/sqrt.s b/src/libc/sqrt.s index 6ffb2b7085..1d69d3adb2 100644 --- a/src/libc/sqrt.s +++ b/src/libc/sqrt.s @@ -1,15 +1,9 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -#if DEBUG_FEATURES -.set noreorder -#endif - -.section .text - -.balign 16 +.text LEAF(sqrt) - sqrt.d $f0, $f12 - jr $ra - nop + sqrt.d fv0, fa0 + jr ra END(sqrt) diff --git a/src/libc64/__osMalloc_gc.c b/src/libc64/__osMalloc_gc.c index f2770767fa..0338ecf3f8 100644 --- a/src/libc64/__osMalloc_gc.c +++ b/src/libc64/__osMalloc_gc.c @@ -3,7 +3,7 @@ #include "libc64/os_malloc.h" #include "terminal.h" -#if PLATFORM_GC +#if !PLATFORM_N64 #define FILL_ALLOC_BLOCK_FLAG (1 << 0) #define FILL_FREE_BLOCK_FLAG (1 << 1) diff --git a/src/libc64/fp.s b/src/libc64/fp.s index d5b42094a3..32c084ef56 100644 --- a/src/libc64/fp.s +++ b/src/libc64/fp.s @@ -1,12 +1,26 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noreorder +.data -.section .data +#if !PLATFORM_N64 -.balign 16 +DATA(gPositiveInfinity) + .word 0x7F800000 +ENDDATA(gPositiveInfinity) + +DATA(gNegativeInfinity) + .word 0xFF800000 +ENDDATA(gNegativeInfinity) + +DATA(gPositiveZero) + .word 0x00000000 +ENDDATA(gPositiveZero) + +DATA(gNegativeZero) + .word 0x80000000 +ENDDATA(gNegativeZero) -#if !PLATFORM_N64 DATA(qNaN0x3FFFFF) .word 0x7FBFFFFF ENDDATA(qNaN0x3FFFFF) @@ -18,150 +32,135 @@ ENDDATA(qNaN0x10000) DATA(sNaN0x3FFFFF) .word 0x7FFFFFFF ENDDATA(sNaN0x3FFFFF) -#endif -.section .text +#endif -.balign 16 +.text LEAF(floorf) - floor.w.s $f12, $f12 - jr $ra - cvt.s.w $f0, $f12 + floor.w.s fa0, fa0 + cvt.s.w fv0, fa0 + jr ra END(floorf) LEAF(floor) - floor.w.d $f12, $f12 - jr $ra - cvt.d.w $f0, $f12 + floor.w.d fa0, fa0 + cvt.d.w fv0, fa0 + jr ra END(floor) LEAF(lfloorf) - floor.w.s $f4, $f12 - mfc1 $v0, $f4 - jr $ra - nop + floor.w.s ft0, fa0 + mfc1 v0, ft0 + jr ra END(lfloorf) LEAF(lfloor) - floor.w.d $f4, $f12 - mfc1 $v0, $f4 - jr $ra - nop + floor.w.d ft0, fa0 + mfc1 v0, ft0 + jr ra END(lfloor) LEAF(ceilf) - ceil.w.s $f12, $f12 - jr $ra - cvt.s.w $f0, $f12 + ceil.w.s fa0, fa0 + cvt.s.w fv0, fa0 + jr ra END(ceilf) LEAF(ceil) - ceil.w.d $f12, $f12 - jr $ra - cvt.d.w $f0, $f12 + ceil.w.d fa0, fa0 + cvt.d.w fv0, fa0 + jr ra END(ceil) LEAF(lceilf) - ceil.w.s $f4, $f12 - mfc1 $v0, $f4 - jr $ra - nop + ceil.w.s ft0, fa0 + mfc1 v0, ft0 + jr ra END(lceilf) LEAF(lceil) - ceil.w.d $f4, $f12 - mfc1 $v0, $f4 - jr $ra - nop + ceil.w.d ft0, fa0 + mfc1 v0, ft0 + jr ra END(lceil) LEAF(truncf) - trunc.w.s $f12, $f12 - jr $ra - cvt.s.w $f0, $f12 + trunc.w.s fa0, fa0 + cvt.s.w fv0, fa0 + jr ra END(truncf) LEAF(trunc) - trunc.w.d $f12, $f12 - jr $ra - cvt.d.w $f0, $f12 + trunc.w.d fa0, fa0 + cvt.d.w fv0, fa0 + jr ra END(trunc) LEAF(ltruncf) - trunc.w.s $f4, $f12 - mfc1 $v0, $f4 - jr $ra - nop + trunc.w.s ft0, fa0 + mfc1 v0, ft0 + jr ra END(ltruncf) LEAF(ltrunc) - trunc.w.d $f4, $f12 - mfc1 $v0, $f4 - jr $ra - nop + trunc.w.d ft0, fa0 + mfc1 v0, ft0 + jr ra END(ltrunc) LEAF(nearbyintf) - round.w.s $f12, $f12 - jr $ra - cvt.s.w $f0, $f12 + round.w.s fa0, fa0 + cvt.s.w fv0, fa0 + jr ra END(nearbyintf) LEAF(nearbyint) - round.w.d $f12, $f12 - jr $ra - cvt.d.w $f0, $f12 + round.w.d fa0, fa0 + cvt.d.w fv0, fa0 + jr ra END(nearbyint) LEAF(lnearbyintf) - round.w.s $f4, $f12 - mfc1 $v0, $f4 - jr $ra - nop + round.w.s ft0, fa0 + mfc1 v0, ft0 + jr ra END(lnearbyintf) LEAF(lnearbyint) - round.w.d $f4, $f12 - mfc1 $v0, $f4 - jr $ra - nop + round.w.d ft0, fa0 + mfc1 v0, ft0 + jr ra END(lnearbyint) LEAF(roundf) - li.s $f4, 0.5 - nop - add.s $f0, $f12, $f4 - floor.w.s $f0, $f0 - jr $ra - cvt.s.w $f0, $f0 + li.s ft0, 0.5 + add.s fv0, fa0, ft0 + floor.w.s fv0, fv0 + cvt.s.w fv0, fv0 + jr ra END(roundf) LEAF(round) - li.d $f4, 0.5 - nop - add.d $f0, $f12, $f4 - floor.w.d $f0, $f0 - jr $ra - cvt.d.w $f0, $f0 + li.d ft0, 0.5 + add.d fv0, fa0, ft0 + floor.w.d fv0, fv0 + cvt.d.w fv0, fv0 + jr ra END(round) LEAF(lroundf) - li.s $f4, 0.5 - nop - add.s $f0, $f12, $f4 - floor.w.s $f0, $f0 - mfc1 $v0, $f0 - jr $ra - nop + li.s ft0, 0.5 + add.s fv0, fa0, ft0 + floor.w.s fv0, fv0 + mfc1 v0, fv0 + jr ra END(lroundf) LEAF(lround) - li.d $f4, 0.5 - nop - add.d $f0, $f12, $f4 - floor.w.d $f0, $f0 - mfc1 $v0, $f0 - jr $ra - nop + li.d ft0, 0.5 + add.d fv0, fa0, ft0 + floor.w.d fv0, fv0 + mfc1 v0, fv0 + jr ra END(lround) diff --git a/src/libgcc/__cmpdi2.s b/src/libgcc/__cmpdi2.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__divdi3.s b/src/libgcc/__divdi3.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__fixdfdi.s b/src/libgcc/__fixdfdi.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__fixsfdi.s b/src/libgcc/__fixsfdi.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__fixunsdfdi.s b/src/libgcc/__fixunsdfdi.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__fixunssfdi.s b/src/libgcc/__fixunssfdi.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__floatdidf.s b/src/libgcc/__floatdidf.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__floatdisf.s b/src/libgcc/__floatdisf.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__moddi3.s b/src/libgcc/__moddi3.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__udivdi3.s b/src/libgcc/__udivdi3.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libgcc/__umoddi3.s b/src/libgcc/__umoddi3.s new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/libleo/api/getaadr.s b/src/libleo/api/getaadr.s index a36d27a5b3..95c1cfb14d 100644 --- a/src/libleo/api/getaadr.s +++ b/src/libleo/api/getaadr.s @@ -1,42 +1,33 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text LEAF(LeoGetAAdr) - bltz $a0, .out_of_range - slti $at, $a0, 0x908 - beqz $at, .out_of_range - nop - lui $v1, %hi(asc2tbl) - sll $t0, $a0, 2 - addiu $v1, %lo(asc2tbl) - add $t1, $t0, $v1 - lbu $t8, 2($t1) - lhu $t9, 0($t1) - li $at, 0x70000 - andi $t2, $t8, 0xF - addi $t3, $t2, 1 - sw $t3, ($a2) - lb $t0, 3($t1) - srl $t4, $t8, 4 - ori $at, $at, 0xEE80 - andi $t5, $t0, 1 - sll $t6, $t5, 4 - or $t7, $t6, $t4 - sw $t7, ($a1) - sll $v0, $t9, 1 - sra $v1, $t0, 1 - sw $v1, ($a3) - jr $ra - add $v0, $v0, $at + bltz a0, .out_of_range + bge a0, 0x908, .out_of_range + sll t0, a0, 2 + la v1, asc2tbl + add t1, t0, v1 + lbu t8, 2(t1) + lhu t9, 0(t1) + andi t2, t8, 0xF + addi t3, t2, 1 + sw t3, (a2) + lb t0, 3(t1) + srl t4, t8, 4 + andi t5, t0, 1 + sll t6, t5, 4 + or t7, t6, t4 + sw t7, (a1) + sll v0, t9, 1 + sra v1, t0, 1 + sw v1, (a3) + add v0, v0, 0x7EE80 + jr ra .out_of_range: - jr $ra - li $v0, -1 + li v0, -1 + jr ra END(LeoGetAAdr) DATA(asc2tbl) diff --git a/src/libleo/api/getaadr2.s b/src/libleo/api/getaadr2.s index e3ea0868bb..cac52cd90b 100644 --- a/src/libleo/api/getaadr2.s +++ b/src/libleo/api/getaadr2.s @@ -1,33 +1,25 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text LEAF(LeoGetAAdr2) - li $at, 0x10000 - srl $t8, $a0, 0xF - ori $at, $at, 0xFFFE - and $v1, $t8, $at - li $at, 0x70000 - ori $at, $at, 0xEE80 - srl $t2, $a0, 0x8 - add $v0, $v1, $at - andi $t3, $t2, 0xF - andi $t5, $a0, 0xFE - addi $t4, $t3, 1 - sll $t6, $t5, 0x18 - andi $t9, $a0, 0x1 - srl $v1, $a0, 0xC - sw $t4, ($a2) - sra $t7, $t6, 0x19 - sll $t8, $t9, 0x4 - andi $t1, $v1, 0xF - sw $t7, ($a3) - or $t2, $t1, $t8 - jr $ra - sw $t2, ($a1) + srl t8, a0, 15 + and v1, t8, 0x1FFFE + add v0, v1, 0x7EE80 + srl t2, a0, 8 + andi t3, t2, 0xF + andi t5, a0, 0xFE + addi t4, t3, 1 + sll t6, t5, 24 + andi t9, a0, 1 + srl v1, a0, 12 + sw t4, (a2) + sra t7, t6, 25 + sll t8, t9, 4 + andi t1, v1, 0xF + sw t7, (a3) + or t2, t1, t8 + sw t2, (a1) + jr ra END(LeoGetAAdr2) diff --git a/src/libleo/api/getkadr.s b/src/libleo/api/getkadr.s index 22d85cb593..d71719525a 100644 --- a/src/libleo/api/getkadr.s +++ b/src/libleo/api/getkadr.s @@ -1,11 +1,7 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text /** * int LeoGetKAdr(int sjis); @@ -22,74 +18,61 @@ * @return int Storage offset address into the N64 Disk Drive mask ROM. */ LEAF(LeoGetKAdr) - // Check if the codepoint is in the range 0x8140 to 0x9872. - li $at, 0x8140 - slt $at, $a0, $at - bnez $at, .out_of_range - li $at, 0x9873 - slt $at, $a0, $at - beqz $at, .out_of_range - // Characters with codepoints >= 0x8800 are kanji. Arrangement is regular, - // so convert index directly. - li $at, 0x8800 - slt $at, $a0, $at - bnez $at, .nonkanji - // 0xBC is number of glyphs in one block in the `kanji` file: - // 0x100 possible codepoints with the same byte1 - // - 0x40 unused at beginning - // - 1 unused at 0x7F - // - 3 unused at 0xFD, 0xFE, 0xFF - li $a2, 0xBC - // Get byte1 and adjust so starts at 0 - srl $a1, $a0, 8 - addi $a1, $a1, -0x88 - multu $a2, $a1 - // Get byte2 and adjust so starts at 0 - andi $a3, $a0, 0xFF - addi $a3, $a3, -0x40 - slti $at, $a3, (0x80 - 0x40) - mflo $a2 - // 0x__7F is always empty and elided in the file, so decrement if larger - bnezl $at, .kanji_lower_halfblock - mflo $a2 - addi $a3, $a3, -1 - mflo $a2 + /* Check if the codepoint is in the range 0x8140 to 0x9872. */ + blt a0, 0x8140, .out_of_range + bge a0, 0x9873, .out_of_range + /* Characters with codepoints >= 0x8800 are kanji. Arrangement is regular, + * so convert index directly. */ + li a2, 0xBC + blt a0, 0x8800, .nonkanji + /* 0xBC is number of glyphs in one block in the `kanji` file: + * 0x100 possible codepoints with the same byte1 + * - 0x40 unused at beginning + * - 1 unused at 0x7F + * - 3 unused at 0xFD, 0xFE, 0xFF */ + /* Get byte1 and adjust so starts at 0 */ + srl a1, a0, 8 + addi a1, a1, -0x88 + mul a2, a2, a1 + /* Get byte2 and adjust so starts at 0 */ + andi a3, a0, 0xFF + addi a3, a3, -0x40 + /* 0x__7F is always empty and elided in the file, so decrement if larger */ + blt a3, 0x40, .kanji_lower_halfblock + addi a3, a3, -1 .kanji_lower_halfblock: - addi $a3, $a3, 0x30A - add $a3, $a3, $a2 - jr $ra - sll $v0, $a3, 7 - // returns (0x30A + (adjusted byte2) + (adjusted byte1) * 0xBC) * FONT_CHAR_TEX_SIZE + mflo a2 + addi a3, a3, 0x30A + add a3, a3, a2 + sll v0, a3, 7 + jr ra + /* returns (0x30A + (adjusted byte2) + (adjusted byte1) * 0xBC) * FONT_CHAR_TEX_SIZE */ -// Non-kanji are arranged with irregular gaps, use the lookup table. +/* Non-kanji are arranged with irregular gaps, use the lookup table. */ .nonkanji: - // Get byte1 and adjust so starts at 0 - srl $a1, $a0, 8 - addi $a1, $a1, -0x81 - multu $a2, $a1 - // Get byte2 and adjust so starts at 0 - andi $a3, $a0, 0xFF - addi $a3, $a3, -0x40 - slti $at, $a3, (0x80 - 0x40) - mflo $a2 - // 0x__7F is always empty and elided in the file, so decrement if larger - bnezl $at, .nonkanji_lower_halfblock - mflo $a2 - addi $a3, $a3, -1 - mflo $a2 + /* Get byte1 and adjust so starts at 0 */ + srl a1, a0, 8 + addi a1, a1, -0x81 + mul a2, a2, a1 + /* Get byte2 and adjust so starts at 0 */ + andi a3, a0, 0xFF + addi a3, a3, -0x40 + /* 0x__7F is always empty and elided in the file, so decrement if larger */ + blt a3, 0x40, .nonkanji_lower_halfblock + addi a3, a3, -1 .nonkanji_lower_halfblock: - add $a3, $a3, $a2 - lui $a2, %hi(kantbl) - sll $a3, $a3, 1 - addiu $a2, %lo(kantbl) - add $a3, $a3, $a2 - lh $a2, ($a3) - jr $ra - sll $v0, $a2, 7 - // returns kantbl[(adjusted byte2) + (adjusted byte1) * 0xBC] * FONT_CHAR_TEX_SIZE + mflo a2 + add a3, a3, a2 + sll a3, a3, 1 + la a2, kantbl + add a3, a3, a2 + lh a2, (a3) + sll v0, a2, 7 + jr ra + /* returns kantbl[(adjusted byte2) + (adjusted byte1) * 0xBC] * FONT_CHAR_TEX_SIZE */ .out_of_range: - jr $ra - li $v0, -1 + li v0, -1 + jr ra END(LeoGetKAdr) /** @@ -129,7 +112,7 @@ END(LeoGetKAdr) * into blocks by high byte. */ DATA(kantbl) -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x814_ */ .half 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F /* 0x815_ */ .half 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F /* 0x816_ */ .half 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F @@ -143,7 +126,7 @@ DATA(kantbl) /* 0x81E_ */ .half 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x81F_ */ .half 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0000, 0x0000, 0x0000, 0x0000, 0x0091 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x824_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0092 /* 0x825_ */ .half 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x826_ */ .half 0x009C, 0x009D, 0x009E, 0x009F, 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB @@ -157,7 +140,7 @@ DATA(kantbl) /* 0x82E_ */ .half 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118, 0x0119, 0x011A, 0x011B, 0x011C, 0x011D, 0x011E, 0x011F, 0x0120 /* 0x82F_ */ .half 0x0121, 0x0122, 0x0123, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x834_ */ .half 0x0124, 0x0125, 0x0126, 0x0127, 0x0128, 0x0129, 0x012A, 0x012B, 0x012C, 0x012D, 0x012E, 0x012F, 0x0130, 0x0131, 0x0132, 0x0133 /* 0x835_ */ .half 0x0134, 0x0135, 0x0136, 0x0137, 0x0138, 0x0139, 0x013A, 0x013B, 0x013C, 0x013D, 0x013E, 0x013F, 0x0140, 0x0141, 0x0142, 0x0143 /* 0x836_ */ .half 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149, 0x014A, 0x014B, 0x014C, 0x014D, 0x014E, 0x014F, 0x0150, 0x0151, 0x0152, 0x0153 @@ -171,7 +154,7 @@ DATA(kantbl) /* 0x83E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x83F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x844_ */ .half 0x01AB, 0x01AC, 0x01AD, 0x01AE, 0x01AF, 0x01B0, 0x01B1, 0x01B2, 0x01B3, 0x01B4, 0x01B5, 0x01B6, 0x01B7, 0x01B8, 0x01B9, 0x01BA /* 0x845_ */ .half 0x01BB, 0x01BC, 0x01BD, 0x01BE, 0x01BF, 0x01C0, 0x01C1, 0x01C2, 0x01C3, 0x01C4, 0x01C5, 0x01C6, 0x01C7, 0x01C8, 0x01C9, 0x01CA /* 0x846_ */ .half 0x01CB, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 @@ -185,7 +168,7 @@ DATA(kantbl) /* 0x84E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x84F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x854_ */ .half 0x020E, 0x020F, 0x0210, 0x0211, 0x0212, 0x0213, 0x0214, 0x0215, 0x0216, 0x0217, 0x0218, 0x0219, 0x021A, 0x021B, 0x021C, 0x021D /* 0x855_ */ .half 0x021E, 0x021F, 0x0220, 0x0221, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0222, 0x0223 /* 0x856_ */ .half 0x0224, 0x0225, 0x0226, 0x0227, 0x0228, 0x0229, 0x022A, 0x022B, 0x022C, 0x022D, 0x022E, 0x022F, 0x0230, 0x0231, 0x0232, 0x0233 @@ -199,7 +182,7 @@ DATA(kantbl) /* 0x85E_ */ .half 0x026C, 0x026D, 0x026E, 0x026F, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0275, 0x0276, 0x0277, 0x0278, 0x0279, 0x027A, 0x027B /* 0x85F_ */ .half 0x027C, 0x027D, 0x027E, 0x027F, 0x0280, 0x0281, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x864_ */ .half 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0287, 0x0288, 0x0289, 0x028A, 0x028B, 0x028C, 0x028D, 0x028E, 0x028F, 0x0290, 0x0291 /* 0x865_ */ .half 0x0292, 0x0293, 0x0294, 0x0295, 0x0296, 0x0297, 0x0298, 0x0299, 0x029A, 0x029B, 0x029C, 0x029D, 0x029E, 0x029F, 0x0000, 0x0000 /* 0x866_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 @@ -213,7 +196,7 @@ DATA(kantbl) /* 0x86E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x86F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F +/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */ /* 0x874_ */ .half 0x02C0, 0x02C1, 0x02C2, 0x02C3, 0x02C4, 0x02C5, 0x02C6, 0x02C7, 0x02C8, 0x02C9, 0x02CA, 0x02CB, 0x02CC, 0x02CD, 0x02CE, 0x02CF /* 0x875_ */ .half 0x02D0, 0x02D1, 0x02D2, 0x02D3, 0x02D4, 0x02D5, 0x02D6, 0x02D7, 0x02D8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x876_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 diff --git a/src/libu64/code_800FC620.c b/src/libu64/system_heap.c similarity index 94% rename from src/libu64/code_800FC620.c rename to src/libu64/system_heap.c index 94926d838e..1ae93e868c 100644 --- a/src/libu64/code_800FC620.c +++ b/src/libu64/system_heap.c @@ -20,13 +20,6 @@ char sNew[] = "new"; char sNew[] = ""; #endif -#if !PLATFORM_N64 -char D_80134488[0x18] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00, - 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -#endif - // possibly some kind of new() function void* func_800FC800(u32 size) { DECLARE_INTERRUPT_MASK diff --git a/src/libultra/audio/auxbus.c b/src/libultra/audio/auxbus.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/auxbus.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/copy.c b/src/libultra/audio/copy.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/copy.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/drvrnew.c b/src/libultra/audio/drvrnew.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/drvrnew.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/env.c b/src/libultra/audio/env.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/env.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/filter.c b/src/libultra/audio/filter.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/filter.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/heapalloc.c b/src/libultra/audio/heapalloc.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/heapalloc.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/load.c b/src/libultra/audio/load.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/load.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/mainbus.c b/src/libultra/audio/mainbus.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/mainbus.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/resample.c b/src/libultra/audio/resample.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/resample.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/reverb.c b/src/libultra/audio/reverb.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/reverb.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/save.c b/src/libultra/audio/save.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/save.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/sl.c b/src/libultra/audio/sl.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/sl.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/synallocfx.c b/src/libultra/audio/synallocfx.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/synallocfx.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/syndelete.c b/src/libultra/audio/syndelete.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/syndelete.c @@ -0,0 +1 @@ + diff --git a/src/libultra/audio/synthesizer.c b/src/libultra/audio/synthesizer.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/audio/synthesizer.c @@ -0,0 +1 @@ + diff --git a/src/libultra/bb/sa/common.c b/src/libultra/bb/sa/common.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/bb/sa/common.c @@ -0,0 +1 @@ + diff --git a/src/libultra/bb/sk/skapi.s b/src/libultra/bb/sk/skapi.s new file mode 100644 index 0000000000..3e80adfcd1 --- /dev/null +++ b/src/libultra/bb/sk/skapi.s @@ -0,0 +1,48 @@ +#ifdef BBPLAYER +#include "ultra64/asm.h" +#include "ultra64/regdef.h" +#include "ultra64/bcp.h" + +.text + +#define SKC(name, num) \ + LEAF(name) ;\ + .set noreorder ;\ + /* Load syscall number into v0 */ ;\ + li v0, num ;\ + /* Read from MI_SECURE_EXCEPTION_REG to */ ;\ + /* transfer control to the Secure Kernel */ ;\ + li t0, PHYS_TO_K1(MI_SECURE_EXCEPTION_REG) ;\ + lw t1, (t0) ;\ + nop ;\ + jr ra ;\ + nop ;\ + .set reorder ;\ + END(name) + +SKC(skGetId, 0) +SKC(skLaunchSetup, 1) +SKC(skLaunch, 2) +SKC(skRecryptListValid, 3) +SKC(skRecryptBegin, 4) +SKC(skRecryptData, 5) +SKC(skRecryptComputeState, 6) +SKC(skRecryptEnd, 7) +SKC(skSignHash, 8) +SKC(skVerifyHash, 9) +SKC(skGetConsumption, 10) +SKC(skAdvanceTicketWindow, 11) +SKC(skSetLimit, 12) +SKC(skExit, 13) +SKC(skKeepAlive, 14) + +/* These are not valid for a retail Secure Kernel, their usage pattern is unknown. */ + +SKC(skGetRandomKeyData, 15) +SKC(skDumpVirage, 16) +SKC(skTest2, 17) +SKC(skTest3, 18) +SKC(skResetWindow, 19) +SKC(skValidateRls, 20) + +#endif diff --git a/src/libultra/gu/libm_vals.s b/src/libultra/gu/libm_vals.s index 18de1ae4f2..91f2cadb37 100644 --- a/src/libultra/gu/libm_vals.s +++ b/src/libultra/gu/libm_vals.s @@ -1,8 +1,6 @@ #include "ultra64/asm.h" -.section .rodata - -.balign 16 +.rdata DATA(__libm_qnan_f) .word 0x7F810000 diff --git a/src/libultra/gu/rotate.c b/src/libultra/gu/rotate.c index b9108e1bc5..7d495e98ef 100644 --- a/src/libultra/gu/rotate.c +++ b/src/libultra/gu/rotate.c @@ -8,7 +8,7 @@ void guRotateF(f32 m[4][4], f32 a, f32 x, f32 y, f32 z) { f32 bc; f32 ca; f32 t; -#if !PLATFORM_N64 +#if LIBULTRA_VERSION >= LIBULTRA_VERSION_K f32 xs; f32 ys; f32 zs; @@ -27,14 +27,14 @@ void guRotateF(f32 m[4][4], f32 a, f32 x, f32 y, f32 z) { guMtxIdentF(m); -#if PLATFORM_N64 -#define xs (x * sine) -#define ys (y * sine) -#define zs (z * sine) -#else +#if LIBULTRA_VERSION >= LIBULTRA_VERSION_K xs = x * sine; ys = y * sine; zs = z * sine; +#else +#define xs (x * sine) +#define ys (y * sine) +#define zs (z * sine) #endif t = x * x; diff --git a/src/libultra/io/vimodefpalhaf1.c b/src/libultra/io/vimodefpalhaf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpalhaf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpalhan1.c b/src/libultra/io/vimodefpalhan1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpalhan1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpalhpf1.c b/src/libultra/io/vimodefpalhpf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpalhpf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpalhpf2.c b/src/libultra/io/vimodefpalhpf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpalhpf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpalhpn1.c b/src/libultra/io/vimodefpalhpn1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpalhpn1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpalhpn2.c b/src/libultra/io/vimodefpalhpn2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpalhpn2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpallaf1.c b/src/libultra/io/vimodefpallaf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpallaf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpallaf2.c b/src/libultra/io/vimodefpallaf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpallaf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpallan1.c b/src/libultra/io/vimodefpallan1.c index 37cb5ff557..5fb019cdfb 100644 --- a/src/libultra/io/vimodefpallan1.c +++ b/src/libultra/io/vimodefpallan1.c @@ -16,15 +16,15 @@ OSViMode osViModeFpalLan1 = { { // comRegs VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 | - VI_CTRL_PIXEL_ADV_3, // ctrl - WIDTH(320), // width - BURST(58, 30, 4, 69), // burst - VSYNC(625), // vSync - HSYNC(3177, 23), // hSync - LEAP(3183, 3181), // leap - HSTART(128, 768), // hStart - SCALE(2, 0), // xScale - VCURRENT(0), // vCurrent + VI_CTRL_PIXEL_ADV(3), // ctrl + WIDTH(320), // width + BURST(58, 30, 4, 69), // burst + VSYNC(625), // vSync + HSYNC(3177, 23), // hSync + LEAP(3183, 3181), // leap + HSTART(128, 768), // hStart + SCALE(2, 0), // xScale + VCURRENT(0), // vCurrent }, { // fldRegs { diff --git a/src/libultra/io/vimodefpallan2.c b/src/libultra/io/vimodefpallan2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpallan2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpallpf1.c b/src/libultra/io/vimodefpallpf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpallpf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpallpf2.c b/src/libultra/io/vimodefpallpf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpallpf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpallpn1.c b/src/libultra/io/vimodefpallpn1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpallpn1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodefpallpn2.c b/src/libultra/io/vimodefpallpn2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodefpallpn2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempalhaf1.c b/src/libultra/io/vimodempalhaf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempalhaf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempalhan1.c b/src/libultra/io/vimodempalhan1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempalhan1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempalhpf1.c b/src/libultra/io/vimodempalhpf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempalhpf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempalhpf2.c b/src/libultra/io/vimodempalhpf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempalhpf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempalhpn1.c b/src/libultra/io/vimodempalhpn1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempalhpn1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempalhpn2.c b/src/libultra/io/vimodempalhpn2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempalhpn2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempallaf1.c b/src/libultra/io/vimodempallaf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempallaf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempallaf2.c b/src/libultra/io/vimodempallaf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempallaf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempallan1.c b/src/libultra/io/vimodempallan1.c index bcc4273afb..23d53987b0 100644 --- a/src/libultra/io/vimodempallan1.c +++ b/src/libultra/io/vimodempallan1.c @@ -16,15 +16,15 @@ OSViMode osViModeMpalLan1 = { { // comRegs VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 | - VI_CTRL_PIXEL_ADV_3, // ctrl - WIDTH(320), // width - BURST(57, 30, 5, 70), // burst - VSYNC(525), // vSync - HSYNC(3089, 4), // hSync - LEAP(3097, 3098), // leap - HSTART(108, 748), // hStart - SCALE(2, 0), // xScale - VCURRENT(0), // vCurrent + VI_CTRL_PIXEL_ADV(3), // ctrl + WIDTH(320), // width + BURST(57, 30, 5, 70), // burst + VSYNC(525), // vSync + HSYNC(3089, 4), // hSync + LEAP(3097, 3098), // leap + HSTART(108, 748), // hStart + SCALE(2, 0), // xScale + VCURRENT(0), // vCurrent }, { // fldRegs { diff --git a/src/libultra/io/vimodempallan2.c b/src/libultra/io/vimodempallan2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempallan2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempallpf1.c b/src/libultra/io/vimodempallpf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempallpf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempallpf2.c b/src/libultra/io/vimodempallpf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempallpf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempallpn1.c b/src/libultra/io/vimodempallpn1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempallpn1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodempallpn2.c b/src/libultra/io/vimodempallpn2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodempallpn2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentschaf1.c b/src/libultra/io/vimodentschaf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentschaf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentschan1.c b/src/libultra/io/vimodentschan1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentschan1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentschpf1.c b/src/libultra/io/vimodentschpf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentschpf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentschpf2.c b/src/libultra/io/vimodentschpf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentschpf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentschpn1.c b/src/libultra/io/vimodentschpn1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentschpn1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentschpn2.c b/src/libultra/io/vimodentschpn2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentschpn2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentsclaf1.c b/src/libultra/io/vimodentsclaf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentsclaf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentsclaf2.c b/src/libultra/io/vimodentsclaf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentsclaf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentsclan1.c b/src/libultra/io/vimodentsclan1.c index a29d15129f..19a7160ac8 100644 --- a/src/libultra/io/vimodentsclan1.c +++ b/src/libultra/io/vimodentsclan1.c @@ -16,15 +16,15 @@ OSViMode osViModeNtscLan1 = { { // comRegs VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 | - VI_CTRL_PIXEL_ADV_3, // ctrl - WIDTH(320), // width - BURST(57, 34, 5, 62), // burst - VSYNC(525), // vSync - HSYNC(3093, 0), // hSync - LEAP(3093, 3093), // leap - HSTART(108, 748), // hStart - SCALE(2, 0), // xScale - VCURRENT(0), // vCurrent + VI_CTRL_PIXEL_ADV(3), // ctrl + WIDTH(320), // width + BURST(57, 34, 5, 62), // burst + VSYNC(525), // vSync + HSYNC(3093, 0), // hSync + LEAP(3093, 3093), // leap + HSTART(108, 748), // hStart + SCALE(2, 0), // xScale + VCURRENT(0), // vCurrent }, { // fldRegs { diff --git a/src/libultra/io/vimodentsclan2.c b/src/libultra/io/vimodentsclan2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentsclan2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentsclpf1.c b/src/libultra/io/vimodentsclpf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentsclpf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentsclpf2.c b/src/libultra/io/vimodentsclpf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentsclpf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentsclpn1.c b/src/libultra/io/vimodentsclpn1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentsclpn1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodentsclpn2.c b/src/libultra/io/vimodentsclpn2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodentsclpn2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepalhaf1.c b/src/libultra/io/vimodepalhaf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepalhaf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepalhan1.c b/src/libultra/io/vimodepalhan1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepalhan1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepalhpf1.c b/src/libultra/io/vimodepalhpf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepalhpf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepalhpf2.c b/src/libultra/io/vimodepalhpf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepalhpf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepalhpn1.c b/src/libultra/io/vimodepalhpn1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepalhpn1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepalhpn2.c b/src/libultra/io/vimodepalhpn2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepalhpn2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepallaf1.c b/src/libultra/io/vimodepallaf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepallaf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepallaf2.c b/src/libultra/io/vimodepallaf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepallaf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepallan1.c b/src/libultra/io/vimodepallan1.c index d656dc4f94..7a8db603f4 100644 --- a/src/libultra/io/vimodepallan1.c +++ b/src/libultra/io/vimodepallan1.c @@ -16,15 +16,15 @@ OSViMode osViModePalLan1 = { { // comRegs VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 | - VI_CTRL_PIXEL_ADV_3, // ctrl - WIDTH(320), // width - BURST(58, 30, 4, 69), // burst - VSYNC(625), // vSync - HSYNC(3177, 23), // hSync - LEAP(3183, 3181), // leap - HSTART(128, 768), // hStart - SCALE(2, 0), // xScale - VCURRENT(0), // vCurrent + VI_CTRL_PIXEL_ADV(3), // ctrl + WIDTH(320), // width + BURST(58, 30, 4, 69), // burst + VSYNC(625), // vSync + HSYNC(3177, 23), // hSync + LEAP(3183, 3181), // leap + HSTART(128, 768), // hStart + SCALE(2, 0), // xScale + VCURRENT(0), // vCurrent }, { // fldRegs { diff --git a/src/libultra/io/vimodepallan2.c b/src/libultra/io/vimodepallan2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepallan2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepallpf1.c b/src/libultra/io/vimodepallpf1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepallpf1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepallpf2.c b/src/libultra/io/vimodepallpf2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepallpf2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepallpn1.c b/src/libultra/io/vimodepallpn1.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepallpn1.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vimodepallpn2.c b/src/libultra/io/vimodepallpn2.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vimodepallpn2.c @@ -0,0 +1 @@ + diff --git a/src/libultra/io/vitbl.c b/src/libultra/io/vitbl.c new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/libultra/io/vitbl.c @@ -0,0 +1 @@ + diff --git a/src/libultra/libc/bcmp.s b/src/libultra/libc/bcmp.s index df6692feb5..dcd5bc0023 100644 --- a/src/libultra/libc/bcmp.s +++ b/src/libultra/libc/bcmp.s @@ -1,93 +1,89 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder +.text -.section .text +LEAF(bcmp) + xor v0, a0, a1 + blt a2, 0x10, bytecmp -.balign 16 + and v0, v0, 3 + negu t8, a0 + bnez v0, unaligncmp + + and t8, t8, 3 + subu a2, a2, t8 + beqz t8, wordcmp + + move v0, v1 + lwl v0, (a0) + lwl v1, (a1) + addu a0, a0, t8 + addu a1, a1, t8 + bne v0, v1, cmpne -LEAF(bcmp) - slti $at, $a2, 0x10 - bnez $at, bytecmp - xor $v0, $a0, $a1 - andi $v0, $v0, 3 - bnez $v0, unaligncmp - negu $t8, $a0 - andi $t8, $t8, 3 - beqz $t8, wordcmp - subu $a2, $a2, $t8 - move $v0, $v1 - lwl $v0, ($a0) - lwl $v1, ($a1) - addu $a0, $a0, $t8 - addu $a1, $a1, $t8 - bne $v0, $v1, cmpne wordcmp: - li $at, ~3 - and $a3, $a2, $at - beqz $a3, bytecmp - subu $a2, $a2, $a3 - addu $a3, $a3, $a0 - lw $v0, ($a0) + and a3, a2, ~3 + subu a2, a2, a3 + beqz a3, bytecmp + + addu a3, a3, a0 1: - lw $v1, ($a1) - addiu $a0, $a0, 4 - addiu $a1, $a1, 4 - bne $v0, $v1, cmpne - nop - bnel $a0, $a3, 1b - lw $v0, ($a0) + lw v0, (a0) + lw v1, (a1) + addu a0, a0, 4 + addu a1, a1, 4 + bne v0, v1, cmpne + bne a0, a3, 1b + b bytecmp - nop + unaligncmp: - negu $a3, $a1 - andi $a3, $a3, 3 - beqz $a3, partaligncmp - subu $a2, $a2, $a3 - addu $a3, $a3, $a0 - lbu $v0, ($a0) + negu a3, a1 + and a3, a3, 3 + subu a2, a2, a3 + beqz a3, partaligncmp + + addu a3, a3, a0 1: - lbu $v1, ($a1) - addiu $a0, $a0, 1 - addiu $a1, $a1, 1 - bne $v0, $v1, cmpne - nop - bnel $a0, $a3, 1b - lbu $v0, ($a0) + lbu v0, (a0) + lbu v1, (a1) + addu a0, a0, 1 + addu a1, a1, 1 + bne v0, v1, cmpne + bne a0, a3, 1b + partaligncmp: - li $at, ~3 - and $a3, $a2, $at - beqz $a3, bytecmp - subu $a2, $a2, $a3 - addu $a3, $a3, $a0 - lwl $v0, ($a0) + and a3, a2, ~3 + subu a2, a2, a3 + beqz a3, bytecmp + + addu a3, a3, a0 1: - lw $v1, ($a1) - lwr $v0, 3($a0) - addiu $a0, $a0, 4 - addiu $a1, $a1, 4 - bne $v0, $v1, cmpne - nop - bnel $a0, $a3, 1b - lwl $v0, ($a0) + lwl v0, (a0) + lw v1, (a1) + lwr v0, 3(a0) + addu a0, a0, 4 + addu a1, a1, 4 + bne v0, v1, cmpne + bne a0, a3, 1b + bytecmp: - blez $a2, cmpdone - addu $a3, $a2, $a0 - lbu $v0, ($a0) + addu a3, a2, a0 + blez a2, cmpdone 1: - lbu $v1, ($a1) - addiu $a0, $a0, 1 - addiu $a1, $a1, 1 - bne $v0, $v1, cmpne - nop - bnel $a0, $a3, 1b - lbu $v0, ($a0) + lbu v0, (a0) + lbu v1, (a1) + addu a0, a0, 1 + addu a1, a1, 1 + bne v0, v1, cmpne + bne a0, a3, 1b + cmpdone: - jr $ra - move $v0, $zero + move v0, zero + jr ra cmpne: - jr $ra - li $v0, 1 + li v0, 1 + jr ra END(bcmp) diff --git a/src/libultra/libc/bcopy.s b/src/libultra/libc/bcopy.s index e1240f113a..dcb6ad13c3 100644 --- a/src/libultra/libc/bcopy.s +++ b/src/libultra/libc/bcopy.s @@ -1,233 +1,211 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text LEAF(bcopy) - beqz $a2, ret - move $a3, $a1 - beq $a0, $a1, ret - slt $at, $a1, $a0 - bnezl $at, goforwards - slti $at, $a2, 0x10 - add $v0, $a0, $a2 - slt $at, $a1, $v0 - beql $at, $zero, goforwards - slti $at, $a2, 0x10 + move a3, a1 + beqz a2, ret + beq a0, a1, ret + blt a1, a0, goforwards + add v0, a0, a2 + bge a1, v0, goforwards b gobackwards - slti $at, $a2, 0x10 - slti $at, $a2, 0x10 + goforwards: - bnez $at, forwards_bytecopy - nop - andi $v0, $a0, 3 - andi $v1, $a1, 3 - beq $v0, $v1, forwalignable - nop + blt a2, 0x10, forwards_bytecopy + and v0, a0, 3 + and v1, a1, 3 + beq v0, v1, forwalignable + forwards_bytecopy: - beqz $a2, ret - nop - addu $v1, $a0, $a2 + beqz a2, ret + addu v1, a0, a2 99: - lb $v0, ($a0) - addiu $a0, $a0, 1 - addiu $a1, $a1, 1 - bne $a0, $v1, 99b - sb $v0, -1($a1) + lb v0, (a0) + addu a0, a0, 1 + sb v0, (a1) + addu a1, a1, 1 + bne a0, v1, 99b ret: - jr $ra - move $v0, $a3 + move v0, a3 + jr ra forwalignable: - beqz $v0, forwards_32 - li $at, 1 - beq $v0, $at, forw_copy3 - li $at, 2 - beql $v0, $at, forw_copy2 - lh $v0, ($a0) - lb $v0, ($a0) - addiu $a0, $a0, 1 - addiu $a1, $a1, 1 - addiu $a2, $a2, -1 + beqz v0, forwards_32 + beq v0, 1, forw_copy3 + beq v0, 2, forw_copy2 + + lb v0, (a0) + addu a0, a0, 1 + sb v0, (a1) + addu a1, a1, 1 + addu a2, a2, -1 b forwards_32 - sb $v0, -1($a1) - lh $v0, ($a0) + forw_copy2: - addiu $a0, $a0, 2 - addiu $a1, $a1, 2 - addiu $a2, $a2, -2 + lh v0, (a0) + addu a0, a0, 2 + sh v0, (a1) + addu a1, a1, 2 + addu a2, a2, -2 b forwards_32 - sh $v0, -2($a1) + forw_copy3: - lb $v0, ($a0) - lh $v1, 1($a0) - addiu $a0, $a0, 3 - addiu $a1, $a1, 3 - addiu $a2, $a2, -3 - sb $v0, -3($a1) - sh $v1, -2($a1) + lb v0, (a0) + lh v1, 1(a0) + addiu a0, a0, 3 + sb v0, (a1) + sh v1, 1(a1) + addiu a1, a1, 3 + addiu a2, a2, -3 forwards: forwards_32: - slti $at, $a2, 0x20 - bnezl $at, forwards_16_ - slti $at, $a2, 0x10 - lw $v0, ($a0) - lw $v1, 4($a0) - lw $t0, 8($a0) - lw $t1, 0xC($a0) - lw $t2, 0x10($a0) - lw $t3, 0x14($a0) - lw $t4, 0x18($a0) - lw $t5, 0x1C($a0) - addiu $a0, $a0, 0x20 - addiu $a1, $a1, 0x20 - addiu $a2, $a2, -0x20 - sw $v0, -0x20($a1) - sw $v1, -0x1C($a1) - sw $t0, -0x18($a1) - sw $t1, -0x14($a1) - sw $t2, -0x10($a1) - sw $t3, -0xC($a1) - sw $t4, -8($a1) + blt a2, 32, forwards_16 + lw v0, 0(a0) + lw v1, 4(a0) + lw t0, 8(a0) + lw t1, 12(a0) + lw t2, 16(a0) + lw t3, 20(a0) + lw t4, 24(a0) + lw t5, 28(a0) + addiu a0, a0, 32 + sw v0, 0(a1) + sw v1, 4(a1) + sw t0, 8(a1) + sw t1, 12(a1) + sw t2, 16(a1) + sw t3, 20(a1) + sw t4, 24(a1) + sw t5, 28(a1) + addiu a1, a1, 32 + addiu a2, a2, -32 b forwards_32 - sw $t5, -4($a1) + forwards_16: - slti $at, $a2, 0x10 -forwards_16_: // fake label due to branch likely optimization - bnezl $at, forwards_4_ - slti $at, $a2, 4 - lw $v0, ($a0) - lw $v1, 4($a0) - lw $t0, 8($a0) - lw $t1, 0xC($a0) - addiu $a0, $a0, 0x10 - addiu $a1, $a1, 0x10 - addiu $a2, $a2, -0x10 - sw $v0, -0x10($a1) - sw $v1, -0xC($a1) - sw $t0, -8($a1) + blt a2, 16, forwards_4 + lw v0, 0(a0) + lw v1, 4(a0) + lw t0, 8(a0) + lw t1, 12(a0) + addiu a0, a0, 16 + sw v0, 0(a1) + sw v1, 4(a1) + sw t0, 8(a1) + sw t1, 12(a1) + addiu a1, a1, 16 + addiu a2, a2, -16 b forwards_16 - sw $t1, -4($a1) + forwards_4: - slti $at, $a2, 4 -forwards_4_: // fake label due to branch likely optimization - bnez $at, forwards_bytecopy - nop - lw $v0, ($a0) - addiu $a0, $a0, 4 - addiu $a1, $a1, 4 - addiu $a2, $a2, -4 + blt a2, 4, forwards_bytecopy + + lw v0, 0(a0) + addiu a0, a0, 4 + sw v0, 0(a1) + addiu a1, a1, 4 + addiu a2, a2, -4 b forwards_4 - sw $v0, -4($a1) - slti $at, $a2, 0x10 + gobackwards: - add $a0, $a0, $a2 - bnez $at, backwards_bytecopy - add $a1, $a1, $a2 - andi $v0, $a0, 3 - andi $v1, $a1, 3 - beq $v0, $v1, backalignable - nop + add a0, a0,a2 + add a1, a1,a2 + blt a2, 16, backwards_bytecopy + + andi v0, a0, 0x3 + andi v1, a1, 0x3 + beq v0, v1, backalignable + backwards_bytecopy: - beqz $a2, ret - nop - addiu $a0, $a0, -1 - addiu $a1, $a1, -1 - subu $v1, $a0, $a2 + beqz a2, ret + addiu a0, a0, -1 + addiu a1, a1, -1 + subu v1, a0,a2 99: - lb $v0, ($a0) - addiu $a0, $a0, -1 - addiu $a1, $a1, -1 - bne $a0, $v1, 99b - sb $v0, 1($a1) - jr $ra - move $v0, $a3 + lb v0, 0(a0) + addiu a0, a0, -1 + sb v0, 0(a1) + addiu a1, a1, -1 + bne a0, v1,99b + + move v0, a3 + jr ra backalignable: - beqz $v0, backwards_32 - li $at, 3 - beq $v0, $at, back_copy3 - li $at, 2 - beql $v0, $at, back_copy2 - lh $v0, -2($a0) - lb $v0, -1($a0) - addiu $a0, $a0, -1 - addiu $a1, $a1, -1 - addiu $a2, $a2, -1 - b backwards_32 - sb $v0, ($a1) - lh $v0, -2($a0) + beqz v0, backwards + beq v0, 3, back_copy3 + beq v0, 2, back_copy2 + lb v0, -1(a0) + addiu a0, a0, -1 + sb v0, -1(a1) + addiu a1, a1, -1 + addiu a2, a2, -1 + b backwards + back_copy2: - addiu $a0, $a0, -2 - addiu $a1, $a1, -2 - addiu $a2, $a2, -2 - b backwards_32 - sh $v0, ($a1) + lh v0, -2(a0) + addiu a0, a0, -2 + sh v0, -2(a1) + addiu a1, a1, -2 + addiu a2, a2, -2 + b backwards + back_copy3: - lb $v0, -1($a0) - lh $v1, -3($a0) - addiu $a0, $a0, -3 - addiu $a1, $a1, -3 - addiu $a2, $a2, -3 - sb $v0, 2($a1) - sh $v1, ($a1) + lb v0, -1(a0) + lh v1, -3(a0) + addiu a0, a0, -3 + sb v0, -1(a1) + sh v1, -3(a1) + addiu a1, a1, -3 + addiu a2, a2, -3 backwards: backwards_32: - slti $at, $a2, 0x20 - bnezl $at, backwards_16_ - slti $at, $a2, 0x10 - lw $v0, -4($a0) - lw $v1, -8($a0) - lw $t0, -0xc($a0) - lw $t1, -0x10($a0) - lw $t2, -0x14($a0) - lw $t3, -0x18($a0) - lw $t4, -0x1c($a0) - lw $t5, -0x20($a0) - addiu $a0, $a0, -0x20 - addiu $a1, $a1, -0x20 - addiu $a2, $a2, -0x20 - sw $v0, 0x1C($a1) - sw $v1, 0x18($a1) - sw $t0, 0x14($a1) - sw $t1, 0x10($a1) - sw $t2, 0xC($a1) - sw $t3, 8($a1) - sw $t4, 4($a1) + blt a2, 32, backwards_16 + lw v0, -4(a0) + lw v1, -8(a0) + lw t0, -12(a0) + lw t1, -16(a0) + lw t2, -20(a0) + lw t3, -24(a0) + lw t4, -28(a0) + lw t5, -32(a0) + addiu a0, a0, -32 + sw v0, -4(a1) + sw v1, -8(a1) + sw t0, -12(a1) + sw t1, -16(a1) + sw t2, -20(a1) + sw t3, -24(a1) + sw t4, -28(a1) + sw t5, -32(a1) + addiu a1, a1, -32 + addiu a2, a2, -32 b backwards_32 - sw $t5, ($a1) + backwards_16: - slti $at, $a2, 0x10 -backwards_16_: // fake label due to branch likely optimization - bnezl $at, backwards_4_ - slti $at, $a2, 4 - lw $v0, -4($a0) - lw $v1, -8($a0) - lw $t0, -0xC($a0) - lw $t1, -0x10($a0) - addiu $a0, $a0, -0x10 - addiu $a1, $a1, -0x10 - addiu $a2, $a2, -0x10 - sw $v0, 0xC($a1) - sw $v1, 8($a1) - sw $t0, 4($a1) + blt a2, 16, backwards_4 + lw v0, -4(a0) + lw v1, -8(a0) + lw t0, -12(a0) + lw t1, -16(a0) + addiu a0, a0, -16 + sw v0, -4(a1) + sw v1, -8(a1) + sw t0, -12(a1) + sw t1, -16(a1) + addiu a1, a1, -16 + addiu a2, a2, -16 b backwards_16 - sw $t1, ($a1) + backwards_4: - slti $at, $a2, 4 -backwards_4_: // fake label due to branch likely optimization - bnez $at, backwards_bytecopy - nop - lw $v0, -4($a0) - addiu $a0, $a0, -4 - addiu $a1, $a1, -4 - addiu $a2, $a2, -4 + blt a2, 4, backwards_bytecopy + lw v0, -4(a0) + addiu a0, a0, -4 + sw v0, -4(a1) + addiu a1, a1, -4 + addiu a2, a2, -4 b backwards_4 - sw $v0, ($a1) END(bcopy) diff --git a/src/libultra/libc/bzero.s b/src/libultra/libc/bzero.s index 5323a92d7d..9c6552f654 100644 --- a/src/libultra/libc/bzero.s +++ b/src/libultra/libc/bzero.s @@ -1,65 +1,59 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder +.text -.section .text +LEAF(bzero) + negu v1, a0 + blt a1, 0xC, bytezero -.balign 16 + and v1, v1, 3 + subu a1, a1, v1 + beqz v1, blkzero -LEAF(bzero) - slti $at, $a1, 0xC - bnez $at, bytezero - negu $v1, $a0 - andi $v1, $v1, 3 - beqz $v1, blkzero - subu $a1, $a1, $v1 - swl $zero, ($a0) - addu $a0, $a0, $v1 + swl zero, (a0) + addu a0, a0, v1 blkzero: - // align backwards to 0x20 - li $at, ~0x1F - and $a3, $a1, $at - // If the result is zero, the amount to zero is less than 0x20 bytes - beqz $a3, wordzero - subu $a1, $a1, $a3 - // zero in blocks of 0x20 at a time - addu $a3, $a3, $a0 + /* align backwards to 0x20 */ + and a3, a1, ~(0x20 - 1) + /* If the result is zero, the amount to zero is less than 0x20 bytes */ + subu a1, a1, a3 + beqz a3, wordzero + /* zero in blocks of 0x20 at a time */ + addu a3, a3, a0 1: - addiu $a0, $a0, 0x20 - sw $zero, -0x20($a0) - sw $zero, -0x1C($a0) - sw $zero, -0x18($a0) - sw $zero, -0x14($a0) - sw $zero, -0x10($a0) - sw $zero, -0xC($a0) - sw $zero, -8($a0) - bne $a0, $a3, 1b - sw $zero, -4($a0) + sw zero, 0(a0) + sw zero, 4(a0) + sw zero, 8(a0) + sw zero, 12(a0) + addiu a0, a0, 0x20 + sw zero, -16(a0) + sw zero, -12(a0) + sw zero, -8(a0) + sw zero, -4(a0) + bne a0, a3, 1b + wordzero: - // align backwards to 0x4 - li $at, ~3 - and $a3, $a1, $at - // If the result is zero, the amount to zero is less than 0x4 bytes - beqz $a3, bytezero - subu $a1, $a1, $a3 - // zero one word at a time - addu $a3, $a3, $a0 + /* align backwards to 0x4 */ + and a3, a1, ~3 + /* If the result is zero, the amount to zero is less than 0x4 bytes */ + subu a1, a1, a3 + beqz a3, bytezero + /* zero one word at a time */ + addu a3, a3, a0 1: - addiu $a0, $a0, 4 - bne $a0, $a3, 1b - sw $zero, -4($a0) + addu a0, a0, 4 + sw zero, -4(a0) + bne a0, a3, 1b bytezero: - // test if nothing left to zero - blez $a1, zerodone - nop - // zero one byte at a time - addu $a1, $a1, $a0 + /* test if nothing left to zero */ + blez a1, zerodone + /* zero one byte at a time */ + addu a1, a1, a0 1: - addiu $a0, $a0, 1 - bne $a0, $a1, 1b - sb $zero, -1($a0) + sb zero, (a0) + addiu a0, a0, 1 + bne a0, a1, 1b zerodone: - jr $ra - nop + jr ra END(bzero) diff --git a/src/libultra/mgu/mtxf2l.s b/src/libultra/mgu/mtxf2l.s index edbb675a8e..1fada6b530 100644 --- a/src/libultra/mgu/mtxf2l.s +++ b/src/libultra/mgu/mtxf2l.s @@ -1,40 +1,36 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder - -.section .text - -.balign 32 +.text +.align 5 #define MTX_INTPART 0 #define MTX_FRACPART 0x20 LEAF(guMtxF2L) - li $at, 0x47800000 // 65536.0f - mtc1 $at, $f0 - li $t9, 0xFFFF0000 - addiu $t8, $a1, MTX_FRACPART + li.s fv0, 65536.0 + li t9, 0xFFFF0000 + addu t8, a1, MTX_FRACPART 1: - lwc1 $f4, ($a0) - lwc1 $f10, 4($a0) - addiu $a1, $a1, 4 - mul.s $f6, $f4, $f0 - addiu $a0, $a0, 8 - mul.s $f16, $f10, $f0 - trunc.w.s $f8, $f6 - trunc.w.s $f18, $f16 - mfc1 $t0, $f8 - mfc1 $t1, $f18 - and $t2, $t0, $t9 - sll $t5, $t0, 0x10 - srl $t3, $t1, 0x10 - andi $t6, $t1, 0xFFFF - or $t4, $t2, $t3 - or $t7, $t5, $t6 - sw $t4, (MTX_INTPART-4)($a1) - bne $a1, $t8, 1b - sw $t7, (MTX_FRACPART-4)($a1) - jr $ra - nop + lwc1 ft0, 0(a0) + lwc1 ft3, 4(a0) + mul.s ft1, ft0, fv0 + mul.s ft4, ft3, fv0 + trunc.w.s ft2, ft1 + trunc.w.s ft5, ft4 + mfc1 t0, ft2 + mfc1 t1, ft5 + srl t3, t1, 0x10 + and t6, t1, 0xFFFF + and t2, t0, t9 + sll t5, t0, 0x10 + or t4, t2, t3 + or t7, t5, t6 + sw t4, (MTX_INTPART)(a1) + sw t7, (MTX_FRACPART)(a1) + addu a0, a0, 8 + addu a1, a1, 4 + bne a1, t8, 1b + + jr ra END(guMtxF2L) diff --git a/src/libultra/mgu/mtxident.s b/src/libultra/mgu/mtxident.s index fb0e4c44ad..7f074a5526 100644 --- a/src/libultra/mgu/mtxident.s +++ b/src/libultra/mgu/mtxident.s @@ -1,29 +1,27 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noreorder - -.section .text - -.balign 32 +.text +.align 5 LEAF(guMtxIdent) - addi $t0, $zero, 1 - sll $t1, $t0, 0x10 - sw $t1, ($a0) - sw $zero, 4($a0) - sw $t0, 8($a0) - sw $zero, 0xc($a0) - sw $zero, 0x10($a0) - sw $t1, 0x14($a0) - sw $zero, 0x18($a0) - sw $t0, 0x1C($a0) - sw $zero, 0x20($a0) - sw $zero, 0x24($a0) - sw $zero, 0x28($a0) - sw $zero, 0x2c($a0) - sw $zero, 0x30($a0) - sw $zero, 0x34($a0) - sw $zero, 0x38($a0) - jr $ra - sw $zero, 0x3C($a0) + add t0, zero, 1 + sll t1, t0, 0x10 + sw t1, 0x00(a0) + sw zero, 0x04(a0) + sw t0, 0x08(a0) + sw zero, 0x0C(a0) + sw zero, 0x10(a0) + sw t1, 0x14(a0) + sw zero, 0x18(a0) + sw t0, 0x1C(a0) + sw zero, 0x20(a0) + sw zero, 0x24(a0) + sw zero, 0x28(a0) + sw zero, 0x2c(a0) + sw zero, 0x30(a0) + sw zero, 0x34(a0) + sw zero, 0x38(a0) + sw zero, 0x3C(a0) + jr ra END(guMtxIdent) diff --git a/src/libultra/mgu/mtxidentf.s b/src/libultra/mgu/mtxidentf.s index 583fc22184..490b79e4b4 100644 --- a/src/libultra/mgu/mtxidentf.s +++ b/src/libultra/mgu/mtxidentf.s @@ -1,28 +1,26 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noreorder - -.section .text - -.balign 32 +.text +.align 5 LEAF(guMtxIdentF) - li $t0, 0x3F800000 // 1.0f - sw $t0, ($a0) - sw $zero, 4($a0) - sw $zero, 8($a0) - sw $zero, 0xC($a0) - sw $zero, 0x10($a0) - sw $t0, 0x14($a0) - sw $zero, 0x18($a0) - sw $zero, 0x1C($a0) - sw $zero, 0x20($a0) - sw $zero, 0x24($a0) - sw $t0, 0x28($a0) - sw $zero, 0x2C($a0) - sw $zero, 0x30($a0) - sw $zero, 0x34($a0) - sw $zero, 0x38($a0) - jr $ra - sw $t0, 0x3C($a0) + li.s t0, 1.0 + sw t0, 0x00(a0) + sw zero, 0x04(a0) + sw zero, 0x08(a0) + sw zero, 0x0C(a0) + sw zero, 0x10(a0) + sw t0, 0x14(a0) + sw zero, 0x18(a0) + sw zero, 0x1C(a0) + sw zero, 0x20(a0) + sw zero, 0x24(a0) + sw t0, 0x28(a0) + sw zero, 0x2C(a0) + sw zero, 0x30(a0) + sw zero, 0x34(a0) + sw zero, 0x38(a0) + sw t0, 0x3C(a0) + jr ra END(guMtxIdentF) diff --git a/src/libultra/mgu/mtxl2f.s b/src/libultra/mgu/mtxl2f.s index 9298da37cc..b95e3aca7f 100644 --- a/src/libultra/mgu/mtxl2f.s +++ b/src/libultra/mgu/mtxl2f.s @@ -1,41 +1,43 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder - -.section .text - -.balign 32 +.text +.align 5 #define MTX_INTPART 0 #define MTX_FRACPART 0x20 +#define FIXTOF 0.0000152587890625 /* 1.0f / 65536.0f */ + LEAF(guMtxL2F) - li $at, 0x37800000 // 1.0f / 65536.0f - mtc1 $at, $f0 - li $t9, 0xFFFF0000 - addiu $t8, $a1, MTX_FRACPART + li.s fv0, FIXTOF + li t9, 0xFFFF0000 + addiu t8, a1, MTX_FRACPART 1: - lw $t0, MTX_INTPART($a1) - lw $t1, MTX_FRACPART($a1) - addiu $a1, $a1, 4 - and $t2, $t0, $t9 - srl $t3, $t1, 0x10 - or $t4, $t2, $t3 - mtc1 $t4, $f4 - sll $t5, $t0, 0x10 - andi $t6, $t1, 0xFFFF - or $t7, $t5, $t6 - cvt.s.w $f6, $f4 - mtc1 $t7, $f10 - addiu $a0, $a0, 8 - cvt.s.w $f16, $f10 - mul.s $f8, $f6, $f0 - nop - mul.s $f18, $f16, $f0 - swc1 $f8, -8($a0) - bne $a1, $t8, 1b - swc1 $f18, -4($a0) - jr $ra - nop + lw t0, MTX_INTPART(a1) + lw t1, MTX_FRACPART(a1) + + and t2, t0, t9 + srl t3, t1, 0x10 + or t4, t2, t3 + + sll t5, t0, 0x10 + and t6, t1, 0xFFFF + or t7, t5, t6 + + mtc1 t4, ft0 + cvt.s.w ft1, ft0 + mul.s ft2, ft1, fv0 + + mtc1 t7, ft3 + cvt.s.w ft4, ft3 + mul.s ft5, ft4, fv0 + + swc1 ft2, 0(a0) + swc1 ft5, 4(a0) + addu a0, a0, 8 + addu a1, a1, 4 + bne a1, t8, 1b + + jr ra END(guMtxL2F) diff --git a/src/libultra/mgu/normalize.s b/src/libultra/mgu/normalize.s index 7686317ea2..da10204d6c 100644 --- a/src/libultra/mgu/normalize.s +++ b/src/libultra/mgu/normalize.s @@ -1,31 +1,27 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noreorder - -.section .text - -.balign 32 +.text +.align 5 LEAF(guNormalize) - lwc1 $f4, ($a0) - lwc1 $f6, ($a1) - lwc1 $f8, ($a2) - mul.s $f10, $f4, $f4 - li $t0, 0x3F800000 // 1.0f - mul.s $f16, $f6, $f6 - add.s $f18, $f10, $f16 - mul.s $f16, $f8, $f8 - add.s $f10, $f16, $f18 - mtc1 $t0, $f18 - sqrt.s $f16, $f10 - div.s $f10, $f18, $f16 - mul.s $f16, $f4, $f10 - nop - mul.s $f18, $f6, $f10 - nop - mul.s $f4, $f8, $f10 - swc1 $f16, ($a0) - swc1 $f18, ($a1) - jr $ra - swc1 $f4, ($a2) + lwc1 ft0, (a0) + lwc1 ft1, (a1) + lwc1 ft2, (a2) + li.s t0, 1.0 + mul.s ft3, ft0, ft0 + mul.s ft4, ft1, ft1 + add.s ft5, ft3, ft4 + mul.s ft4, ft2, ft2 + add.s ft3, ft4, ft5 + mtc1 t0, ft5 + sqrt.s ft4, ft3 + div.s ft3, ft5, ft4 + mul.s ft4, ft0, ft3 + mul.s ft5, ft1, ft3 + mul.s ft0, ft2, ft3 + swc1 ft4, (a0) + swc1 ft5, (a1) + swc1 ft0, (a2) + jr ra END(guNormalize) diff --git a/src/libultra/mgu/scale.s b/src/libultra/mgu/scale.s index 80199c0621..5661b940cc 100644 --- a/src/libultra/mgu/scale.s +++ b/src/libultra/mgu/scale.s @@ -1,52 +1,56 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder +.text +.align 5 -.section .text +LEAF(guScale) + li.s ft0, 65536.0 -.balign 32 + mtc1 a1, ft1 + mul.s ft2, ft1, ft0 + trunc.w.s ft3, ft2 + mfc1 t1, ft3 -LEAF(guScale) - li $at, 0x47800000 // 65536.0f - mtc1 $at, $f4 - mtc1 $a1, $f6 - sw $zero, 4($a0) - sw $zero, 0xC($a0) - mul.s $f8, $f6, $f4 - mtc1 $a2, $f6 - sw $zero, 0x10($a0) - sw $zero, 0x18($a0) - sw $zero, 0x24($a0) - sw $zero, 0x2C($a0) - sw $zero, 0x30($a0) - trunc.w.s $f10, $f8 - mul.s $f8, $f6, $f4 - mtc1 $a3, $f6 - sw $zero, 0x38($a0) - mfc1 $t1, $f10 - sw $zero, 0x3C($a0) - srl $t2, $t1, 0x10 - trunc.w.s $f10, $f8 - mul.s $f8, $f6, $f4 - sll $t0, $t2, 0x10 - sll $t2, $t1, 0x10 - mfc1 $t1, $f10 - sw $t0, ($a0) - sw $t2, 0x20($a0) - srl $t0, $t1, 0x10 - trunc.w.s $f10, $f8 - andi $t2, $t1, 0xFFFF - sw $t2, 0x28($a0) - sw $t0, 8($a0) - mfc1 $t1, $f10 - nop - srl $t2, $t1, 0x10 - sll $t0, $t2, 0x10 - sw $t0, 0x14($a0) - li $t0, 1 - sll $t2, $t1, 0x10 - sw $t2, 0x34($a0) - jr $ra - sw $t0, 0x1C($a0) + srl t2, t1, 0x10 + sll t0, t2, 0x10 + sw t0, 0x00(a0) + sll t2, t1, 0x10 + sw t2, 0x20(a0) + + mtc1 a2, ft1 + mul.s ft2, ft1, ft0 + trunc.w.s ft3, ft2 + mfc1 t1, ft3 + + srl t0, t1, 0x10 + sw t0, 0x08(a0) + andi t2, t1, 0xFFFF + sw t2, 0x28(a0) + + mtc1 a3, ft1 + mul.s ft2, ft1, ft0 + trunc.w.s ft3, ft2 + mfc1 t1, ft3 + + srl t2, t1, 0x10 + sll t0, t2, 0x10 + sw t0, 0x14(a0) + sll t2, t1, 0x10 + sw t2, 0x34(a0) + + li t0, 1 + sw t0, 0x1C(a0) + + sw zero, 0x04(a0) + sw zero, 0x0C(a0) + sw zero, 0x10(a0) + sw zero, 0x18(a0) + sw zero, 0x24(a0) + sw zero, 0x2C(a0) + sw zero, 0x30(a0) + sw zero, 0x38(a0) + sw zero, 0x3C(a0) + + jr ra END(guScale) diff --git a/src/libultra/mgu/translate.s b/src/libultra/mgu/translate.s index d059ad5692..4ee630751f 100644 --- a/src/libultra/mgu/translate.s +++ b/src/libultra/mgu/translate.s @@ -1,61 +1,68 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noat -.set noreorder +.text +.align 5 -.section .text +LEAF(guTranslate) + li.s ft0, 65536.0 -.balign 32 + mtc1 a1, ft1 + mul.s ft2, ft1, ft0 + trunc.w.s ft3, ft2 + mfc1 t1, ft3 -LEAF(guTranslate) - li $at, 0x47800000 // 65536.0f - mtc1 $at, $f4 - mtc1 $a1, $f6 - sw $zero, ($a0) - sw $zero, 0x14($a0) - mul.s $f8, $f6, $f4 - mtc1 $a2, $f6 - sw $zero, 8($a0) - sw $zero, 4($a0) - sw $zero, 0xC($a0) - sw $zero, 0x10($a0) - sw $zero, 0x20($a0) - trunc.w.s $f10, $f8 - mul.s $f8, $f6, $f4 - mtc1 $a3, $f6 - sw $zero, 0x24($a0) - mfc1 $t1, $f10 - sw $zero, 0x28($a0) - sw $zero, 0x2C($a0) - srl $t2, $t1, 0x10 - trunc.w.s $f10, $f8 - mul.s $f8, $f6, $f4 - sll $t0, $t2, 0x10 - sw $zero, 0x30($a0) - mfc1 $t3, $f10 - sw $zero, 0x34($a0) - srl $t2, $t3, 0x10 - trunc.w.s $f10, $f8 - or $t0, $t0, $t2 - sw $t0, 0x18($a0) - sll $t0, $t1, 0x10 - sll $t2, $t3, 0x10 - mfc1 $t1, $f10 - srl $t2, $t2, 0x10 - or $t0, $t0, $t2 - sw $t0, 0x38($a0) - srl $t2, $t1, 0x10 - sll $t0, $t2, 0x10 - addiu $t0, $t0, 1 - sw $t0, 0x1C($a0) - lui $t0, 1 - ori $t0, $t0, 0 - sw $t0, ($a0) - sw $t0, 0x14($a0) - lui $t0, (0x00000001 >> 16) - ori $t0, (0x00000001 & 0xFFFF) - sll $t2, $t1, 0x10 - sw $t2, 0x3C($a0) - jr $ra - sw $t0, 8($a0) + mtc1 a2, ft1 + mul.s ft2, ft1, ft0 + trunc.w.s ft3, ft2 + mfc1 t3, ft3 + + srl t2, t1, 0x10 + sll t0, t2, 0x10 + srl t2, t3, 0x10 + or t0, t0, t2 + sw t0, 0x18(a0) + + sll t2, t3, 0x10 + sll t0, t1, 0x10 + srl t2, t2, 0x10 + or t0, t0, t2 + sw t0, 0x38(a0) + + mtc1 a3, ft1 + mul.s ft2, ft1, ft0 + trunc.w.s ft3, ft2 + mfc1 t1, ft3 + + srl t2, t1, 0x10 + sll t0, t2, 0x10 + addiu t0, t0, 1 + sw t0, 0x1C(a0) + + sll t2, t1, 0x10 + sw t2, 0x3C(a0) + + sw zero, 0x00(a0) + sw zero, 0x04(a0) + sw zero, 0x08(a0) + sw zero, 0x0C(a0) + sw zero, 0x10(a0) + sw zero, 0x14(a0) + sw zero, 0x20(a0) + sw zero, 0x24(a0) + sw zero, 0x28(a0) + sw zero, 0x2C(a0) + sw zero, 0x30(a0) + sw zero, 0x34(a0) + + lui t0, (0x00010000 >> 16) + ori t0, (0x00010000 & 0xFFFF) + sw t0, (a0) + sw t0, 0x14(a0) + + lui t0, (0x00000001 >> 16) + ori t0, (0x00000001 & 0xFFFF) + sw t0, 8(a0) + + jr ra END(guTranslate) diff --git a/src/libultra/os/exceptasm.s b/src/libultra/os/exceptasm.s index 62e5814703..3a3919061c 100644 --- a/src/libultra/os/exceptasm.s +++ b/src/libultra/os/exceptasm.s @@ -1,27 +1,30 @@ +#ifdef __GNUC__ +.set gp=64 +#endif #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" #include "ultra64/rcp.h" +#include "ultra64/bcp.h" #include "ultra64/message.h" #include "ultra64/thread.h" #include "ultra64/exception.h" +#include "ultra64/version.h" #include "debug/profiler.h" #include "config.h" -// Without these, the assembler doesn't understand C99-style bool. Only affects this file. +/* Without these, the assembler doesn't understand C99-style bool. Only affects this file. */ #define true 1 #define false 0 -.set noat -.set noreorder -.set gp=64 +#define MESG(x) ((x) << 3) -.section .data - -.balign 16 +.data +.align 2 DATA(__osHwIntTable) .word 0, 0 - .word 0, 0 // cart + .word 0, 0 /* cart */ .word 0, 0 .word 0, 0 .word 0, 0 @@ -31,9 +34,8 @@ DATA(__osPiIntTable) .word 0, 0 ENDDATA(__osPiIntTable) -.section .rodata - -.balign 16 +.rdata +.align 2 __osIntOffTable: .byte 0x00 /* redispatch */ @@ -80,220 +82,202 @@ __osIntTable: .word IP7_Hdlr .word counter -.section .text - -.balign 16 +.text /** - * The exception preamble is copied to the exception vectors at + * The 16-byte exception preamble is copied to the exception vectors at * UT_VEC, XUT_VEC, ECC_VEC, E_VEC, to direct execution to __osException */ LEAF(__osExceptionPreamble) - lui $k0, %hi(__osException) - addiu $k0, %lo(__osException) - jr $k0 - nop + la k0, __osException + jr k0 END(__osExceptionPreamble) LEAF(__osException) - // Load scratch space for thread saving - lui $k0, %hi(__osThreadSave) - addiu $k0, %lo(__osThreadSave) - // Save $at - sd $at, THREAD_AT($k0) - // Save sr - mfc0 $k1, C0_SR - sw $k1, THREAD_SR($k0) - // Disable interrupts - li $at, ~(SR_IE | SR_EXL) - and $k1, $k1, $at - mtc0 $k1, C0_SR - // Save some temp registers for use in the following - sd $t0, THREAD_T0($k0) - sd $t1, THREAD_T1($k0) - sd $t2, THREAD_T2($k0) - // Mark FPU as unused - sw $zero, THREAD_FP($k0) - // Left over from misplaced ifdef, immediately overwritten on next instruction - mfc0 $t0, C0_CAUSE +.set noat + /* Load scratch space for thread saving */ + la k0, __osThreadSave + /* Save at */ + sd AT, THREAD_AT(k0) +.set at + /* Save sr */ + MFC0( k1, C0_SR) + sw k1, THREAD_SR(k0) + /* Disable interrupts */ + and k1, k1, ~(SR_IE | SR_EXL) + MTC0( k1, C0_SR) + /* Save some temp registers for use in the following */ + sd t0, THREAD_T0(k0) + sd t1, THREAD_T1(k0) + sd t2, THREAD_T2(k0) + /* Mark FPU as unused */ + sw zero, THREAD_FP(k0) + /* Left over from misplaced ifdef, immediately overwritten on next instruction */ + MFC0( t0, C0_CAUSE) savecontext: - // Save the previously running thread's context to be restored when it resumes - move $t0, $k0 - lui $k0, %hi(__osRunningThread) - lw $k0, %lo(__osRunningThread)($k0) - ld $t1, THREAD_AT($t0) - sd $t1, THREAD_AT($k0) - ld $t1, THREAD_SR($t0) - sd $t1, THREAD_SR($k0) - ld $t1, THREAD_T0($t0) - sd $t1, THREAD_T0($k0) - ld $t1, THREAD_T1($t0) - sd $t1, THREAD_T1($k0) - ld $t1, THREAD_T2($t0) - sd $t1, THREAD_T2($k0) - lw $k1, THREAD_SR($k0) - mflo $t0 - sd $t0, THREAD_LO($k0) - mfhi $t0 - andi $t1, $k1, SR_IMASK - sd $v0, THREAD_V0($k0) - sd $v1, THREAD_V1($k0) - sd $a0, THREAD_A0($k0) - sd $a1, THREAD_A1($k0) - sd $a2, THREAD_A2($k0) - sd $a3, THREAD_A3($k0) - sd $t3, THREAD_T3($k0) - sd $t4, THREAD_T4($k0) - sd $t5, THREAD_T5($k0) - sd $t6, THREAD_T6($k0) - sd $t7, THREAD_T7($k0) - sd $s0, THREAD_S0($k0) - sd $s1, THREAD_S1($k0) - sd $s2, THREAD_S2($k0) - sd $s3, THREAD_S3($k0) - sd $s4, THREAD_S4($k0) - sd $s5, THREAD_S5($k0) - sd $s6, THREAD_S6($k0) - sd $s7, THREAD_S7($k0) - sd $t8, THREAD_T8($k0) - sd $t9, THREAD_T9($k0) - sd $gp, THREAD_GP($k0) - sd $sp, THREAD_SP($k0) - sd $fp, THREAD_S8($k0) - sd $ra, THREAD_RA($k0) - beqz $t1, savercp - sd $t0, THREAD_HI($k0) - // If any CPU interrupts are enabled in the previous thread's SR, bitwise-OR in the - // disabled CPU interrupts from the global interrupt mask. - // This is an attempt at reverting the effect of masking the thread's SR with the - // global interrupt mask. This is however broken, see comments for osSetIntMask. - lui $t0, %hi(__OSGlobalIntMask) - addiu $t0, %lo(__OSGlobalIntMask) - lw $t0, ($t0) - li $at, ~0 - xor $t2, $t0, $at - lui $at, ((~SR_IMASK) >> 0x10) & 0xFFFF - andi $t2, $t2, SR_IMASK - ori $at, (~SR_IMASK) & 0xFFFF - or $t4, $t1, $t2 - and $t3, $k1, $at - andi $t0, $t0, SR_IMASK - or $t3, $t3, $t4 - and $t1, $t1, $t0 - and $k1, $k1, $at - sw $t3, THREAD_SR($k0) - or $k1, $k1, $t1 +.set noreorder + /* Save the previously running thread's context to be restored when it resumes */ + move t0, k0 + lw k0, __osRunningThread + ld t1, THREAD_AT(t0) + sd t1, THREAD_AT(k0) + ld t1, THREAD_SR(t0) + sd t1, THREAD_SR(k0) + ld t1, THREAD_T0(t0) + sd t1, THREAD_T0(k0) + ld t1, THREAD_T1(t0) + sd t1, THREAD_T1(k0) + ld t1, THREAD_T2(t0) + sd t1, THREAD_T2(k0) +.set reorder + sd $2, THREAD_V0(k0) + sd $3, THREAD_V1(k0) + sd $4, THREAD_A0(k0) + sd $5, THREAD_A1(k0) + sd $6, THREAD_A2(k0) + sd $7, THREAD_A3(k0) + sd $11, THREAD_T3(k0) + sd $12, THREAD_T4(k0) + sd $13, THREAD_T5(k0) + sd $14, THREAD_T6(k0) + sd $15, THREAD_T7(k0) + sd $16, THREAD_S0(k0) + sd $17, THREAD_S1(k0) + sd $18, THREAD_S2(k0) + sd $19, THREAD_S3(k0) + sd $20, THREAD_S4(k0) + sd $21, THREAD_S5(k0) + sd $22, THREAD_S6(k0) + sd $23, THREAD_S7(k0) + sd $24, THREAD_T8(k0) + sd $25, THREAD_T9(k0) + sd $28, THREAD_GP(k0) + sd $29, THREAD_SP(k0) + sd $30, THREAD_S8(k0) + sd $31, THREAD_RA(k0) + mflo t0 + sd t0, THREAD_LO(k0) + mfhi t0 + sd t0, THREAD_HI(k0) + lw k1, THREAD_SR(k0) + andi t1, k1, SR_IMASK + beqz t1, savercp + /* If any CPU interrupts are enabled in the previous thread's SR, bitwise-OR in the */ + /* disabled CPU interrupts from the global interrupt mask. */ + /* This is an attempt at reverting the effect of masking the thread's SR with the */ + /* global interrupt mask. This is however broken, see comments for osSetIntMask. */ + la t0, __OSGlobalIntMask + lw t0, (t0) + xor t2, t0, 0xFFFFFFFF + andi t2, t2, SR_IMASK + or t4, t1, t2 + and t3, k1, ~SR_IMASK + or t3, t3, t4 + sw t3, THREAD_SR(k0) + andi t0, t0, SR_IMASK + and t1, t1, t0 + and k1, k1, ~SR_IMASK + or k1, k1, t1 savercp: - // Save the currently masked RCP interrupts. - lui $t1, %hi(PHYS_TO_K1(MI_INTR_MASK_REG)) - lw $t1, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($t1) - beqz $t1, endrcp - nop - // Similar to the above comment, but for RCP interrupt enable bits rather than CPU. - // This suffers from the same problem as above. - lui $t0, %hi(__OSGlobalIntMask) - addiu $t0, %lo(__OSGlobalIntMask) - lw $t0, ($t0) - lw $t4, THREAD_RCP($k0) - li $at, ~0 - srl $t0, $t0, RCP_IMASKSHIFT - xor $t0, $t0, $at - andi $t0, $t0, (RCP_IMASK >> RCP_IMASKSHIFT) - and $t0, $t0, $t4 - or $t1, $t1, $t0 + /* Save the currently masked RCP interrupts. */ + lw t1, PHYS_TO_K1(MI_INTR_MASK_REG) + beqz t1, endrcp + /* Similar to the above comment, but for RCP interrupt enable bits rather than CPU. */ + /* This suffers from the same problem as above. */ + la t0, __OSGlobalIntMask + lw t0, (t0) + srl t0, t0, RCP_IMASKSHIFT + xor t0, t0, 0xFFFFFFFF + andi t0, t0, (RCP_IMASK >> RCP_IMASKSHIFT) + lw t4, THREAD_RCP(k0) + and t0, t0, t4 + or t1, t1, t0 endrcp: - sw $t1, THREAD_RCP($k0) - mfc0 $t0, C0_EPC - sw $t0, THREAD_PC($k0) - lw $t0, THREAD_FP($k0) - beqz $t0, handle_interrupt - nop - // Save FP Registers if FPU was used by the thread - cfc1 $t0, C1_FPCSR + sw t1, THREAD_RCP(k0) + MFC0( t0, C0_EPC) + sw t0, THREAD_PC(k0) + lw t0, THREAD_FP(k0) + beqz t0, handle_interrupt + /* Save FP Registers if FPU was used by the thread */ +.set noreorder + cfc1 t0, C1_FPCSR nop - sw $t0, THREAD_FPCSR($k0) - sdc1 $f0, THREAD_FP0($k0) - sdc1 $f2, THREAD_FP2($k0) - sdc1 $f4, THREAD_FP4($k0) - sdc1 $f6, THREAD_FP6($k0) - sdc1 $f8, THREAD_FP8($k0) - sdc1 $f10, THREAD_FP10($k0) - sdc1 $f12, THREAD_FP12($k0) - sdc1 $f14, THREAD_FP14($k0) - sdc1 $f16, THREAD_FP16($k0) - sdc1 $f18, THREAD_FP18($k0) - sdc1 $f20, THREAD_FP20($k0) - sdc1 $f22, THREAD_FP22($k0) - sdc1 $f24, THREAD_FP24($k0) - sdc1 $f26, THREAD_FP26($k0) - sdc1 $f28, THREAD_FP28($k0) - sdc1 $f30, THREAD_FP30($k0) + sw t0, THREAD_FPCSR(k0) +.set reorder + sdc1 $f0, THREAD_FP0(k0) + sdc1 $f2, THREAD_FP2(k0) + sdc1 $f4, THREAD_FP4(k0) + sdc1 $f6, THREAD_FP6(k0) + sdc1 $f8, THREAD_FP8(k0) + sdc1 $f10, THREAD_FP10(k0) + sdc1 $f12, THREAD_FP12(k0) + sdc1 $f14, THREAD_FP14(k0) + sdc1 $f16, THREAD_FP16(k0) + sdc1 $f18, THREAD_FP18(k0) + sdc1 $f20, THREAD_FP20(k0) + sdc1 $f22, THREAD_FP22(k0) + sdc1 $f24, THREAD_FP24(k0) + sdc1 $f26, THREAD_FP26(k0) + sdc1 $f28, THREAD_FP28(k0) + sdc1 $f30, THREAD_FP30(k0) handle_interrupt: #if ENABLE_PROFILER - lw $a0, THREAD_ID($k0) + lw a0, THREAD_ID(k0) + addiu a0, a0, PROFILER_EVENT_TYPE_THREADEND jal __osRecordProfilerEvent - addiu $a0, $a0, PROFILER_EVENT_TYPE_THREADEND #endif - // Determine the cause of the exception or interrupt and - // enter appropriate handling routine - mfc0 $t0, C0_CAUSE - sw $t0, THREAD_CAUSE($k0) - li $t1, OS_STATE_RUNNABLE - sh $t1, THREAD_STATE($k0) - andi $t1, $t0, CAUSE_EXCMASK - // Test for break exception - li $t2, EXC_BREAK - beq $t1, $t2, handle_break - nop - // Test for CpU (coprocessor unusable) exception - li $t2, EXC_CPU - beq $t1, $t2, handle_CpU - nop - // Test for interrupt, if it's not an interrupt, panic - li $t2, EXC_INT - bne $t1, $t2, panic - nop - and $s0, $k1, $t0 + /* Determine the cause of the exception or interrupt and */ + /* enter appropriate handling routine */ + MFC0( t0, C0_CAUSE) + sw t0, THREAD_CAUSE(k0) +label: + li t1, OS_STATE_RUNNABLE + sh t1, THREAD_STATE(k0) + andi t1, t0, CAUSE_EXCMASK + /* Test for break exception */ + li t2, EXC_BREAK + beq t1, t2, handle_break + /* Test for CpU (coprocessor unusable) exception */ + li t2, EXC_CPU + beq t1, t2, handle_CpU + /* Test for interrupt, if it's not an interrupt, panic */ + li t2, EXC_INT + bne t1, t2, panic + + and s0, k1, t0 next_interrupt: - // Handle external interrupt causes, using a jump table - // to enter into the appropriate handler - andi $t1, $s0, CAUSE_IPMASK - srl $t2, $t1, CAUSE_IPSHIFT + 4 - bnez $t2, 1f - nop - srl $t2, $t1, CAUSE_IPSHIFT - addi $t2, $t2, 0x10 + /* Handle external interrupt causes, using a jump table */ + /* to enter into the appropriate handler */ + andi t1, s0, CAUSE_IPMASK + srl t2, t1, CAUSE_IPSHIFT + 4 + bnez t2, 1f + + srl t2, t1, CAUSE_IPSHIFT + addi t2, t2, 0x10 1: - lui $at, %hi(__osIntOffTable) - addu $at, $at, $t2 - lbu $t2, %lo(__osIntOffTable)($at) - lui $at, %hi(__osIntTable) - addu $at, $at, $t2 - lw $t2, %lo(__osIntTable)($at) - jr $t2 - nop + lbu t2, __osIntOffTable(t2) + lw t2, __osIntTable(t2) + jr t2 /** * IP6 Interrupt * Only signalled by development hardware */ IP6_Hdlr: - // Mask out interrupt and continue - li $at, ~CAUSE_IP6 + /* Mask out interrupt and continue */ + and s0, s0, ~CAUSE_IP6 b next_interrupt - and $s0, $s0, $at /** * IP7 Interrupt * Only signalled by development hardware */ IP7_Hdlr: - // Mask out interrupt and continue - li $at, ~CAUSE_IP7 + /* Mask out interrupt and continue */ + and s0, s0, ~CAUSE_IP7 b next_interrupt - and $s0, $s0, $at /** * IP8/Counter Interrupt @@ -301,435 +285,473 @@ IP7_Hdlr: * cop0 compare register, this interrupt is triggered */ counter: - mfc0 $t1, C0_COMPARE - mtc0 $t1, C0_COMPARE - // Post counter message + MFC0( t1, C0_COMPARE) + MTC0( t1, C0_COMPARE) + /* Post counter message */ + li a0, MESG(OS_EVENT_COUNTER) jal send_mesg - li $a0, OS_EVENT_COUNTER*8 - // Mask out interrupt and continue - li $at, ~CAUSE_IP8 + /* Mask out interrupt and continue */ + and s0, s0, ~CAUSE_IP8 b next_interrupt - and $s0, $s0, $at /** - * IP4/Cartridge Interrupt - * Signalled by the N64 Disk Drive + * N64: + * IP4/Cartridge Interrupt + * Signalled by the N64 Disk Drive + * iQue: + * IP4/BCP Interrupt + * New RCP Interrupts */ cart: - // Load cart callback set by __osSetHWIntrRoutine - lui $t1, %hi(__osHwIntTable) - addiu $t1, %lo(__osHwIntTable) - lw $t2, (OS_INTR_CART*HWINT_SIZE+HWINT_CALLBACK)($t1) - // Mask out interrupt - li $at, ~CAUSE_IP4 - and $s0, $s0, $at - // If the callback is NULL, handling is done - beqz $t2, send_cart_mesg - addi $t1, $t1, (OS_INTR_CART*HWINT_SIZE) - // Set up a stack and run the callback - jalr $t2 - lw $sp, HWINT_SP($t1) - beqz $v0, send_cart_mesg - nop - // Redispatch immediately if the callback returned nonzero + /* Mask out interrupt */ + and s0, s0, ~CAUSE_IP4 + /* Load cart callback set by __osSetHWIntrRoutine */ + la t1, __osHwIntTable + addi t1, t1, (OS_INTR_CART * HWINT_SIZE) + lw t2, HWINT_CALLBACK(t1) + /* If the callback is NULL, handling is done */ + beqz t2, 1f + /* Set up a stack and run the callback */ + lw sp, HWINT_SP(t1) + jalr t2 + beqz v0, 1f + /* Redispatch immediately if the callback returned nonzero */ b redispatch - nop -send_cart_mesg: - // Post a cart event message +1: +#ifndef BBPLAYER + /* Post a cart event message */ + li a0, MESG(OS_EVENT_CART) + jal send_mesg +#else + /* On the iQue Player the CART interrupt no longer exists. New RCP interrupts are vectored here */ + lw s1, PHYS_TO_K1(MI_EX_INTR_REG) + +flash: + /* Check for FLASH interrupt */ + andi t1, s1, MI_EX_INTR_FLASH + beqz t1, flashx + /* Mask it out */ + andi s1, s1, MI_EX_INTR_ALL & ~MI_EX_INTR_FLASH + /* Clear it */ + li t1, 0 + sw t1, PHYS_TO_K1(PI_NAND_CTRL_REG) + /* Send the event message */ + li a0, MESG(OS_EVENT_FLASH) + jal send_mesg +flashx: +md: + /* Check for MD interrupt */ + andi t1, s1, MI_EX_INTR_MD + beqz t1, mdx + /* Mask it out */ + andi s1, s1, MI_EX_INTR_ALL & ~MI_EX_INTR_MD + /* Clear it */ + li t1, MI_EX_INTR_CLR_MD + sw t1, PHYS_TO_K1(MI_EX_INTR_REG) + /* Send the event message */ + li a0, MESG(OS_EVENT_MD) + jal send_mesg +mdx: +aes: + /* Check for AES interrupt */ + andi t1, s1, MI_EX_INTR_AES + beqz t1, aesx + /* Mask it out */ + andi s1, s1, MI_EX_INTR_ALL & ~MI_EX_INTR_AES + /* Disable the interrupt, this does not clear it. + * The responsibility of clearing and re-enabling + * the interrupt is left to the handler. */ + li t1, MI_EX_INTR_MASK_CLR_AES + sw t1, PHYS_TO_K1(MI_EX_INTR_MASK_REG) + /* Send the event message */ + li a0, MESG(OS_EVENT_AES) jal send_mesg - li $a0, OS_EVENT_CART*8 - // Continue +aesx: +ide: + /* Check for IDE interrupt */ + andi t1, s1, MI_EX_INTR_IDE + beqz t1, idex + /* Mask it out */ + andi s1, s1, MI_EX_INTR_ALL & ~MI_EX_INTR_IDE + /* Disable the interrupt, this does not clear it. + * The responsibility of clearing and re-enabling + * the interrupt is left to the handler. */ + li t1, MI_EX_INTR_MASK_CLR_IDE + sw t1, PHYS_TO_K1(MI_EX_INTR_MASK_REG) + /* Send the event message */ + li a0, MESG(OS_EVENT_IDE) + jal send_mesg +idex: +pi_err: + /* Check for PI_ERR Interrupt */ + andi t1, s1, MI_EX_INTR_PI_ERR + beqz t1, pi_errx + /* Mask it out */ + andi s1, s1, MI_EX_INTR_ALL & ~MI_EX_INTR_PI_ERR + /* Disable the interrupt, this does not clear it. + * The responsibility of clearing and re-enabling + * the interrupt is left to the handler. */ + li t1, MI_EX_INTR_MASK_CLR_PI_ERR + sw t1, PHYS_TO_K1(MI_EX_INTR_MASK_REG) + /* Send the event message */ + li a0, MESG(OS_EVENT_PI_ERR) + jal send_mesg +pi_errx: +usb0: + /* Check for USB0 Interrupt */ + andi t1, s1, MI_EX_INTR_USB0 + beqz t1, usb0x + /* Mask it out */ + andi s1, s1, MI_EX_INTR_ALL & ~MI_EX_INTR_USB0 + /* Disable the interrupt, this does not clear it. + * The responsibility of clearing and re-enabling + * the interrupt is left to the handler. */ + li t1, MI_EX_INTR_MASK_CLR_USB0 + sw t1, PHYS_TO_K1(MI_EX_INTR_MASK_REG) + /* Send the event message */ + li a0, MESG(OS_EVENT_USB0) + jal send_mesg +usb0x: +usb1: + /* Check for USB1 Interrupt */ + andi t1, s1, MI_EX_INTR_USB1 + beqz t1, usb1x + /* Mask it out */ + andi s1, s1, MI_EX_INTR_ALL & ~MI_EX_INTR_USB1 + /* Disable the interrupt, this does not clear it. + * The responsibility of clearing and re-enabling + * the interrupt is left to the handler. */ + li t1, MI_EX_INTR_MASK_CLR_USB1 + sw t1, PHYS_TO_K1(MI_EX_INTR_MASK_REG) + /* Send the event message */ + li a0, MESG(OS_EVENT_USB1) + jal send_mesg +usb1x: +#endif + /* Continue */ b next_interrupt - nop /** * IP3/RCP Interrupt * Signalled by the RCP for various reasons, described below */ rcp: - // Load the MI interrupts and mask with the RCP bits in the global interrupt mask - //! @bug this clobbers the t0 register which is expected to hold the value of the - //! C0_CAUSE register in the sw1 and sw2 handlers. If the sw1 or sw2 handler runs - //! after this, the interrupt will not be cleared properly. - lui $t0, %hi(__OSGlobalIntMask) - addiu $t0, %lo(__OSGlobalIntMask) - lw $t0, ($t0) - lui $s1, %hi(PHYS_TO_K1(MI_INTR_REG)) - lw $s1, %lo(PHYS_TO_K1(MI_INTR_REG))($s1) - srl $t0, $t0, RCP_IMASKSHIFT - and $s1, $s1, $t0 + /* Load the MI interrupts and mask with the RCP bits in the global interrupt mask */ + /*! @bug this clobbers the t0 register which is expected to hold the value of the */ + /*! C0_CAUSE register in the sw1 and sw2 handlers. If the sw1 or sw2 handler runs */ + /*! after this, the interrupt will not be cleared properly. */ + lw s1, PHYS_TO_K1(MI_INTR_REG) + la t0, __OSGlobalIntMask + lw t0, (t0) + srl t0, t0, RCP_IMASKSHIFT + and s1, s1, t0 /** * Signal Processor (SP) Interrupt */ -sp: - // Test for sp interrupt - andi $t1, $s1, MI_INTR_SP - beqz $t1, vi - nop - // Test for yielded or done signals in particular - lui $t4, %hi(PHYS_TO_K1(SP_STATUS_REG)) - lw $t4, %lo(PHYS_TO_K1(SP_STATUS_REG))($t4) - li $t1, (SP_CLR_INTR | SP_CLR_SIG3) - lui $at, %hi(PHYS_TO_K1(SP_STATUS_REG)) - andi $t4, $t4, (SP_STATUS_YIELDED | SP_STATUS_TASKDONE) - // Mask out SP interrupt - andi $s1, $s1, (MI_INTR_SI | MI_INTR_AI | MI_INTR_VI | MI_INTR_PI | MI_INTR_DP) - beqz $t4, sp_other_break - // Clear interrupt and signal 3 - sw $t1, %lo(PHYS_TO_K1(SP_STATUS_REG))($at) - // Post an SP event message + /* Test for sp interrupt */ + andi t1, s1, MI_INTR_SP + beqz t1, vi + /* Mask out SP interrupt */ + andi s1, s1, (MI_INTR_SI | MI_INTR_AI | MI_INTR_VI | MI_INTR_PI | MI_INTR_DP) + lw t4, PHYS_TO_K1(SP_STATUS_REG) + /* Clear interrupt and signal 3 */ + li t1, (SP_CLR_INTR | SP_CLR_SIG3) + sw t1, PHYS_TO_K1(SP_STATUS_REG) + /* Test for yielded or done signals in particular */ + andi t4, t4, (SP_STATUS_YIELDED | SP_STATUS_TASKDONE) + beqz t4, sp_other_break + /* Post an SP event message */ + li a0, MESG(OS_EVENT_SP) jal send_mesg - li $a0, OS_EVENT_SP*8 - beqz $s1, NoMoreRcpInts - nop - // Step over sp_other_break handler + beqz s1, NoMoreRcpInts + /* Step over sp_other_break handler */ b vi - nop sp_other_break: - // An sp signal that is not due to yielding or task completion, such as - // an sp breakpoint. Post a different event message + /* An sp signal that is not due to yielding or task completion, such as */ + /* an sp breakpoint. Post a different event message */ + li a0, MESG(OS_EVENT_SP_BREAK) jal send_mesg - li $a0, OS_EVENT_SP_BREAK*8 - beqz $s1, NoMoreRcpInts - nop + beqz s1, NoMoreRcpInts /** * Video Interface (VI) Interrupt */ vi: - // Test for vi interrupt - andi $t1, $s1, MI_INTR_VI - beqz $t1, ai - lui $at, %hi(PHYS_TO_K1(VI_CURRENT_REG)) - // Mask out vi interrupt - andi $s1, $s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_AI | MI_INTR_PI | MI_INTR_DP) - // Clear interrupt - sw $zero, %lo(PHYS_TO_K1(VI_CURRENT_REG))($at) - // Post vi event message + /* Test for vi interrupt */ + andi t1, s1, MI_INTR_VI + beqz t1, ai + /* Mask out vi interrupt */ + andi s1, s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_AI | MI_INTR_PI | MI_INTR_DP) + /* Clear interrupt */ + sw zero, PHYS_TO_K1(VI_CURRENT_REG) + /* Post vi event message */ + li a0, MESG(OS_EVENT_VI) jal send_mesg - li $a0, OS_EVENT_VI*8 - beqz $s1, NoMoreRcpInts - nop + beqz s1, NoMoreRcpInts /** * Audio Interface (AI) Interrupt */ ai: - // Test for ai interrupt - andi $t1, $s1, MI_INTR_AI - beqz $t1, si - nop - li $t1, 1 - lui $at, %hi(PHYS_TO_K1(AI_STATUS_REG)) - // Mask out ai interrupt - andi $s1, $s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_VI | MI_INTR_PI | MI_INTR_DP) - // Clear interrupt - sw $t1, %lo(PHYS_TO_K1(AI_STATUS_REG))($at) - // Post ai event message + /* Test for ai interrupt */ + andi t1, s1, MI_INTR_AI + beqz t1, si + + /* Mask out ai interrupt */ + andi s1, s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_VI | MI_INTR_PI | MI_INTR_DP) + /* Clear interrupt */ + li t1, 1 + sw t1, PHYS_TO_K1(AI_STATUS_REG) + /* Post ai event message */ + li a0, MESG(OS_EVENT_AI) jal send_mesg - li $a0, OS_EVENT_AI*8 - beqz $s1, NoMoreRcpInts - nop + beqz s1, NoMoreRcpInts /** * Serial Interface (SI) Interrupt */ si: - // Test for si interrupt - andi $t1, $s1, MI_INTR_SI - beqz $t1, pi - lui $at, %hi(PHYS_TO_K1(SI_STATUS_REG)) - // Mask out si interrupt - andi $s1, $s1, (MI_INTR_SP | MI_INTR_AI | MI_INTR_VI | MI_INTR_PI | MI_INTR_DP) - // Clear interrupt - sw $zero, %lo(PHYS_TO_K1(SI_STATUS_REG))($at) - // Post si event message + /* Test for si interrupt */ + andi t1, s1, MI_INTR_SI + beqz t1, pi + + /* Mask out si interrupt */ + andi s1, s1, (MI_INTR_SP | MI_INTR_AI | MI_INTR_VI | MI_INTR_PI | MI_INTR_DP) + /* Clear interrupt */ + sw zero, PHYS_TO_K1(SI_STATUS_REG) + /* Post si event message */ + li a0, MESG(OS_EVENT_SI) jal send_mesg - li $a0, OS_EVENT_SI*8 - beqz $s1, NoMoreRcpInts - nop + beqz s1, NoMoreRcpInts /** * Parallel Interface (PI) Interrupt */ pi: - // Test for pi interrupt - andi $t1, $s1, MI_INTR_PI - beqz $t1, dp - nop -#if PLATFORM_N64 - // Clear interrupt and mask out pi interrupt - li $t1, PI_STATUS_CLR_INTR - lui $at, %hi(PHYS_TO_K1(PI_STATUS_REG)) - andi $s1, $s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_AI | MI_INTR_VI | MI_INTR_DP) - sw $t1, %lo(PHYS_TO_K1(PI_STATUS_REG))($at) -#else - // Clear interrupt - li $t1, PI_STATUS_CLR_INTR - lui $at, %hi(PHYS_TO_K1(PI_STATUS_REG)) - sw $t1, %lo(PHYS_TO_K1(PI_STATUS_REG))($at) - // Load pi callback - lui $t1, %hi(__osPiIntTable) - addiu $t1, %lo(__osPiIntTable) - lw $t2, HWINT_CALLBACK($t1) - // Mask out pi interrupt - andi $s1, $s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_AI | MI_INTR_VI | MI_INTR_DP) - // Skip callback if NULL - beqz $t2, no_pi_callback - nop - // Set up a stack and run the callback - lw $sp, HWINT_SP($t1) - jalr $t2 - move $a0, $v0 - // If the callback returns non-zero, don't post a pi event message - bnez $v0, skip_pi_mesg - nop + /* Test for pi interrupt */ + andi t1, s1, MI_INTR_PI + beqz t1, dp + + /* Mask out pi interrupt */ + andi s1, s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_AI | MI_INTR_VI | MI_INTR_DP) + /* Clear the interrupt */ + li t1, PI_STATUS_CLR_INTR + sw t1, PHYS_TO_K1(PI_STATUS_REG) +#if LIBULTRA_VERSION >= LIBULTRA_VERSION_J + /* Load pi callback */ + la t1, __osPiIntTable + lw t2, HWINT_CALLBACK(t1) + /* Skip callback if NULL */ + beqz t2, no_pi_callback + /* Set up a stack and run the callback */ + lw sp, HWINT_SP(t1) + move a0, v0 + jalr t2 + /* If the callback returns non-zero, don't post a pi event message */ + bnez v0, skip_pi_mesg #endif no_pi_callback: - // Post pi event message + /* Post pi event message */ + li a0, MESG(OS_EVENT_PI) jal send_mesg - li $a0, OS_EVENT_PI*8 skip_pi_mesg: - beqz $s1, NoMoreRcpInts - nop + beqz s1, NoMoreRcpInts /** * Display Processor (DP) Interrupt */ dp: - // Test for dp interrupt - andi $t1, $s1, MI_INTR_DP - beqz $t1, NoMoreRcpInts - nop - // Clear dp interrupt - li $t1, MI_CLR_DP_INTR - lui $at, %hi(PHYS_TO_K1(MI_INIT_MODE_REG)) - // Mask out dp interrupt - andi $s1, $s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_AI | MI_INTR_VI | MI_INTR_PI) - sw $t1, %lo(PHYS_TO_K1(MI_INIT_MODE_REG))($at) - // Post dp event message + /* Test for dp interrupt */ + andi t1, s1, MI_INTR_DP + beqz t1, NoMoreRcpInts + + /* Mask out dp interrupt */ + andi s1, s1, (MI_INTR_SP | MI_INTR_SI | MI_INTR_AI | MI_INTR_VI | MI_INTR_PI) + /* Clear dp interrupt */ + li t1, MI_CLR_DP_INTR + sw t1, PHYS_TO_K1(MI_INIT_MODE_REG) + /* Post dp event message */ + li a0, MESG(OS_EVENT_DP) jal send_mesg - li $a0, OS_EVENT_DP*8 NoMoreRcpInts: - // Mask out interrupt and continue - li $at, ~CAUSE_IP3 + /* Mask out interrupt and continue */ + and s0, s0, ~CAUSE_IP3 b next_interrupt - and $s0, $s0, $at /** * IP5/PreNMI Interrupt * Reset button has been pressed */ prenmi: - // Disable IP5/PreNMI interrupt for the previously running thread - lw $k1, THREAD_SR($k0) - li $at, ~SR_IBIT5 - lui $t1, %hi(__osShutdown) - and $k1, $k1, $at - sw $k1, THREAD_SR($k0) - addiu $t1, %lo(__osShutdown) - // Test __osShutdown for first PreNMI event - lw $t2, ($t1) - beqz $t2, firstnmi - li $at, ~CAUSE_IP5 - // Mask out interrupt and redispatch immediately + /* Disable IP5/PreNMI interrupt for the previously running thread */ + lw k1, THREAD_SR(k0) + and k1, k1, ~SR_IBIT5 + sw k1, THREAD_SR(k0) + /* Test __osShutdown for first PreNMI event */ + la t1, __osShutdown + lw t2, (t1) + beqz t2, firstnmi + /* Mask out interrupt and redispatch immediately */ + and s0, s0, ~CAUSE_IP5 b redispatch - and $s0, $s0, $at firstnmi: - // Set __osShutdown - li $t2, 1 - sw $t2, ($t1) - // Post a PreNMI event message + /* Set __osShutdown */ + li t2, 1 + sw t2, (t1) + /* Post a PreNMI event message */ + li a0, MESG(OS_EVENT_PRENMI) jal send_mesg - li $a0, OS_EVENT_PRENMI*8 - // Mask out and disable IP5/PreNMI interrupt for the highest priority thread - lui $t2, %hi(__osRunQueue) - lw $t2, %lo(__osRunQueue)($t2) - li $at, ~SR_IBIT5 - and $s0, $s0, $at - lw $k1, THREAD_SR($t2) - and $k1, $k1, $at - // Redispatch immediately + /* Mask out and disable IP5/PreNMI interrupt for the highest priority thread */ + and s0, s0, ~SR_IBIT5 + lw t2, __osRunQueue + lw k1, THREAD_SR(t2) + and k1, k1, ~SR_IBIT5 + sw k1, THREAD_SR(t2) + /* Redispatch immediately */ b redispatch - sw $k1, THREAD_SR($t2) sw2: - // Mask out interrupt - li $at, ~CAUSE_SW2 - and $t0, $t0, $at - mtc0 $t0, C0_CAUSE - // Post sw2 event message + /* Mask out interrupt */ + and t0, t0, ~CAUSE_SW2 + MTC0( t0, C0_CAUSE) + /* Post sw2 event message */ + li a0, MESG(OS_EVENT_SW2) jal send_mesg - li $a0, OS_EVENT_SW2*8 - li $at, ~CAUSE_SW2 - // Mask out interrupt and continue + /* Mask out interrupt and continue */ + and s0, s0, ~CAUSE_SW2 b next_interrupt - and $s0, $s0, $at sw1: - // Mask out interrupt - li $at, ~CAUSE_SW1 - and $t0, $t0, $at - mtc0 $t0, C0_CAUSE - // Post sw1 event message + /* Mask out interrupt */ + and t0, t0, ~CAUSE_SW1 + MTC0( t0, C0_CAUSE) + /* Post sw1 event message */ + li a0, MESG(OS_EVENT_SW1) jal send_mesg - li $a0, OS_EVENT_SW1*8 - li $at, ~CAUSE_SW1 - // Mask out interrupt and continue + /* Mask out interrupt and continue */ + and s0, s0, ~CAUSE_SW1 b next_interrupt - and $s0, $s0, $at handle_break: - // Set last thread as having hit a break exception - li $t1, OS_FLAG_CPU_BREAK - sh $t1, THREAD_FLAGS($k0) - // Post a cpu break event message + /* Set last thread as having hit a break exception */ + li t1, OS_FLAG_CPU_BREAK + sh t1, THREAD_FLAGS(k0) + /* Post a cpu break event message */ + li a0, MESG(OS_EVENT_CPU_BREAK) jal send_mesg - li $a0, OS_EVENT_CPU_BREAK*8 - // Redispatch + /* Redispatch */ b redispatch - nop redispatch: - lui $t2, %hi(__osRunQueue) - lw $t2, %lo(__osRunQueue)($t2) - // Get priority of previously running thread - lw $t1, THREAD_PRI($k0) - // Get highest priority from waiting threads - lw $t3, THREAD_PRI($t2) - slt $at, $t1, $t3 - beqz $at, enqueueRunning - nop - // The previously running thread is no longer the highest priority, - // enqueue it to the run queue to wait its turn again - lui $a0, %hi(__osRunQueue) - move $a1, $k0 + /* Get priority of previously running thread */ + lw t1, THREAD_PRI(k0) + lw t2, __osRunQueue + /* Get highest priority from waiting threads */ + lw t3, THREAD_PRI(t2) + bge t1, t3, enqueueRunning + /* The previously running thread is no longer the highest priority, */ + /* enqueue it to the run queue to wait its turn again */ + move a1, k0 + la a0, __osRunQueue jal __osEnqueueThread - addiu $a0, $a0, %lo(__osRunQueue) + j __osDispatchThread - nop /** * Resume the previously running thread by placing it at the top of * the run queue and dispatching it */ enqueueRunning: - lui $t1, %hi(__osRunQueue) - addiu $t1, $t1, %lo(__osRunQueue) - lw $t2, ($t1) - sw $t2, THREAD_NEXT($k0) + la t1, __osRunQueue + lw t2, (t1) + sw t2, THREAD_NEXT(k0) + sw k0, (t1) j __osDispatchThread - sw $k0, ($t1) /** * Unhandled exceptions & interrupts end up here, * trap to software by posting a fault message */ panic: - // Mark the thread as having faulted - lui $at, %hi(__osFaultedThread) - sw $k0, %lo(__osFaultedThread)($at) - li $t1, OS_STATE_STOPPED - sh $t1, THREAD_STATE($k0) - li $t1, OS_FLAG_FAULT - sh $t1, THREAD_FLAGS($k0) - // Save C0_BADVADDR - mfc0 $t2, C0_BADVADDR - sw $t2, THREAD_BADVADDR($k0) - // Post the fault message + /* Mark the thread as having faulted */ + sw k0, __osFaultedThread + li t1, OS_STATE_STOPPED + sh t1, THREAD_STATE(k0) + li t1, OS_FLAG_FAULT + sh t1, THREAD_FLAGS(k0) + /* Save C0_BADVADDR */ + MFC0( t2, C0_BADVADDR) + sw t2, THREAD_BADVADDR(k0) + /* Post the fault message */ + li a0, MESG(OS_EVENT_FAULT) jal send_mesg - li $a0, OS_EVENT_FAULT*8 - // Dispatch next thread + /* Dispatch next thread */ j __osDispatchThread - nop /** * Handles posting event messages to the listening message queue, if there is one */ send_mesg: - // Load pointer to listening message queue - lui $t2, %hi(__osEventStateTab) - addiu $t2, %lo(__osEventStateTab) - addu $t2, $t2, $a0 - lw $t1, ($t2) - // Save return address - move $s2, $ra - // If there is no listening message queue, done - beqz $t1, send_done - nop - // Test if the message queue is full, if so don't post the message - lw $t3, MQ_VALIDCOUNT($t1) - lw $t4, MQ_MSGCOUNT($t1) - slt $at, $t3, $t4 - beqz $at, send_done - nop - // Add validcount to first and modulo with msgcount - lw $t5, MQ_FIRST($t1) - addu $t5, $t5, $t3 - // Modulo - div $zero, $t5, $t4 - bnez $t4, 1f - nop - break 7 // div0 -1: - li $at, -1 - bne $t4, $at, 2f - li $at, -0x80000000 - bne $t5, $at, 2f - nop - break 6 // overflow -2: - // End Modulo - lw $t4, MQ_MSG($t1) - mfhi $t5 - sll $t5, $t5, 2 - addu $t4, $t4, $t5 - // Fetch the message to post - lw $t5, 4($t2) - addiu $t2, $t3, 1 - // Post the message to the message queue - sw $t5, ($t4) - // Increment the validCount - sw $t2, MQ_VALIDCOUNT($t1) - // If there was a thread blocked on this message queue, - // wake it up - lw $t2, MQ_MTQUEUE($t1) - lw $t3, ($t2) - beqz $t3, send_done - nop + /* Save return address */ + move s2, ra + /* Load pointer to listening message queue */ + la t2, __osEventStateTab + addu t2, t2, a0 + lw t1, (t2) + /* If there is no listening message queue, done */ + beqz t1, send_done + + /* Test if the message queue is full, if so don't post the message */ + lw t3, MQ_VALIDCOUNT(t1) + lw t4, MQ_MSGCOUNT(t1) + bge t3, t4, send_done + + /* Add validcount to first and modulo with msgcount */ + lw t5, MQ_FIRST(t1) + addu t5, t5, t3 + rem t5, t5, t4 + lw t4, MQ_MSG(t1) + mul t5, t5, 4 + addu t4, t4, t5 + /* Post the message to the message queue */ + lw t5, 4(t2) + sw t5, (t4) + /* Increment the validCount */ + addiu t2, t3, 1 + sw t2, MQ_VALIDCOUNT(t1) + /* If there was a thread blocked on this message queue, */ + /* wake it up */ + lw t2, MQ_MTQUEUE(t1) + lw t3, (t2) + beqz t3, send_done + move a0, t1 jal __osPopThread - move $a0, $t1 - move $t2, $v0 - lui $a0, %hi(__osRunQueue) - move $a1, $t2 + move t2, v0 + move a1, t2 + la a0, __osRunQueue jal __osEnqueueThread - addiu $a0, %lo(__osRunQueue) send_done: - jr $s2 - nop + jr s2 /** * Handle coprocessor unusable exception */ handle_CpU: - li $at, CAUSE_CEMASK - and $t1, $t0, $at - srl $t1, $t1, CAUSE_CESHIFT - li $t2, 1 // if not coprocessor 1, panic - bne $t1, $t2, panic - nop - // Mark cop1 as usable for previous thread - lw $k1, THREAD_SR($k0) - li $at, SR_CU1 - li $t1, 1 - or $k1, $k1, $at - sw $t1, THREAD_FP($k0) + and t1, t0, CAUSE_CEMASK + srl t1, t1, CAUSE_CESHIFT + li t2, 1 /* if not coprocessor 1, panic */ + bne t1, t2, panic + /* Mark cop1 as usable for previous thread */ + li t1, 1 + sw t1, THREAD_FP(k0) + lw k1, THREAD_SR(k0) + or k1, k1, SR_CU1 + sw k1, THREAD_SR(k0) b enqueueRunning - sw $k1, THREAD_SR($k0) END(__osException) /** @@ -741,88 +763,76 @@ END(__osException) * unblocked runnable thread. */ LEAF(__osEnqueueAndYield) - lui $a1, %hi(__osRunningThread) - lw $a1, %lo(__osRunningThread)($a1) - // Save SR - mfc0 $t0, C0_SR - lw $k1, THREAD_FP($a1) - ori $t0, $t0, SR_EXL - sw $t0, THREAD_SR($a1) - // Save callee-saved registers - sd $s0, THREAD_S0($a1) - sd $s1, THREAD_S1($a1) - sd $s2, THREAD_S2($a1) - sd $s3, THREAD_S3($a1) - sd $s4, THREAD_S4($a1) - sd $s5, THREAD_S5($a1) - sd $s6, THREAD_S6($a1) - sd $s7, THREAD_S7($a1) - sd $gp, THREAD_GP($a1) - sd $sp, THREAD_SP($a1) - sd $fp, THREAD_S8($a1) - sd $ra, THREAD_RA($a1) - // Save FPU callee-saved registers if the current thread has used the FPU - beqz $k1, 1f - sw $ra, THREAD_PC($a1) - cfc1 $k1, C1_FPCSR - sdc1 $f20, THREAD_FP20($a1) - sdc1 $f22, THREAD_FP22($a1) - sdc1 $f24, THREAD_FP24($a1) - sdc1 $f26, THREAD_FP26($a1) - sdc1 $f28, THREAD_FP28($a1) - sdc1 $f30, THREAD_FP30($a1) - sw $k1, THREAD_FPCSR($a1) + lw a1, __osRunningThread + /* Save SR */ + MFC0( t0, C0_SR) + ori t0, t0, SR_EXL + sw t0, THREAD_SR(a1) + /* Save callee-saved registers */ + sd s0, THREAD_S0(a1) + sd s1, THREAD_S1(a1) + sd s2, THREAD_S2(a1) + sd s3, THREAD_S3(a1) + sd s4, THREAD_S4(a1) + sd s5, THREAD_S5(a1) + sd s6, THREAD_S6(a1) + sd s7, THREAD_S7(a1) + sd gp, THREAD_GP(a1) + sd sp, THREAD_SP(a1) + sd fp, THREAD_S8(a1) + sd ra, THREAD_RA(a1) + sw ra, THREAD_PC(a1) + /* Save FPU callee-saved registers if the current thread has used the FPU */ + lw k1, THREAD_FP(a1) + beqz k1, 1f + cfc1 k1, C1_FPCSR + sw k1, THREAD_FPCSR(a1) + sdc1 $f20, THREAD_FP20(a1) + sdc1 $f22, THREAD_FP22(a1) + sdc1 $f24, THREAD_FP24(a1) + sdc1 $f26, THREAD_FP26(a1) + sdc1 $f28, THREAD_FP28(a1) + sdc1 $f30, THREAD_FP30(a1) 1: - lw $k1, THREAD_SR($a1) - andi $t1, $k1, SR_IMASK - beqz $t1, 2f - nop - // This code does the same thing as the block just above the `savercp` label. - // See the comment there for more about this. - lui $t0, %hi(__OSGlobalIntMask) - addiu $t0, %lo(__OSGlobalIntMask) - lw $t0, ($t0) - li $at, ~0 - xor $t0, $t0, $at - lui $at, ((~SR_IMASK) >> 0x10) & 0xFFFF - andi $t0, $t0, SR_IMASK - ori $at, (~SR_IMASK) & 0xFFFF - or $t1, $t1, $t0 - and $k1, $k1, $at - or $k1, $k1, $t1 - sw $k1, THREAD_SR($a1) + lw k1, THREAD_SR(a1) + andi t1, k1, SR_IMASK + beqz t1, 2f + /* This code does the same thing as the block just above the `savercp` label. */ + /* See the comment there for more about this. */ + la t0, __OSGlobalIntMask + lw t0, (t0) + xor t0, t0, 0xFFFFFFFF + andi t0, t0, SR_IMASK + or t1, t1, t0 + and k1, k1, ~SR_IMASK + or k1, k1, t1 + sw k1, THREAD_SR(a1) 2: - lui $k1, %hi(PHYS_TO_K1(MI_INTR_MASK_REG)) - lw $k1, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($k1) - beqz $k1, 3f - nop - // This code does the same thing as the block just below the `savercp` label. - // See the comment there for more about this. - lui $k0, %hi(__OSGlobalIntMask) - addiu $k0, %lo(__OSGlobalIntMask) - lw $k0, ($k0) - lw $t0, THREAD_RCP($a1) - li $at, ~0 - srl $k0, $k0, RCP_IMASKSHIFT - xor $k0, $k0, $at - andi $k0, $k0, (RCP_IMASK >> RCP_IMASKSHIFT) - and $k0, $k0, $t0 - or $k1, $k1, $k0 + lw k1, PHYS_TO_K1(MI_INTR_MASK_REG) + beqz k1, 3f + /* This code does the same thing as the block just below the `savercp` label. */ + /* See the comment there for more about this. */ + la k0, __OSGlobalIntMask + lw k0, (k0) + srl k0, k0, RCP_IMASKSHIFT + xor k0, k0, 0xFFFFFFFF + andi k0, k0, (RCP_IMASK >> RCP_IMASKSHIFT) + lw t0, THREAD_RCP(a1) + and k0, k0, t0 + or k1, k1, k0 3: - // If the specified thread queue is null, skip - // straight to dispatching - beqz $a0, no_enqueue - sw $k1, THREAD_RCP($a1) + /* If the specified thread queue is null, skip */ + /* straight to dispatching */ + sw k1, THREAD_RCP(a1) + beqz a0, no_enqueue jal __osEnqueueThread - nop no_enqueue: #if ENABLE_PROFILER - lw $a0, THREAD_ID($a1) // a1 is still the pointer to thread + lw a0, THREAD_ID(a1) /* a1 is still the pointer to thread */ + addiu a0, a0, PROFILER_EVENT_TYPE_THREADEND jal __osRecordProfilerEvent - addiu $a0, $a0, PROFILER_EVENT_TYPE_THREADEND #endif j __osDispatchThread - nop END(__osEnqueueAndYield) /** @@ -831,31 +841,27 @@ END(__osEnqueueAndYield) * Enqueues `thread` to the thread queue `threadQueue`, inserted by priority */ LEAF(__osEnqueueThread) - lw $t8, ($a0) - lw $t7, THREAD_PRI($a1) - move $t9, $a0 - lw $t6, THREAD_PRI($t8) - slt $at, $t6, $t7 - // If the current highest priority thread is a lower priority than - // the new thread, skip searching the queue - bnez $at, 2f - nop + move t9, a0 + lw t8, (a0) + lw t7, THREAD_PRI(a1) + lw t6, THREAD_PRI(t8) + /* If the current highest priority thread is a lower priority than */ + /* the new thread, skip searching the queue */ + blt t6, t7, 2f 1: - // Search the queue for the position to insert the thread to maintain - // ordering by priority - move $t9, $t8 - lw $t8, THREAD_NEXT($t8) - lw $t6, THREAD_PRI($t8) - slt $at, $t6, $t7 - beqz $at, 1b - nop + /* Search the queue for the position to insert the thread to maintain */ + /* ordering by priority */ + move t9, t8 + lw t8, THREAD_NEXT(t8) + lw t6, THREAD_PRI(t8) + bge t6, t7, 1b 2: - // Insert the thread into the queue - lw $t8, ($t9) - sw $t8, THREAD_NEXT($a1) - sw $a1, ($t9) - jr $ra - sw $a0, THREAD_QUEUE($a1) + /* Insert the thread into the queue */ + lw t8, (t9) + sw t8, THREAD_NEXT(a1) + sw a1, (t9) + sw a0, THREAD_QUEUE(a1) + jr ra END(__osEnqueueThread) /** @@ -865,16 +871,15 @@ END(__osEnqueueThread) * thread queue `threadQueue` and returns it */ LEAF(__osPopThread) - lw $v0, ($a0) - lw $t9, THREAD_NEXT($v0) - jr $ra - sw $t9, ($a0) + lw v0, (a0) + lw t9, THREAD_NEXT(v0) + sw t9, (a0) + jr ra END(__osPopThread) -#if !PLATFORM_N64 +#if LIBULTRA_VERSION >= LIBULTRA_VERSION_K LEAF(__osNop) - jr $ra - nop + jr ra END(__osNop) #endif @@ -883,31 +888,29 @@ END(__osNop) * void __osRecordProfilerEvent(s32 type); */ LEAF(__osRecordProfilerEvent) - lui $t0, %hi(activeProfilerState) - lw $t0, %lo(activeProfilerState)($t0) // activeProfilerState - beqz $t0, done - mfc0 $t1, C0_COUNT // count - lw $a1, (9*PROFILER_EVENT_COUNT)($t0) // ->numEvents - slti $at, $a1, PROFILER_EVENT_COUNT // Profiler full? - beqz $at, done -get_time_no_interrupts: // osGetTime, but without the interrupts - lui $t2, %hi(__osBaseCounter) - lw $t2, %lo(__osBaseCounter)($t2) - subu $t2, $t1, $t2 // base = count - __osBaseCounter - lui $t3, %hi(__osCurrentTime) - ld $t3, %lo(__osCurrentTime)($t3) - addu $t1, $t2, $t3 // time = base + t + lui t0, %hi(activeProfilerState) + lw t0, %lo(activeProfilerState)(t0) /* activeProfilerState */ + mfc0 t1, C0_COUNT /* count */ + beqz t0, done + lw a1, (9*PROFILER_EVENT_COUNT)(t0) /* ->numEvents */ + bge a1, PROFILER_EVENT_COUNT, done /* Profiler full? */ +get_time_no_interrupts: /* osGetTime, but without the interrupts */ + lui t2, %hi(__osBaseCounter) + lw t2, %lo(__osBaseCounter)(t2) + subu t2, t1, t2 /* base = count - __osBaseCounter */ + lui t3, %hi(__osCurrentTime) + ld t3, %lo(__osCurrentTime)(t3) + addu t1, t2, t3 /* time = base + t */ record: - sll $a2, $a1, 3 // numEvents * 8 for eventTimes - addu $a2, $a2, $t0 // activeProfilerState->eventTimes[e] - sd $t1, (0)($a2) - addu $a3, $a1, $t0 // activeProfilerState->{null}[e] - sb $a0, (8*PROFILER_EVENT_COUNT)($a3) // eventTypes - addiu $a1, $a1, 1 // numEvents++ - sw $a1, (9*PROFILER_EVENT_COUNT)($t0) // Write back numEvents + sll a2, a1, 3 /* numEvents * 8 for eventTimes */ + addu a2, a2, t0 /* activeProfilerState->eventTimes[e] */ + sd t1, (0)(a2) + addu a3, a1, t0 /* activeProfilerState->{null}[e] */ + sb a0, (8*PROFILER_EVENT_COUNT)(a3) /* eventTypes */ + addiu a1, a1, 1 /* numEvents++ */ + sw a1, (9*PROFILER_EVENT_COUNT)(t0) /* Write back numEvents */ done: - jr $ra - nop + jr ra END(__osRecordProfilerEvent) #endif @@ -917,120 +920,118 @@ END(__osRecordProfilerEvent) * Dispatches the next thread to run after restoring the context */ LEAF(__osDispatchThread) - // Obtain highest priority thread from the active run queue - lui $a0, %hi(__osRunQueue) + /* Obtain highest priority thread from the active run queue */ + la a0, __osRunQueue jal __osPopThread - addiu $a0, $a0, %lo(__osRunQueue) - // Set thread as running - lui $at, %hi(__osRunningThread) - sw $v0, %lo(__osRunningThread)($at) + /* Set thread as running */ + sw v0, __osRunningThread + li t0, OS_STATE_RUNNING + sh t0, THREAD_STATE(v0) #if ENABLE_PROFILER - move $s0, $v0 - lw $a0, THREAD_ID($v0) + move s0, v0 + lw a0, THREAD_ID(v0) + addiu a0, a0, PROFILER_EVENT_TYPE_THREADSTART jal __osRecordProfilerEvent - addiu $a0, $a0, PROFILER_EVENT_TYPE_THREADSTART - move $v0, $s0 + move v0, s0 #endif - li $t0, OS_STATE_RUNNING - sh $t0, THREAD_STATE($v0) - // Restore SR, masking out any interrupts that are not also - // enabled in the global interrupt mask - move $k0, $v0 - lui $t0, %hi(__OSGlobalIntMask) - lw $k1, THREAD_SR($k0) - addiu $t0, %lo(__OSGlobalIntMask) - lw $t0, ($t0) - lui $at, ((~SR_IMASK) >> 0x10) & 0xFFFF - andi $t1, $k1, SR_IMASK - ori $at, (~SR_IMASK) & 0xFFFF - andi $t0, $t0, SR_IMASK - and $t1, $t1, $t0 - and $k1, $k1, $at - or $k1, $k1, $t1 - mtc0 $k1, C0_SR - // Restore GPRs - ld $k1, THREAD_LO($k0) - ld $at, THREAD_AT($k0) - ld $v0, THREAD_V0($k0) - mtlo $k1 - ld $k1, THREAD_HI($k0) - ld $v1, THREAD_V1($k0) - ld $a0, THREAD_A0($k0) - ld $a1, THREAD_A1($k0) - ld $a2, THREAD_A2($k0) - ld $a3, THREAD_A3($k0) - ld $t0, THREAD_T0($k0) - ld $t1, THREAD_T1($k0) - ld $t2, THREAD_T2($k0) - ld $t3, THREAD_T3($k0) - ld $t4, THREAD_T4($k0) - ld $t5, THREAD_T5($k0) - ld $t6, THREAD_T6($k0) - ld $t7, THREAD_T7($k0) - ld $s0, THREAD_S0($k0) - ld $s1, THREAD_S1($k0) - ld $s2, THREAD_S2($k0) - ld $s3, THREAD_S3($k0) - ld $s4, THREAD_S4($k0) - ld $s5, THREAD_S5($k0) - ld $s6, THREAD_S6($k0) - ld $s7, THREAD_S7($k0) - ld $t8, THREAD_T8($k0) - ld $t9, THREAD_T9($k0) - ld $gp, THREAD_GP($k0) - mthi $k1 - ld $sp, THREAD_SP($k0) - ld $fp, THREAD_S8($k0) - ld $ra, THREAD_RA($k0) - // Move thread pc to EPC so that eret will return execution to where the thread left off - lw $k1, THREAD_PC($k0) - mtc0 $k1, C0_EPC - // Check if the FPU was used by this thread and if so also restore the FPU registers - lw $k1, THREAD_FP($k0) - beqz $k1, 1f - nop - lw $k1, THREAD_FPCSR($k0) - ctc1 $k1, C1_FPCSR - ldc1 $f0, THREAD_FP0($k0) - ldc1 $f2, THREAD_FP2($k0) - ldc1 $f4, THREAD_FP4($k0) - ldc1 $f6, THREAD_FP6($k0) - ldc1 $f8, THREAD_FP8($k0) - ldc1 $f10, THREAD_FP10($k0) - ldc1 $f12, THREAD_FP12($k0) - ldc1 $f14, THREAD_FP14($k0) - ldc1 $f16, THREAD_FP16($k0) - ldc1 $f18, THREAD_FP18($k0) - ldc1 $f20, THREAD_FP20($k0) - ldc1 $f22, THREAD_FP22($k0) - ldc1 $f24, THREAD_FP24($k0) - ldc1 $f26, THREAD_FP26($k0) - ldc1 $f28, THREAD_FP28($k0) - ldc1 $f30, THREAD_FP30($k0) + /* Restore SR, masking out any interrupts that are not also */ + /* enabled in the global interrupt mask */ + move k0, v0 + lw k1, THREAD_SR(k0) + la t0, __OSGlobalIntMask + lw t0, (t0) + andi t0, t0, SR_IMASK + andi t1, k1, SR_IMASK + and t1, t1, t0 + and k1, k1, ~SR_IMASK + or k1, k1, t1 + MTC0( k1, C0_SR) + /* Restore GPRs */ +.set noat + ld AT, THREAD_AT(k0) + ld v0, THREAD_V0(k0) + ld v1, THREAD_V1(k0) + ld a0, THREAD_A0(k0) + ld a1, THREAD_A1(k0) + ld a2, THREAD_A2(k0) + ld a3, THREAD_A3(k0) + ld t0, THREAD_T0(k0) + ld t1, THREAD_T1(k0) + ld t2, THREAD_T2(k0) + ld t3, THREAD_T3(k0) + ld t4, THREAD_T4(k0) + ld t5, THREAD_T5(k0) + ld t6, THREAD_T6(k0) + ld t7, THREAD_T7(k0) + ld s0, THREAD_S0(k0) + ld s1, THREAD_S1(k0) + ld s2, THREAD_S2(k0) + ld s3, THREAD_S3(k0) + ld s4, THREAD_S4(k0) + ld s5, THREAD_S5(k0) + ld s6, THREAD_S6(k0) + ld s7, THREAD_S7(k0) + ld t8, THREAD_T8(k0) + ld t9, THREAD_T9(k0) + ld gp, THREAD_GP(k0) + ld sp, THREAD_SP(k0) + ld fp, THREAD_S8(k0) + ld ra, THREAD_RA(k0) + ld k1, THREAD_LO(k0) + mtlo k1 + ld k1, THREAD_HI(k0) + mthi k1 + /* Move thread pc to EPC so that eret will return execution to where the thread left off */ + lw k1, THREAD_PC(k0) + MTC0( k1, C0_EPC) + /* Check if the FPU was used by this thread and if so also restore the FPU registers */ + lw k1, THREAD_FP(k0) + beqz k1, 1f + +.set noreorder + lw k1, THREAD_FPCSR(k0) + ctc1 k1, C1_FPCSR +.set reorder + ldc1 $f0, THREAD_FP0(k0) + ldc1 $f2, THREAD_FP2(k0) + ldc1 $f4, THREAD_FP4(k0) + ldc1 $f6, THREAD_FP6(k0) + ldc1 $f8, THREAD_FP8(k0) + ldc1 $f10, THREAD_FP10(k0) + ldc1 $f12, THREAD_FP12(k0) + ldc1 $f14, THREAD_FP14(k0) + ldc1 $f16, THREAD_FP16(k0) + ldc1 $f18, THREAD_FP18(k0) + ldc1 $f20, THREAD_FP20(k0) + ldc1 $f22, THREAD_FP22(k0) + ldc1 $f24, THREAD_FP24(k0) + ldc1 $f26, THREAD_FP26(k0) + ldc1 $f28, THREAD_FP28(k0) + ldc1 $f30, THREAD_FP30(k0) 1: - // Restore RCP interrupt mask, masking out any RCP interrupts that - // are not also enabled in the global interrupt mask - lw $k1, THREAD_RCP($k0) - lui $k0, %hi(__OSGlobalIntMask) - addiu $k0, %lo(__OSGlobalIntMask) - lw $k0, ($k0) - srl $k0, $k0, RCP_IMASKSHIFT - and $k1, $k1, $k0 - sll $k1, $k1, 1 - lui $k0, %hi(__osRcpImTable) - addiu $k0, %lo(__osRcpImTable) - addu $k1, $k1, $k0 - lhu $k1, ($k1) - lui $k0, %hi(PHYS_TO_K1(MI_INTR_MASK_REG)) - addiu $k0, %lo(PHYS_TO_K1(MI_INTR_MASK_REG)) - sw $k1, ($k0) - // Empty pipeline + /* Restore RCP interrupt mask, masking out any RCP interrupts that */ + /* are not also enabled in the global interrupt mask */ +.set noreorder + lw k1, THREAD_RCP(k0) + la k0, __OSGlobalIntMask + lw k0, (k0) + srl k0, k0, RCP_IMASKSHIFT + and k1, k1, k0 + sll k1, k1, 1 + la k0, __osRcpImTable + addu k1, k1, k0 + lhu k1, (k1) + la k0, PHYS_TO_K1(MI_INTR_MASK_REG) + sw k1, (k0) + /* Empty pipeline */ nop nop nop nop - // Resume thread execution + /* Resume thread execution */ eret +.set reorder +.set at END(__osDispatchThread) /** @@ -1041,7 +1042,7 @@ END(__osDispatchThread) * current thread to be destroyed. */ LEAF(__osCleanupThread) + move a0, zero jal osDestroyThread - move $a0, $zero - // Despite being a jal, this function does not return as the thread will have been destroyed + /* Despite being a jal, this function does not return as the thread will have been destroyed */ END(__osCleanupThread) diff --git a/src/libultra/os/getcause.s b/src/libultra/os/getcause.s index a621e97363..b59c5c6801 100644 --- a/src/libultra/os/getcause.s +++ b/src/libultra/os/getcause.s @@ -1,14 +1,10 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(__osGetCause) - mfc0 $v0, C0_CAUSE - jr $ra - nop + MFC0( v0, C0_CAUSE) + jr ra END(__osGetCause) diff --git a/src/libultra/os/getcount.s b/src/libultra/os/getcount.s index 242c9da692..84552adb00 100644 --- a/src/libultra/os/getcount.s +++ b/src/libultra/os/getcount.s @@ -1,14 +1,10 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(osGetCount) - mfc0 $v0, C0_COUNT - jr $ra - nop + MFC0( v0, C0_COUNT) + jr ra END(osGetCount) diff --git a/src/libultra/os/getfpccsr.s b/src/libultra/os/getfpccsr.s index 93d4e51b8e..37c0e8c3b2 100644 --- a/src/libultra/os/getfpccsr.s +++ b/src/libultra/os/getfpccsr.s @@ -1,14 +1,10 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(__osGetFpcCsr) - cfc1 $v0, C1_FPCSR - jr $ra - nop + CFC1( v0, C1_FPCSR) + jr ra END(__osGetFpcCsr) diff --git a/src/libultra/os/getintmask.s b/src/libultra/os/getintmask.s index 2c6ddc86ed..f734103938 100644 --- a/src/libultra/os/getintmask.s +++ b/src/libultra/os/getintmask.s @@ -1,14 +1,10 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" #include "ultra64/rcp.h" #include "ultra64/exception.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text /** * OSIntMask osGetIntMask(void); @@ -23,38 +19,35 @@ * See the comment for osSetIntMask for more details. */ LEAF(osGetIntMask) - // Extract interrupt enable bits from current SR - mfc0 $v0, C0_SR - andi $v0, $v0, (SR_IMASK | SR_IE) - // Get value of __OSGlobalIntMask - lui $t0, %hi(__OSGlobalIntMask) - addiu $t0, %lo(__OSGlobalIntMask) - lw $t1, 0($t0) - // Bitwise-OR in the disabled CPU bits of __OSGlobalIntMask - li $at, ~0 - xor $t0, $t1, $at - andi $t0, $t0, SR_IMASK - or $v0, $v0, $t0 - // Fetch MI_INTR_MASK_REG - lui $t1, %hi(PHYS_TO_K1(MI_INTR_MASK_REG)) - lw $t1, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($t1) - // If there are RCP interrupts masked - beqz $t1, 1f - // Get value of __OSGlobalIntMask - lui $t0, %hi(__OSGlobalIntMask) - addiu $t0, %lo(__OSGlobalIntMask) - lw $t0, 0($t0) - // Bitwise-OR in the disabled RCP bits of __OSGlobalIntMask - srl $t0, $t0, RCP_IMASKSHIFT - li $at, ~0 - xor $t0, $t0, $at - andi $t0, $t0, (RCP_IMASK >> RCP_IMASKSHIFT) - or $t1, $t1, $t0 +.set noreorder + /* Extract interrupt enable bits from current SR */ + mfc0 v0, C0_SR + andi v0, v0, (SR_IMASK | SR_IE) + /* Get value of __OSGlobalIntMask */ + la t0, __OSGlobalIntMask + lw t1, (t0) + /* Bitwise-OR in the disabled CPU bits of __OSGlobalIntMask */ + xor t0, t1, ~0 + andi t0, t0, SR_IMASK + or v0, v0, t0 + /* Fetch MI_INTR_MASK_REG */ + lw t1, PHYS_TO_K1(MI_INTR_MASK_REG) + /* If there are RCP interrupts masked */ + beqz t1, 1f + /* Get value of __OSGlobalIntMask */ + la t0, __OSGlobalIntMask /* Note: macro expansion in delay slot */ + lw t0, (t0) + /* Bitwise-OR in the disabled RCP bits of __OSGlobalIntMask */ + srl t0, t0, RCP_IMASKSHIFT + xor t0, t0, ~0 + andi t0, t0, (RCP_IMASK >> RCP_IMASKSHIFT) + or t1, t1, t0 1: - // Shift the RCP bits to not conflict with the CPU bits - sll $t2, $t1, RCP_IMASKSHIFT - // OR the CPU and RCP bits together - or $v0, $v0, $t2 - jr $ra + /* Shift the RCP bits to not conflict with the CPU bits */ + sll t2, t1, RCP_IMASKSHIFT + /* OR the CPU and RCP bits together */ + or v0, v0, t2 + jr ra nop +.set reorder END(osGetIntMask) diff --git a/src/libultra/os/getsr.s b/src/libultra/os/getsr.s index dc6901b982..709075a7b7 100644 --- a/src/libultra/os/getsr.s +++ b/src/libultra/os/getsr.s @@ -1,14 +1,10 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(__osGetSR) - mfc0 $v0, C0_SR - jr $ra - nop + MFC0( v0, C0_SR) + jr ra END(__osGetSR) diff --git a/src/libultra/os/initialize.c b/src/libultra/os/initialize.c index e985d551d9..427a517710 100644 --- a/src/libultra/os/initialize.c +++ b/src/libultra/os/initialize.c @@ -16,12 +16,14 @@ OSHWIntr __OSGlobalIntMask = OS_IM_ALL; u32 __osFinalrom; -#if PLATFORM_N64 +#if LIBULTRA_VERSION < LIBULTRA_VERSION_K #define OSINITIALIZE_FUNC osInitialize #define SPEED_PARAM_FUNC createSpeedParam +#if (LIBULTRA_VERSION == LIBULTRA_VERSION_I && LIBULTRA_PATCH == 1) || (LIBULTRA_VERSION == LIBULTRA_VERSION_J) static void SPEED_PARAM_FUNC(void); +#endif #else @@ -46,14 +48,14 @@ void SPEED_PARAM_FUNC(void) { void OSINITIALIZE_FUNC(void) { u32 pifdata; -#if PLATFORM_N64 +#if LIBULTRA_VERSION < LIBULTRA_VERSION_K u32 clock = 0; #endif __osFinalrom = true; __osSetSR(__osGetSR() | SR_CU1); __osSetFpcCsr(FPCSR_FS | FPCSR_EV); -#if !PLATFORM_N64 +#if LIBULTRA_VERSION >= LIBULTRA_VERSION_K __osSetWatchLo(0x04900000); #endif @@ -71,9 +73,11 @@ void OSINITIALIZE_FUNC(void) { osWritebackDCache((void*)K0BASE, E_VEC - K0BASE + sizeof(__osExceptionVector)); osInvalICache((void*)K0BASE, E_VEC - K0BASE + sizeof(__osExceptionVector)); +#if (LIBULTRA_VERSION == LIBULTRA_VERSION_I && LIBULTRA_PATCH == 1) || (LIBULTRA_VERSION > LIBULTRA_VERSION_I) SPEED_PARAM_FUNC(); osUnmapTLBAll(); osMapTLBRdb(); +#endif osClockRate = osClockRate * 3 / 4; @@ -89,19 +93,21 @@ void OSINITIALIZE_FUNC(void) { osViClock = VI_NTSC_CLOCK; } +#if (LIBULTRA_VERSION == LIBULTRA_VERSION_I && LIBULTRA_PATCH == 1) || (LIBULTRA_VERSION >= LIBULTRA_VERSION_J) // If PreNMI is pending, loop until reset if (__osGetCause() & CAUSE_IP5) { while (true) { ; } } +#endif IO_WRITE(AI_CONTROL_REG, AI_CONTROL_DMA_ON); IO_WRITE(AI_DACRATE_REG, AI_MAX_DAC_RATE - 1); IO_WRITE(AI_BITRATE_REG, AI_MAX_BIT_RATE - 1); } -#if PLATFORM_N64 +#if (LIBULTRA_VERSION == LIBULTRA_VERSION_I && LIBULTRA_PATCH == 1) || (LIBULTRA_VERSION == LIBULTRA_VERSION_J) static void SPEED_PARAM_FUNC(void) { __Dom1SpeedParam.type = DEVICE_TYPE_INIT; __Dom1SpeedParam.latency = IO_READ(PI_BSD_DOM1_LAT_REG); diff --git a/src/libultra/os/interrupt.s b/src/libultra/os/interrupt.s index 829377bb0e..3a9102c579 100644 --- a/src/libultra/os/interrupt.s +++ b/src/libultra/os/interrupt.s @@ -1,53 +1,45 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" #include "ultra64/thread.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text LEAF(__osDisableInt) - lui $t2, %hi(__OSGlobalIntMask) - addiu $t2, $t2, %lo(__OSGlobalIntMask) - lw $t3, ($t2) - andi $t3, $t3, SR_IMASK - mfc0 $t0, C0_SR - li $at, ~SR_IE - and $t1, $t0, $at - mtc0 $t1, C0_SR - andi $v0, $t0, SR_IE - lw $t0, ($t2) - andi $t0, $t0, SR_IMASK - beq $t0, $t3, No_Change_Global_Int - lui $t2, %hi(__osRunningThread) - //! @bug this addiu should be lw, it may never come up in practice as to reach this code - //! the CPU bits of __OSGlobalIntMask must have changed while this function is running. - addiu $t2, $t2, %lo(__osRunningThread) - lw $t1, THREAD_SR($t2) - andi $t2, $t1, SR_IMASK - and $t2, $t2, $t0 - li $at, ~SR_IMASK - and $t1, $t1, $at - or $t1, $t1, $t2 - li $at, ~SR_IE - and $t1, $t1, $at - mtc0 $t1, C0_SR - nop - nop + la t2, __OSGlobalIntMask + lw t3, (t2) + and t3, t3, SR_IMASK + MFC0( t0, C0_SR) + and t1, t0, ~SR_IE + MTC0( t1, C0_SR) + and v0, t0, SR_IE + lw t0, (t2) + and t0, t0, SR_IMASK +.set noreorder + beq t0, t3, No_Change_Global_Int + /*! @bug this la should be lw, it may never come up in practice as to reach this code + *! the CPU bits of __OSGlobalIntMask must have changed while this function is running. + */ + la t2, __osRunningThread + lw t1, THREAD_SR(t2) + and t2, t1, SR_IMASK + and t2, t2, t0 +.set reorder + and t1, t1, ~SR_IMASK + or t1, t1, t2 + and t1, t1, ~SR_IE + MTC0( t1, C0_SR) + NOP + NOP No_Change_Global_Int: - jr $ra - nop + jr ra END(__osDisableInt) LEAF(__osRestoreInt) - mfc0 $t0, C0_SR - or $t0, $t0, $a0 - mtc0 $t0, C0_SR - nop - nop - jr $ra - nop + MFC0( t0, C0_SR) + or t0, t0, a0 + MTC0( t0, C0_SR) + NOP + NOP + jr ra END(__osRestoreInt) diff --git a/src/libultra/os/invaldcache.s b/src/libultra/os/invaldcache.s index 9464a24da6..22109e13aa 100644 --- a/src/libultra/os/invaldcache.s +++ b/src/libultra/os/invaldcache.s @@ -1,12 +1,8 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text /** * void osInvalDCache(void* vaddr, s32 nbytes); @@ -24,71 +20,67 @@ * the entire data cache is invalidated. */ LEAF(osInvalDCache) - // If the amount to invalidate is less than or equal to 0, return immediately - blez $a1, 3f +.set noreorder + /* If the amount to invalidate is less than or equal to 0, return immediately */ + blez a1, 3f nop - // If the amount to invalidate is as large as or larger than - // the data cache size, invalidate all - li $t3, DCACHE_SIZE - sltu $at, $a1, $t3 - beqz $at, 4f + /* If the amount to invalidate is as large as or larger than + * the data cache size, invalidate all */ + li t3, DCACHE_SIZE + bgeu a1, t3, 4f nop - // Ensure end address doesn't wrap around and end up smaller - // than the start address - move $t0, $a0 - addu $t1, $a0, $a1 - sltu $at, $t0, $t1 - beqz $at, 3f + /* Ensure end address doesn't wrap around and end up smaller + * than the start address */ + move t0, a0 + addu t1, a0, a1 + bgeu t0, t1, 3f nop - // Mask start with cache line - andi $t2, $t0, DCACHE_LINEMASK - // If mask is not zero, the start is not cache aligned - beqz $t2, 1f - addiu $t1, $t1, -DCACHE_LINESIZE - // Subtract mask result to align to cache line - subu $t0, $t0, $t2 - // Hit-Writeback-Invalidate unaligned part - cache (CACH_PD | C_HWBINV), ($t0) - sltu $at, $t0, $t1 - // If that's all there is to do, return early - beqz $at, 3f + /* Mask start with cache line */ + andi t2, t0, DCACHE_LINEMASK + /* If mask is not zero, the start is not cache aligned */ + beqz t2, 1f + addiu t1, t1, -DCACHE_LINESIZE + /* Subtract mask result to align to cache line */ + subu t0, t0, t2 + /* Hit-Writeback-Invalidate unaligned part */ + cache (CACH_PD | C_HWBINV), (t0) + /* If that's all there is to do, return early */ + bgeu t0, t1, 3f nop - addiu $t0, $t0, DCACHE_LINESIZE + addiu t0, t0, DCACHE_LINESIZE 1: - // Mask end with cache line - andi $t2, $t1, DCACHE_LINEMASK - // If mask is not zero, the end is not cache aligned - beqz $t2, 1f + /* Mask end with cache line */ + andi t2, t1, DCACHE_LINEMASK + /* If mask is not zero, the end is not cache aligned */ + beqz t2, 1f nop - // Subtract mask result to align to cache line - subu $t1, $t1, $t2 - // Hit-Writeback-Invalidate unaligned part - cache (CACH_PD | C_HWBINV), DCACHE_LINESIZE($t1) - sltu $at, $t1, $t0 - // If that's all there is to do, return early - bnez $at, 3f + /* Subtract mask result to align to cache line */ + subu t1, t1, t2 + /* Hit-Writeback-Invalidate unaligned part */ + cache (CACH_PD | C_HWBINV), DCACHE_LINESIZE(t1) + /* If that's all there is to do, return early */ + bltu t1, t0, 3f nop - // Invalidate the rest + /* Invalidate the rest */ 1: - // Hit-Invalidate - cache (CACH_PD | C_HINV), ($t0) - sltu $at, $t0, $t1 - bnez $at, 1b - addiu $t0, $t0, DCACHE_LINESIZE + /* Hit-Invalidate */ + cache (CACH_PD | C_HINV), (t0) + bltu t0, t1, 1b + addiu t0, t0, DCACHE_LINESIZE 3: - jr $ra + jr ra nop 4: - li $t0, K0BASE - addu $t1, $t0, $t3 - addiu $t1, $t1, -DCACHE_LINESIZE + li t0, K0BASE + addu t1, t0, t3 + addiu t1, t1, -DCACHE_LINESIZE 5: - // Index-Writeback-Invalidate - cache (CACH_PD | C_IWBINV), ($t0) - sltu $at, $t0, $t1 - bnez $at, 5b - addiu $t0, DCACHE_LINESIZE - jr $ra + /* Index-Writeback-Invalidate */ + cache (CACH_PD | C_IWBINV), (t0) + bltu t0, t1, 5b + addiu t0, DCACHE_LINESIZE + jr ra nop +.set reorder END(osInvalDCache) diff --git a/src/libultra/os/invalicache.s b/src/libultra/os/invalicache.s index 55f8312380..757215cf19 100644 --- a/src/libultra/os/invalicache.s +++ b/src/libultra/os/invalicache.s @@ -1,52 +1,46 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text LEAF(osInvalICache) - // If the amount to invalidate is less than or equal to 0, return immediately - blez $a1, 2f +.set noreorder + /* If the amount to invalidate is less than or equal to 0, return immediately */ + blez a1, 2f nop - // If the amount to invalidate is as large as or larger than - // the instruction cache size, invalidate all - li $t3, ICACHE_SIZE - sltu $at, $a1, $t3 - beqz $at, 3f + /* If the amount to invalidate is as large as or larger than */ + /* the instruction cache size, invalidate all */ + li t3, ICACHE_SIZE + bgeu a1, t3, 3f nop - // ensure end address doesn't wrap around and end up smaller - // than the start address - move $t0, $a0 - addu $t1, $a0, $a1 - sltu $at, $t0, $t1 - beqz $at, 2f + /* ensure end address doesn't wrap around and end up smaller */ + /* than the start address */ + move t0, a0 + addu t1, a0, a1 + bgeu t0, t1, 2f nop - // Mask and subtract to align to cache line - andi $t2, $t0, ICACHE_LINEMASK - addiu $t1, $t1, -ICACHE_LINESIZE - subu $t0, $t0, $t2 + /* Mask and subtract to align to cache line */ + andi t2, t0, ICACHE_LINEMASK + addiu t1, t1, -ICACHE_LINESIZE + subu t0, t0, t2 1: - cache (CACH_PI | C_HINV), ($t0) - sltu $at, $t0, $t1 - bnez $at, 1b - addiu $t0, $t0, ICACHE_LINESIZE + cache (CACH_PI | C_HINV), (t0) + bltu t0, t1, 1b + addiu t0, t0, ICACHE_LINESIZE 2: - jr $ra + jr ra nop 3: - li $t0, K0BASE - addu $t1, $t0, $t3 - addiu $t1, $t1, -ICACHE_LINESIZE + li t0, K0BASE + addu t1, t0, t3 + addiu t1, t1, -ICACHE_LINESIZE 4: - cache (CACH_PI | C_IINV), ($t0) - sltu $at, $t0, $t1 - bnez $at, 4b - addiu $t0, ICACHE_LINESIZE - jr $ra + cache (CACH_PI | C_IINV), (t0) + bltu t0, t1, 4b + addiu t0, ICACHE_LINESIZE + jr ra nop +.set reorder END(osInvalICache) diff --git a/src/libultra/os/maptlbrdb.s b/src/libultra/os/maptlbrdb.s index c3ac20948b..43e7cc93a3 100644 --- a/src/libultra/os/maptlbrdb.s +++ b/src/libultra/os/maptlbrdb.s @@ -1,36 +1,31 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" #include "ultra64/rdb.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(osMapTLBRdb) - mfc0 $t0, C0_ENTRYHI - li $t1, NTLBENTRIES - mtc0 $t1, C0_INX - mtc0 $zero, C0_PAGEMASK - li $t2, (TLBLO_UNCACHED | TLBLO_D | TLBLO_V | TLBLO_G) - li $t1, (RDB_BASE_REG & TLBHI_VPN2MASK) - mtc0 $t1, C0_ENTRYHI - // Possible bug? Virtual address instead of physical address - // set as page frame number - li $t1, RDB_BASE_VIRTUAL_ADDR - srl $t3, $t1, TLBLO_PFNSHIFT - or $t3, $t3, $t2 - mtc0 $t3, C0_ENTRYLO0 - li $t1, TLBLO_G - mtc0 $t1, C0_ENTRYLO1 - nop - tlbwi - nop - nop - nop - nop - mtc0 $t0, C0_ENTRYHI - jr $ra - nop + MFC0( t0, C0_ENTRYHI) + li t1, NTLBENTRIES + MTC0( t1, C0_INX) + MTC0( zero, C0_PAGEMASK) + li t2, (TLBLO_UNCACHED | TLBLO_D | TLBLO_V | TLBLO_G) + li t1, (RDB_BASE_REG & TLBHI_VPN2MASK) + MTC0( t1, C0_ENTRYHI) + /* Possible bug? Virtual address instead of physical address set as page frame number */ + li t1, RDB_BASE_VIRTUAL_ADDR + srl t3, t1, TLBLO_PFNSHIFT + or t3, t3, t2 + MTC0( t3, C0_ENTRYLO0) + li t1, TLBLO_G + MTC0( t1, C0_ENTRYLO1) + NOP + TLBWI + NOP + NOP + NOP + NOP + MTC0( t0, C0_ENTRYHI) + jr ra END(osMapTLBRdb) diff --git a/src/libultra/os/parameters.s b/src/libultra/os/parameters.s index c0020ddbed..8fb324d240 100644 --- a/src/libultra/os/parameters.s +++ b/src/libultra/os/parameters.s @@ -1,22 +1,48 @@ #include "ultra64/asm.h" -.section .text - -.macro IPL_SYMBOL name, address, size - .global \name - .set \name, \address - .type \name, @object - .size \name, \size -.endm - -IPL_SYMBOL leoBootID, 0x800001A0, 4 -IPL_SYMBOL osTvType, 0x80000300, 4 -IPL_SYMBOL osRomType, 0x80000304, 4 -IPL_SYMBOL osRomBase, 0x80000308, 4 -IPL_SYMBOL osResetType, 0x8000030C, 4 -IPL_SYMBOL osCicId, 0x80000310, 4 -IPL_SYMBOL osVersion, 0x80000314, 4 -IPL_SYMBOL osMemSize, 0x80000318, 4 -IPL_SYMBOL osAppNMIBuffer, 0x8000031C, 0x40 - -.fill 0x60 +.text + +#ifdef __sgi +#define IPL_SYMBOL(name, address, size) \ + ABS(name, address) +#else +#define IPL_SYMBOL(name, address, sz) \ + ABS(name, address) ;\ + .type name, @object ;\ + .size name, sz +#endif + + +IPL_SYMBOL(leoBootID, 0x800001A0, 4) +IPL_SYMBOL(osTvType, 0x80000300, 4) +IPL_SYMBOL(osRomType, 0x80000304, 4) +IPL_SYMBOL(osRomBase, 0x80000308, 4) +IPL_SYMBOL(osResetType, 0x8000030C, 4) +IPL_SYMBOL(osCicId, 0x80000310, 4) +IPL_SYMBOL(osVersion, 0x80000314, 4) +IPL_SYMBOL(osMemSize, 0x80000318, 4) +IPL_SYMBOL(osAppNMIBuffer, 0x8000031C, 0x40) + +#ifdef BBPLAYER + +IPL_SYMBOL(__osBbEepromAddress, 0x8000035C, 4) +IPL_SYMBOL(__osBbEepromSize, 0x80000360, 4) +IPL_SYMBOL(__osBbFlashAddress, 0x80000364, 4) +IPL_SYMBOL(__osBbFlashSize, 0x80000368, 4) +IPL_SYMBOL(__osBbSramAddress, 0x8000036C, 4) +IPL_SYMBOL(__osBbSramSize, 0x80000370, 4) +IPL_SYMBOL(__osBbPakAddress, 0x80000374, 0x10) +IPL_SYMBOL(__osBbPakSize, 0x80000384, 4) +IPL_SYMBOL(__osBbIsBb, 0x80000388, 4) +IPL_SYMBOL(__osBbHackFlags, 0x8000038C, 4) +IPL_SYMBOL(__osBbStashMagic, 0x80000390, 4) +IPL_SYMBOL(__osBbPakBindings, 0x80000394, 0x10) +IPL_SYMBOL(__osBbStateName, 0x800003A4, 0x10) +IPL_SYMBOL(__osBbStateDirty, 0x800003B4, 4) +IPL_SYMBOL(__osBbAuxDataLimit, 0x800003B8, 4) + +.space 0x30 + +#endif + +.space 0x60 diff --git a/src/libultra/os/probetlb.s b/src/libultra/os/probetlb.s index 7bc7856e13..4fa8abc38e 100644 --- a/src/libultra/os/probetlb.s +++ b/src/libultra/os/probetlb.s @@ -1,12 +1,8 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text /** * u32 __osProbeTLB(void* vaddr); @@ -17,70 +13,71 @@ * Returns the physical address if found, or -1 if not found. */ LEAF(__osProbeTLB) - // Set C0_ENTRYHI based on supplied vaddr - mfc0 $t0, C0_ENTRYHI - andi $t1, $t0, TLBHI_PIDMASK - li $at, TLBHI_VPN2MASK - and $t2, $a0, $at - or $t1, $t1, $t2 - mtc0 $t1, C0_ENTRYHI +.set noreorder + /* Set C0_ENTRYHI based on supplied vaddr */ + mfc0 t0, C0_ENTRYHI + and t1, t0, TLBHI_PIDMASK + and t2, a0, TLBHI_VPN2MASK + or t1, t1, t2 + mtc0 t1, C0_ENTRYHI nop nop nop - // TLB probe, sets C0_INX to a value matching C0_ENTRYHI. - // If no match is found the TLBINX_PROBE bit is set to indicate this. + /* TLB probe, sets C0_INX to a value matching C0_ENTRYHI. */ + /* If no match is found the TLBINX_PROBE bit is set to indicate this. */ tlbp nop nop - // Read result - mfc0 $t3, C0_INX - li $at, TLBINX_PROBE - and $t3, $t3, $at - // Branch if no match was found - bnez $t3, 3f + /* Read result */ + mfc0 t3, C0_INX + and t3, t3, TLBINX_PROBE + /* Branch if no match was found */ + bnez t3, 3f nop - // Read TLB, sets C0_ENTRYHI, C0_ENTRYLO0, C0_ENTRYLO1 and C0_PAGEMASK for the TLB - // entry indicated by C0_INX + + /* Read TLB, sets C0_ENTRYHI, C0_ENTRYLO0, C0_ENTRYLO1 and C0_PAGEMASK for the TLB */ + /* entry indicated by C0_INX */ tlbr nop nop nop - // Calculate page size = (page mask + 0x2000) >> 1 - mfc0 $t3, C0_PAGEMASK - addi $t3, $t3, 0x2000 - srl $t3, $t3, 1 - // & with vaddr - and $t4, $t3, $a0 - // Select C0_ENTRYLO0 or C0_ENTRYLO1 - bnez $t4, 1f - addi $t3, $t3, -1 // make bitmask out of page size - mfc0 $v0, C0_ENTRYLO0 + /* Calculate page size = (page mask + 0x2000) >> 1 */ + mfc0 t3, C0_PAGEMASK + add t3, t3, 0x2000 + srl t3, t3, 1 + /* & with vaddr */ + and t4, t3, a0 + /* Select C0_ENTRYLO0 or C0_ENTRYLO1 */ + bnez t4, 1f + add t3, t3, -1 /* make bitmask out of page size */ + mfc0 v0, C0_ENTRYLO0 b 2f nop 1: - mfc0 $v0, C0_ENTRYLO1 + mfc0 v0, C0_ENTRYLO1 2: - // Check valid bit and branch if not valid - andi $t5, $v0, TLBLO_V - beqz $t5, 3f + /* Check valid bit and branch if not valid */ + and t5, v0, TLBLO_V + beqz t5, 3f nop - // Extract the Page Frame Number from the entry - li $at, TLBLO_PFNMASK - and $v0, $v0, $at - sll $v0, $v0, TLBLO_PFNSHIFT - // Mask vaddr with page size mask - and $t5, $a0, $t3 - // Add masked vaddr to pfn to obtain the physical address - add $v0, $v0, $t5 + + /* Extract the Page Frame Number from the entry */ + and v0, v0, TLBLO_PFNMASK + sll v0, v0, TLBLO_PFNSHIFT + /* Mask vaddr with page size mask */ + and t5, a0, t3 + /* Add masked vaddr to pfn to obtain the physical address */ + add v0, v0, t5 b 4f nop 3: - // No physical address for the supplied virtual address was found, - // return -1 - li $v0, -1 + /* No physical address for the supplied virtual address was found, */ + /* return -1 */ + li v0, -1 4: - // Restore original C0_ENTRYHI value before returning - mtc0 $t0, C0_ENTRYHI - jr $ra + /* Restore original C0_ENTRYHI value before returning */ + mtc0 t0, C0_ENTRYHI + jr ra nop +.set reorder END(__osProbeTLB) diff --git a/src/libultra/os/setcompare.s b/src/libultra/os/setcompare.s index bd16533774..3c175c4943 100644 --- a/src/libultra/os/setcompare.s +++ b/src/libultra/os/setcompare.s @@ -1,14 +1,10 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(__osSetCompare) - mtc0 $a0, C0_COMPARE - jr $ra - nop + MTC0( a0, C0_COMPARE) + jr ra END(__osSetCompare) diff --git a/src/libultra/os/setfpccsr.s b/src/libultra/os/setfpccsr.s index 1aa0e7d298..e333550844 100644 --- a/src/libultra/os/setfpccsr.s +++ b/src/libultra/os/setfpccsr.s @@ -1,15 +1,11 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(__osSetFpcCsr) - cfc1 $v0, C1_FPCSR - ctc1 $a0, C1_FPCSR - jr $ra - nop + CFC1( v0, C1_FPCSR) + CTC1( a0, C1_FPCSR) + jr ra END(__osSetFpcCsr) diff --git a/src/libultra/os/setintmask.s b/src/libultra/os/setintmask.s index e48c1b376f..bf6bec020b 100644 --- a/src/libultra/os/setintmask.s +++ b/src/libultra/os/setintmask.s @@ -1,14 +1,11 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" #include "ultra64/rcp.h" #include "ultra64/exception.h" -.set noat -.set noreorder - -.section .rodata - -.balign 16 +.rdata +.align 2 /** * LUT to convert between an interrupt mask value and a value for MI_INTR_MASK_REG. @@ -82,9 +79,7 @@ DATA(__osRcpImTable) .half MI_INTR_MASK_SET_SP | MI_INTR_MASK_SET_SI | MI_INTR_MASK_SET_AI | MI_INTR_MASK_SET_VI | MI_INTR_MASK_SET_PI | MI_INTR_MASK_SET_DP ENDDATA(__osRcpImTable) -.section .text - -.balign 16 +.text /** * OSIntMask osSetIntMask(OSIntMask); @@ -113,56 +108,47 @@ ENDDATA(__osRcpImTable) * OS_IM_ALL, so the operation is usually simply (SR | 0). */ LEAF(osSetIntMask) - // Extract interrupt enable bits from current SR - mfc0 $t4, C0_SR - andi $v0, $t4, (SR_IMASK | SR_IE) - // Get value of __OSGlobalIntMask - lui $t0, %hi(__OSGlobalIntMask) - addiu $t0, %lo(__OSGlobalIntMask) - lw $t3, ($t0) - // Bitwise-OR in the disabled CPU bits of __OSGlobalIntMask - li $at, ~0 - xor $t0, $t3, $at - andi $t0, $t0, SR_IMASK - or $v0, $v0, $t0 - // Fetch MI_INTR_MASK_REG - lui $t2, %hi(PHYS_TO_K1(MI_INTR_MASK_REG)) - lw $t2, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($t2) - // If there are RCP interrupts masked - beqz $t2, 1f - srl $t1, $t3, RCP_IMASKSHIFT - // Bitwise-OR in the disabled RCP bits of __OSGlobalIntMask - li $at, ~0 - xor $t1, $t1, $at - andi $t1, $t1, (RCP_IMASK >> RCP_IMASKSHIFT) - or $t2, $t2, $t1 + /* Extract interrupt enable bits from current SR */ + MFC0( t4, C0_SR) +.set noreorder + and v0, t4, (SR_IMASK | SR_IE) + /* Get value of __OSGlobalIntMask */ + la t0, __OSGlobalIntMask + lw t3, (t0) + /* Bitwise-OR in the disabled CPU bits of __OSGlobalIntMask */ + xor t0, t3, ~0 + and t0, t0, SR_IMASK + or v0, v0, t0 + /* Fetch MI_INTR_MASK_REG */ + lw t2, PHYS_TO_K1(MI_INTR_MASK_REG) + /* If there are RCP interrupts masked */ + beqz t2, 1f + srl t1, t3, RCP_IMASKSHIFT + /* Bitwise-OR in the disabled RCP bits of __OSGlobalIntMask */ + xor t1, t1, ~0 + and t1, t1, (RCP_IMASK >> RCP_IMASKSHIFT) + or t2, t2, t1 1: - // Shift the RCP bits to not conflict with the CPU bits - sll $t2, $t2, RCP_IMASKSHIFT - // OR the CPU and RCP bits together - or $v0, $v0, $t2 - // Extract RCP interrupt enable bits from requested mask and mask with __OSGlobalIntMask - li $at, RCP_IMASK - and $t0, $a0, $at - and $t0, $t0, $t3 - // Convert to a value for MI_INTR_MASK_REG and set it - srl $t0, $t0, (RCP_IMASKSHIFT-1) - lui $t2, %hi(__osRcpImTable) - addu $t2, $t2, $t0 - lhu $t2, %lo(__osRcpImTable)($t2) - lui $at, %hi(PHYS_TO_K1(MI_INTR_MASK_REG)) - sw $t2, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($at) - // Extract CPU interrupt enable bits from requested mask and mask with __OSGlobalIntMask - andi $t0, $a0, OS_IM_CPU - andi $t1, $t3, SR_IMASK - and $t0, $t0, $t1 - li $at, ~SR_IMASK - and $t4, $t4, $at - // Bitwise OR in the remaining bits of SR and set new SR - or $t4, $t4, $t0 - mtc0 $t4, C0_SR - nop - nop - jr $ra - nop + /* Shift the RCP bits to not conflict with the CPU bits */ + sll t2, t2, RCP_IMASKSHIFT + /* OR the CPU and RCP bits together */ + or v0, v0, t2 + /* Extract RCP interrupt enable bits from requested mask and mask with __OSGlobalIntMask */ + and t0, a0, RCP_IMASK + and t0, t0, t3 + /* Convert to a value for MI_INTR_MASK_REG and set it */ + srl t0, t0, (RCP_IMASKSHIFT-1) + lhu t2, __osRcpImTable(t0) + sw t2, PHYS_TO_K1(MI_INTR_MASK_REG) + /* Extract CPU interrupt enable bits from requested mask and mask with __OSGlobalIntMask */ + and t0, a0, OS_IM_CPU + and t1, t3, SR_IMASK + and t0, t0, t1 + and t4, t4, ~SR_IMASK + /* Bitwise OR in the remaining bits of SR and set new SR */ + or t4, t4, t0 + MTC0( t4, C0_SR) + NOP + NOP + jr ra END(osSetIntMask) diff --git a/src/libultra/os/setsr.s b/src/libultra/os/setsr.s index b754359eae..fb7a1586d4 100644 --- a/src/libultra/os/setsr.s +++ b/src/libultra/os/setsr.s @@ -1,15 +1,11 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(__osSetSR) - mtc0 $a0, C0_SR - nop - jr $ra - nop + MTC0( a0, C0_SR) + NOP + jr ra END(__osSetSR) diff --git a/src/libultra/os/settimer.c b/src/libultra/os/settimer.c index 194f4eff78..a876641e88 100644 --- a/src/libultra/os/settimer.c +++ b/src/libultra/os/settimer.c @@ -2,7 +2,7 @@ s32 osSetTimer(OSTimer* timer, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg) { UNUSED OSTime time; -#if !PLATFORM_N64 +#if LIBULTRA_VERSION >= LIBULTRA_VERSION_K OSTimer* next; u32 count; u32 value; @@ -21,12 +21,7 @@ s32 osSetTimer(OSTimer* timer, OSTime countdown, OSTime interval, OSMesgQueue* m timer->mq = mq; timer->msg = msg; -#if PLATFORM_N64 - time = __osInsertTimer(timer); - if (__osTimerList->next == timer) { - __osSetTimerIntr(time); - } -#else +#if LIBULTRA_VERSION >= LIBULTRA_VERSION_K prevInt = __osDisableInt(); if (__osTimerList->next != __osTimerList) { if (1) {} @@ -46,6 +41,11 @@ s32 osSetTimer(OSTimer* timer, OSTime countdown, OSTime interval, OSMesgQueue* m __osSetTimerIntr(__osTimerList->next->value); __osRestoreInt(prevInt); +#else + time = __osInsertTimer(timer); + if (__osTimerList->next == timer) { + __osSetTimerIntr(time); + } #endif return 0; diff --git a/src/libultra/os/setwatchlo.s b/src/libultra/os/setwatchlo.s index aee3ad4d6d..962513a480 100644 --- a/src/libultra/os/setwatchlo.s +++ b/src/libultra/os/setwatchlo.s @@ -1,15 +1,11 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(__osSetWatchLo) - mtc0 $a0, C0_WATCHLO - nop - jr $ra - nop + MTC0( a0, C0_WATCHLO) + NOP + jr ra END(__osSetWatchLo) diff --git a/src/libultra/os/timerintr.c b/src/libultra/os/timerintr.c index 943aca0ffc..ce5c12fc5f 100644 --- a/src/libultra/os/timerintr.c +++ b/src/libultra/os/timerintr.c @@ -63,7 +63,7 @@ void __osSetTimerIntr(OSTime time) { OSTime newTime; u32 prevInt; -#if !PLATFORM_N64 +#if LIBULTRA_VERSION >= LIBULTRA_VERSION_K if (time < 468) { time = 468; } diff --git a/src/libultra/os/unmaptlball.s b/src/libultra/os/unmaptlball.s index e1a03b1a23..8cd79984ec 100644 --- a/src/libultra/os/unmaptlball.s +++ b/src/libultra/os/unmaptlball.s @@ -1,29 +1,25 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noreorder - -.section .text - -.balign 16 +.text LEAF(osUnmapTLBAll) - mfc0 $t0, C0_ENTRYHI - li $t1, (NTLBENTRIES - 1) - li $t2, (K0BASE & TLBHI_VPN2MASK) - mtc0 $t2, C0_ENTRYHI - mtc0 $zero, C0_ENTRYLO0 - mtc0 $zero, C0_ENTRYLO1 + MFC0( t0, C0_ENTRYHI) + li t1, (NTLBENTRIES - 1) + li t2, (K0BASE & TLBHI_VPN2MASK) + MTC0( t2, C0_ENTRYHI) + MTC0( zero, C0_ENTRYLO0) + MTC0( zero, C0_ENTRYLO1) 1: - mtc0 $t1, C0_INX - nop - tlbwi - nop - nop - addi $t1, $t1, -1 - bgez $t1, 1b - nop - mtc0 $t0, C0_ENTRYHI - jr $ra - nop + MTC0( t1, C0_INX) + NOP + TLBWI + NOP + NOP + addi t1, t1, -1 + bgez t1, 1b + + MTC0( t0, C0_ENTRYHI) + jr ra END(osUnmapTLBAll) diff --git a/src/libultra/os/writebackdcache.s b/src/libultra/os/writebackdcache.s index 829f6f4a05..c7207c7e56 100644 --- a/src/libultra/os/writebackdcache.s +++ b/src/libultra/os/writebackdcache.s @@ -1,12 +1,8 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text /** * void osWritebackDCache(void* vaddr, s32 nbytes); @@ -16,45 +12,43 @@ * written back. */ LEAF(osWritebackDCache) - // If the amount to write back is less than or equal to 0, return immediately - blez $a1, .ret - nop - // If the amount to write back is as large as or larger than - // the data cache size, write back all - li $t3, DCACHE_SIZE - sltu $at, $a1, $t3 - beqz $at, .all - nop - // ensure end address doesn't wrap around and end up smaller - // than the start address - move $t0, $a0 - addu $t1, $a0, $a1 - sltu $at, $t0, $t1 - beqz $at, .ret - nop - // Mask and subtract to align to cache line - andi $t2, $t0, DCACHE_LINEMASK - addiu $t1, $t1, -DCACHE_LINESIZE - subu $t0, $t0, $t2 + /* If the amount to write back is less than or equal to 0, return immediately */ + blez a1, .ret + + /* If the amount to write back is as large as or larger than */ + /* the data cache size, write back all */ + li t3, DCACHE_SIZE + bgeu a1, t3, .all + + /* ensure end address doesn't wrap around and end up smaller */ + /* than the start address */ + move t0, a0 + addu t1, a0, a1 + bgeu t0, t1, .ret + + /* Mask and subtract to align to cache line */ + andi t2, t0, DCACHE_LINEMASK + addiu t1, t1, -DCACHE_LINESIZE + subu t0, t0, t2 1: - cache (CACH_PD | C_HWB), ($t0) - sltu $at, $t0, $t1 - bnez $at, 1b - addiu $t0, $t0, DCACHE_LINESIZE +.set noreorder + cache (CACH_PD | C_HWB), (t0) + bltu t0, t1, 1b + addiu t0, t0, DCACHE_LINESIZE +.set reorder .ret: - jr $ra - nop + jr ra -// same as osWritebackDCacheAll in operation +/* same as osWritebackDCacheAll in operation */ .all: - li $t0, K0BASE - addu $t1, $t0, $t3 - addiu $t1, $t1, -DCACHE_LINESIZE + li t0, K0BASE + addu t1, t0, t3 + addiu t1, t1, -DCACHE_LINESIZE 1: - cache (CACH_PD | C_IWBINV), ($t0) - sltu $at, $t0, $t1 - bnez $at, 1b - addiu $t0, DCACHE_LINESIZE - jr $ra - nop +.set noreorder + cache (CACH_PD | C_IWBINV), (t0) + bltu t0, t1, 1b + addiu t0, DCACHE_LINESIZE +.set reorder + jr ra END(osWritebackDCache) diff --git a/src/libultra/os/writebackdcacheall.s b/src/libultra/os/writebackdcacheall.s index 54a58dff8a..a15ef4554f 100644 --- a/src/libultra/os/writebackdcacheall.s +++ b/src/libultra/os/writebackdcacheall.s @@ -1,23 +1,19 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "ultra64/R4300.h" -.set noat -.set noreorder - -.section .text - -.balign 16 +.text LEAF(osWritebackDCacheAll) - li $t0, K0BASE - li $t2, DCACHE_SIZE - addu $t1, $t0, $t2 - addiu $t1, $t1, -DCACHE_LINESIZE + li t0, K0BASE + li t2, DCACHE_SIZE + addu t1, t0, t2 + addiu t1, t1, -DCACHE_LINESIZE 1: - cache (CACH_PD | C_IWBINV), ($t0) - sltu $at, $t0, $t1 - bnez $at, 1b - addiu $t0, DCACHE_LINESIZE - jr $ra - nop +.set noreorder + cache (CACH_PD | C_IWBINV), (t0) + bltu t0, t1, 1b + addiu t0, DCACHE_LINESIZE +.set reorder + jr ra END(osWritebackDCacheAll) diff --git a/src/makerom/entry.s b/src/makerom/entry.s index 6be493e6b6..870b979d69 100644 --- a/src/makerom/entry.s +++ b/src/makerom/entry.s @@ -1,34 +1,59 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" #include "boot.h" -.set noreorder +.text -.section .text - -.balign 16 +#if defined(NON_MATCHING) || defined(__sgi) +/* Non-matching builds or IDO */ +#define PAD_TO 0x60 +#define LA(reg, sym) la reg, sym +#define BOOT_STACK_TOP sBootThreadStack + BOOT_STACK_SIZE +#else +/* EGCS */ +#define PAD_TO 0x50 +#define LA(reg, sym) \ + lui reg, %lo(sym##_HI); \ + ori reg, %lo(sym) +#endif -LEAF(entrypoint) - // Clear boot segment .bss - la $t0, _bootSegmentBssStart -#ifndef AVOID_UB - // UB: li only loads the lower 16 bits of _bootSegmentBssSize when it may be larger than this, - // so not all of bss may be cleared if it is too large - li $t1, _bootSegmentBssSize +#if !defined(AVOID_UB) +/* Old assembler workarounds: The makerom tool in the N64 SDK was given the bss segment size as a const + * literal, and since this literal was < 0x10000 it was loaded in one instruction. We don't have access + * to the bss segment size until we link everything so we cannot do the same thing. Instead we must load + * only the lower 16 bits of the bss size for matching. + * When AVOID_UB is enabled, don't do this and instead load the full symbol value, otherwise not all of + * bss may be cleared. */ +#if defined(__sgi) +#define LOAD_BSS_SIZE(reg) li reg, %half(_bootSegmentBssSize) +#else +#define LOAD_BSS_SIZE(reg) ori reg, zero, %lo(_bootSegmentBssSize) +#endif #else - la $t1, _bootSegmentBssSize +#define LOAD_BSS_SIZE(reg) LA(reg, _bootSegmentBssSize) #endif + +LEAF(entrypoint) + /* Clear boot segment .bss */ + LA( t0, _bootSegmentBssStart) + LOAD_BSS_SIZE(t1) .clear_bss: - addi $t1, $t1, -8 - sw $zero, ($t0) - sw $zero, 4($t0) - bnez $t1, .clear_bss - addi $t0, $t0, 8 - // Set up stack and enter program code - lui $t2, %hi(bootproc) - lui $sp, %hi(sBootThreadStack + BOOT_STACK_SIZE) - addiu $t2, %lo(bootproc) - jr $t2 - addiu $sp, %lo(sBootThreadStack + BOOT_STACK_SIZE) + sw zero, 0(t0) + sw zero, 4(t0) + addi t0, t0, 8 + addi t1, t1, -8 + bnez t1, .clear_bss + + /* Set up stack and enter program code */ + LA( sp, BOOT_STACK_TOP) + LA( t2, bootproc) + jr t2 END(entrypoint) -.fill 0x60 - (. - entrypoint) +#ifdef __sgi +/* IDO can't take absolute differences of symbols so the size of the above is hardcoded */ +.space PAD_TO - 0x34 +#else +/* Pad to a total size taking into account the size of the above */ +.space PAD_TO - (. - entrypoint) +#endif diff --git a/src/makerom/ipl3.s b/src/makerom/ipl3.s deleted file mode 100644 index 45f1c8e6f8..0000000000 --- a/src/makerom/ipl3.s +++ /dev/null @@ -1,4 +0,0 @@ - -.section .text - -.incbin "incbin/ipl3" diff --git a/src/makerom/rom_header.h b/src/makerom/rom_header.h index 6a47fb34bb..ff0b1319f5 100644 --- a/src/makerom/rom_header.h +++ b/src/makerom/rom_header.h @@ -55,13 +55,13 @@ * and what libultra version (os_ver) it uses. * * The hardware revision for a retail N64 is (2,0). - * The libultra version may be a single letter, without quotes. + * The libultra version must be a single char, in quotes. */ -#define LIBULTRA_VERSION(hw_major, hw_minor, os_ver) \ +#define OS_VERSION(hw_major, hw_minor, os_ver) \ .half 0; \ .byte (hw_major) * 10 + (hw_minor); \ _os_ver_start = .; \ - .ascii #os_ver ; \ + .byte (os_ver) ; \ .if (. - _os_ver_start) != 1; \ .error "OS version should be just one letter"; \ .endif diff --git a/src/makerom/rom_header.s b/src/makerom/rom_header.s index a02462f8b8..2320e5629b 100644 --- a/src/makerom/rom_header.s +++ b/src/makerom/rom_header.s @@ -1,4 +1,5 @@ #include "rom_header.h" +#include "ultra64/version.h" #include "region.h" #include "versions.h" @@ -6,28 +7,23 @@ /* 0x01 */ PI_DOMAIN_1_CFG(64, 18, 7, 3) /* 0x04 */ SYSTEM_CLOCK_RATE_SETTING(0xF) /* 0x08 */ ENTRYPOINT(0x80000400) -#if PLATFORM_N64 -/* 0x0C */ LIBULTRA_VERSION(2, 0, I) -#else -/* 0x0C */ LIBULTRA_VERSION(2, 0, L) -#endif +/* 0x0C */ OS_VERSION(2, 0, LIBULTRA_VERSION) /* 0x10 */ CHECKSUM() + +#if !PLATFORM_IQUE + /* 0x18 */ PADDING(8) /* 0x20 */ ROM_NAME("THE LEGEND OF ZELDA") /* 0x34 */ PADDING(7) - #if OOT_NTSC || ((defined CONSOLE_WIIVC) || (defined CONSOLE_GC)) /* 0x3B */ MEDIUM(CARTRIDGE_EXPANDABLE) #else /* 0x3B */ MEDIUM(CARTRIDGE) #endif - /* 0x3C */ GAME_ID("ZL") - #if (defined CONSOLE_WIIVC) || (defined CONSOLE_GC) /* 0x3E */ REGION(US) -#else -#if OOT_REGION == REGION_NULL +#elif OOT_REGION == REGION_NULL /* 0x3E */ REGION(FREE) #elif OOT_REGION == REGION_US /* 0x3E */ REGION(US) @@ -36,20 +32,10 @@ #elif OOT_REGION == REGION_EU /* 0x3E */ REGION(PAL) #endif -#endif +/* 0x3F */ GAME_REVISION(OOT_REVISION) -#if (defined CONSOLE_WIIVC) || (defined CONSOLE_GC) -/* 0x3F */ GAME_REVISION(0) #else -#if OOT_VERSION == NTSC_1_0 || OOT_VERSION == PAL_1_0 -/* 0x3F */ GAME_REVISION(0) -#elif OOT_VERSION == NTSC_1_1 || OOT_VERSION == PAL_1_1 -/* 0x3F */ GAME_REVISION(1) -#elif OOT_VERSION == NTSC_1_2 -/* 0x3F */ GAME_REVISION(2) -#else -/* 0x3F */ GAME_REVISION(15) -#endif + .fill 0x40 - 0x18 #endif diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c index ddc7790116..3524cd348e 100644 --- a/src/n64dd/z_n64dd.c +++ b/src/n64dd/z_n64dd.c @@ -5,6 +5,7 @@ #include "n64dd.h" #include "stack.h" #include "versions.h" +#include "line_numbers.h" #pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" @@ -112,14 +113,9 @@ void func_801C6FD8(void) { // Adds a HungupAndCrash void func_801C7018(void) { if (D_80121213 != 0) { -#if OOT_VERSION < NTSC_1_1 - Fault_AddHungupAndCrash("../z_n64dd.c", 503); -#elif OOT_VERSION < PAL_1_0 - Fault_AddHungupAndCrash("../z_n64dd.c", 551); -#else - Fault_AddHungupAndCrash("../z_n64dd.c", 573); -#endif + Fault_AddHungupAndCrash("../z_n64dd.c", LN2(503, 551, 573)); } + D_80121213 = 1; } diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 4b475c9c66..c79f9b0aa1 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -1,7 +1,7 @@ #include "z_arms_hook.h" #include "assets/objects/object_link_boy/object_link_boy.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ArmsHook_Init(Actor* thisx, PlayState* play); void ArmsHook_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index c590f341e5..9fec296d7a 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -7,7 +7,7 @@ #include "z_arrow_fire.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowFire_Init(Actor* thisx, PlayState* play); void ArrowFire_Destroy(Actor* thisx, PlayState* play); @@ -33,7 +33,7 @@ ActorProfile Arrow_Fire_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void ArrowFire_SetupAction(ArrowFire* this, ArrowFireActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 09815d086c..326486aee0 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowIce_Init(Actor* thisx, PlayState* play); void ArrowIce_Destroy(Actor* thisx, PlayState* play); @@ -34,7 +34,7 @@ ActorProfile Arrow_Ice_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void ArrowIce_SetupAction(ArrowIce* this, ArrowIceActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index f88e2c092e..6922b5ba68 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowLight_Init(Actor* thisx, PlayState* play); void ArrowLight_Destroy(Actor* thisx, PlayState* play); @@ -34,7 +34,7 @@ ActorProfile Arrow_Light_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void ArrowLight_SetupAction(ArrowLight* this, ArrowLightActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 055f93e200..bcc7651687 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -8,7 +8,7 @@ #include "quake.h" #include "assets/objects/object_bdan_objects/object_bdan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum BgBdanObjectsPropertyGetter { JABU_OBJECTS_GET_PROP_CAM_SETTING_NORMAL0 = 0, @@ -126,7 +126,7 @@ void BgBdanObjects_Init(Actor* thisx, PlayState* play) { this->var.switchFlag = PARAMS_GET_U(thisx->params, 8, 6); thisx->params &= 0xFF; if (thisx->params == JABU_OBJECTS_TYPE_WATERBOX_HEIGHT_CHANGER) { - thisx->flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; play->colCtx.colHeader->waterBoxes[7].ySurface = thisx->world.pos.y; this->actionFunc = BgBdanObjects_WaitForSwitch; return; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index d22c6124eb..f09d24d536 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -7,7 +7,7 @@ #include "z_bg_bdan_switch.h" #include "assets/objects/object_bdan_objects/object_bdan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgBdanSwitch_Init(Actor* thisx, PlayState* play); void BgBdanSwitch_Destroy(Actor* thisx, PlayState* play); @@ -82,9 +82,9 @@ static ColliderJntSphInit sJntSphInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; static Vec3f D_8086E0E0 = { 0.0f, 140.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index 729dd81552..cfbd466021 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -9,7 +9,7 @@ #include "assets/objects/object_bowl/object_bowl.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgBomGuard_Init(Actor* thisx, PlayState* play); void BgBomGuard_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 82daa4e13e..756677b225 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -104,9 +104,9 @@ void BgBombwall_RotateVec(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgBombwall_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index fa3de785f4..a43804fa93 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -11,7 +11,7 @@ #include "quake.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgBowlWall_Init(Actor* thisx, PlayState* play); void BgBowlWall_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index 4999abd966..39f9dce855 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -9,7 +9,7 @@ #include "assets/objects/object_bwall/object_bwall.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef struct BombableWallInfo { /* 0x00 */ CollisionHeader* colHeader; @@ -67,9 +67,9 @@ static BombableWallInfo sBombableWallInfo[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; void BgBreakwall_SetupAction(BgBreakwall* this, BgBreakwallActionFunc actionFunc) { @@ -207,7 +207,7 @@ void BgBreakwall_WaitForObject(BgBreakwall* this, PlayState* play) { this->dyna.actor.objectSlot = this->requiredObjectSlot; Actor_SetObjectDependency(play, &this->dyna.actor); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.draw = BgBreakwall_Draw; CollisionHeader_GetVirtual(sBombableWallInfo[wallType].colHeader, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index dc5a1cba23..c1168182d8 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -7,7 +7,7 @@ #include "z_bg_ddan_jd.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgDdanJd_Init(Actor* thisx, PlayState* play); void BgDdanJd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 3fe150cc6f..e542f69705 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -7,7 +7,7 @@ #include "z_bg_ddan_kd.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgDdanKd_Init(Actor* thisx, PlayState* play); void BgDdanKd_Destroy(Actor* thisx, PlayState* play); @@ -52,9 +52,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 32767, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 32767, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 32767, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 32767, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 32767, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 32767, ICHAIN_STOP), }; void BgDdanKd_SetupAction(BgDdanKd* this, BgDdanKdActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index b8e3cfa33b..747a03d93f 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -102,9 +102,9 @@ void BgDodoago_SpawnSparkles(Vec3f* meanPos, PlayState* play) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 5000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void BgDodoago_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 567b141e72..c8877e0e64 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -13,9 +13,9 @@ #include "assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h" #if OOT_VERSION < NTSC_1_1 -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) #else -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) #endif typedef enum BgDyYoseizoRewardType { @@ -696,7 +696,8 @@ static s16 sDemoEffectLightColors[] = { DEMO_EFFECT_LIGHT_GREEN, DEMO_EFFECT_LIG static s16 sExItemTypes[] = { EXITEM_MAGIC_WIND, EXITEM_MAGIC_FIRE, EXITEM_MAGIC_DARK }; -static s16 sItemGetFlags[] = { ITEMGETINF_18_MASK, ITEMGETINF_19_MASK, ITEMGETINF_1A_MASK }; +static s16 sItemGetFlagMasks[] = { ITEMGETINF_MASK(ITEMGETINF_18), ITEMGETINF_MASK(ITEMGETINF_19), + ITEMGETINF_MASK(ITEMGETINF_1A) }; static u8 sItemIds[] = { ITEM_FARORES_WIND, ITEM_DINS_FIRE, ITEM_NAYRUS_LOVE }; @@ -808,7 +809,7 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, PlayState* play) { this->itemSpawned = true; gSaveContext.healthAccumulator = 0x140; Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_HEARTS_MAGIC); - gSaveContext.save.info.itemGetInf[ITEMGETINF_18_19_1A_INDEX] |= sItemGetFlags[cueIdTemp]; + gSaveContext.save.info.itemGetInf[ITEMGETINF_INDEX_18_19_1A] |= sItemGetFlagMasks[cueIdTemp]; Item_Give(play, sItemIds[cueIdTemp]); } } else { diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index edfb09d522..51450109de 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum FlashState { /* 0x00 */ FLASH_NONE, diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 4a67c02d13..d6272b9aea 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -32,7 +32,7 @@ ActorProfile Bg_Gjyo_Bridge_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -49,7 +49,7 @@ void BgGjyoBridge_Init(Actor* thisx, PlayState* play) { this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader); - if (GET_EVENTCHKINF(EVENTCHKINF_4D)) { + if (GET_EVENTCHKINF(EVENTCHKINF_CREATED_RAINBOW_BRIDGE)) { this->actionFunc = func_808787A4; } else { this->dyna.actor.draw = NULL; @@ -85,7 +85,7 @@ void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, PlayState* play) { (play->csCtx.actorCues[2]->id == 2)) { this->dyna.actor.draw = BgGjyoBridge_Draw; DynaPoly_EnableCollision(play, &play->colCtx.dyna, this->dyna.bgId); - SET_EVENTCHKINF(EVENTCHKINF_4D); + SET_EVENTCHKINF(EVENTCHKINF_CREATED_RAINBOW_BRIDGE); } } diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 801475e3f3..b35f1ef36f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -7,7 +7,7 @@ #include "z_bg_gnd_darkmeiro.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgGndDarkmeiro_Init(Actor* thisx, PlayState* play2); void BgGndDarkmeiro_Destroy(Actor* thisx, PlayState* play2); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 9f97b57541..ad336d6fcf 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -7,7 +7,7 @@ #include "z_bg_gnd_firemeiro.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgGndFiremeiro_Init(Actor* thisx, PlayState* play); void BgGndFiremeiro_Destroy(Actor* thisx, PlayState* play2); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index 75e44cb218..0711124304 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -7,7 +7,7 @@ #include "z_bg_gnd_iceblock.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum BgGndIceblockAction { /* 0 */ GNDICE_IDLE, @@ -84,7 +84,7 @@ void BgGndIceblock_Destroy(Actor* thisx, PlayState* play) { * | 3 h8 15 19 | * | 4 9 11 XX *20*| * |*5* XX 12 *21*| - * ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ + * ---------------------- * XX are rocks * ** are pits * h is the hole. diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 3c100311d0..7a19324501 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -7,7 +7,7 @@ #include "z_bg_gnd_nisekabe.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgGndNisekabe_Init(Actor* thisx, PlayState* play); void BgGndNisekabe_Destroy(Actor* thisx, PlayState* play); @@ -30,7 +30,7 @@ void BgGndNisekabe_Init(Actor* thisx, PlayState* play) { BgGndNisekabe* this = (BgGndNisekabe*)thisx; Actor_SetScale(&this->actor, 0.1); - this->actor.uncullZoneForward = 3000.0; + this->actor.cullingVolumeDistance = 3000.0; } void BgGndNisekabe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 17a3ea4508..3ed190587d 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -53,9 +53,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgGndSoulmeiro_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 3b5985d8f1..f7f31748a6 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -97,7 +97,7 @@ void BgHakaGate_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgHakaGate_FalseSkull; } this->vScrollTimer = Rand_ZeroOne() * 20.0f; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (Flags_GetSwitch(play, this->switchFlag)) { this->vFlameScale = 350; } @@ -124,7 +124,7 @@ void BgHakaGate_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgHakaGate_DoNothing; thisx->world.pos.y += 80.0f; } else { - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_SetFocus(thisx, 30.0f); this->actionFunc = BgHakaGate_GateWait; } @@ -274,7 +274,7 @@ void BgHakaGate_GateWait(BgHakaGate* this, PlayState* play) { void BgHakaGate_GateOpen(BgHakaGate* this, PlayState* play) { if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 80.0f, 1.0f)) { Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgHakaGate_DoNothing; } else { Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index e660ccd38a..757e9ecb11 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Rd/z_en_rd.h" #include "quake.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHakaHuta_Init(Actor* thisx, PlayState* play); void BgHakaHuta_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index 3d6de9f415..dad34f592d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -8,7 +8,7 @@ #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_REACT_TO_LENS) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_REACT_TO_LENS) void BgHakaMegane_Init(Actor* thisx, PlayState* play); void BgHakaMegane_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 3bcaac0071..f0f23b3131 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -36,8 +36,8 @@ ActorProfile Bg_Haka_MeganeBG_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -64,7 +64,7 @@ void BgHakaMeganeBG_Init(Actor* thisx, PlayState* play) { if (thisx->params == 2) { DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS | DYNA_TRANSFORM_ROT_Y); - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; CollisionHeader_GetVirtual(&object_haka_objects_Col_005334, &colHeader); this->actionFunc = func_8087E258; } else { @@ -83,15 +83,15 @@ void BgHakaMeganeBG_Init(Actor* thisx, PlayState* play) { this->actionFunc = func_8087E34C; thisx->world.pos.y = thisx->home.pos.y; } else { - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_8087E288; } } else { CollisionHeader_GetVirtual(&object_haka_objects_Col_00A7F4, &colHeader); this->unk_16A = 80; this->actionFunc = func_8087E10C; - thisx->uncullZoneScale = 3000.0f; - thisx->uncullZoneDownward = 3000.0f; + thisx->cullingVolumeScale = 3000.0f; + thisx->cullingVolumeDownward = 3000.0f; } } diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index 4bb944cb9d..fff0314d44 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -8,7 +8,7 @@ #include "assets/objects/object_haka_objects/object_haka_objects.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum SpinningScytheTrapMode { /* 0 */ SCYTHE_TRAP_SHADOW_TEMPLE, @@ -121,7 +121,7 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 80, 130, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_4, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -200,7 +200,7 @@ void BgHakaSgami_SetupSpin(BgHakaSgami* this, PlayState* play) { this->actor.objectSlot = this->requiredObjectSlot; this->actor.draw = BgHakaSgami_Draw; this->timer = SCYTHE_SPIN_TIME; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgHakaSgami_Spin; } } diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 2a8eadb18e..5a9a06d5c8 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -7,7 +7,7 @@ #include "z_bg_haka_ship.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgHakaShip_Init(Actor* thisx, PlayState* play); void BgHakaShip_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 2210299c76..761be4b154 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -131,7 +131,7 @@ void BgHakaTrap_Init(Actor* thisx, PlayState* play) { this->actionFunc = func_80880484; } else { DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (thisx->params == HAKA_TRAP_SPIKED_BOX) { CollisionHeader_GetVirtual(&object_haka_objects_Col_009CD0, &colHeader); @@ -177,7 +177,7 @@ void BgHakaTrap_Init(Actor* thisx, PlayState* play) { } else { this->timer = 40; this->actionFunc = func_808809B0; - thisx->uncullZoneScale = 500.0f; + thisx->cullingVolumeScale = 500.0f; } CollisionCheck_SetInfo(&thisx->colChkInfo, NULL, &sColChkInfoInit); diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index de6dd98196..54d6501821 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHakaTubo_Init(Actor* thisx, PlayState* play); void BgHakaTubo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index be7a79332d..49f42262b7 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -7,7 +7,7 @@ #include "z_bg_haka_water.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgHakaWater_Init(Actor* thisx, PlayState* play); void BgHakaWater_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 9b7ed31904..f328a2d6df 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -8,7 +8,7 @@ #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum ShadowTempleAssetsType { /* 0x0 */ STA_GIANT_BIRD_STATUE, @@ -96,9 +96,9 @@ void BgHakaZou_Init(Actor* thisx, PlayState* play) { DynaPolyActor_Init(&this->dyna, 0); if (thisx->params == STA_GIANT_BIRD_STATUE) { - thisx->uncullZoneForward = 2000.0f; - thisx->uncullZoneScale = 3000.0f; - thisx->uncullZoneDownward = 3000.0f; + thisx->cullingVolumeDistance = 2000.0f; + thisx->cullingVolumeScale = 3000.0f; + thisx->cullingVolumeDownward = 3000.0f; } } @@ -176,7 +176,7 @@ void BgHakaZou_Wait(BgHakaZou* this, PlayState* play) { this->collider.dim.yShift = -30; this->collider.dim.pos.x -= 56; this->collider.dim.pos.z += 56; - this->dyna.actor.uncullZoneScale = 1500.0f; + this->dyna.actor.cullingVolumeScale = 1500.0f; } else if (this->dyna.actor.params == STA_BOMBABLE_SKULL_WALL) { CollisionHeader_GetVirtual(&object_haka_objects_Col_005E30, &colHeader); this->collider.dim.yShift = -50; diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index ab1b72b4d1..34587ad303 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -42,9 +42,9 @@ ActorProfile Bg_Heavy_Block_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; void BgHeavyBlock_SetPieceRandRot(BgHeavyBlock* this, f32 scale) { @@ -77,7 +77,8 @@ void BgHeavyBlock_InitPiece(BgHeavyBlock* this, f32 scale) { void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, PlayState* play) { s32 pad[2]; CollisionHeader* colHeader = NULL; - this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_CARRY_X_ROT_INFLUENCE; + this->dyna.actor.flags |= + ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CARRY_X_ROT_INFLUENCE; DynaPolyActor_Init(&this->dyna, 0); CollisionHeader_GetVirtual(&gHeavyBlockCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); @@ -101,7 +102,7 @@ void BgHeavyBlock_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgHeavyBlock_MovePiece; BgHeavyBlock_InitPiece(this, 1.0f); this->timer = 120; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_164.y = -50.0f; break; case HEAVYBLOCK_SMALL_PIECE: @@ -109,7 +110,7 @@ void BgHeavyBlock_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgHeavyBlock_MovePiece; BgHeavyBlock_InitPiece(this, 2.0f); this->timer = 120; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_164.y = -20.0f; break; case HEAVYBLOCK_BREAKABLE: @@ -471,7 +472,7 @@ void BgHeavyBlock_Land(BgHeavyBlock* this, PlayState* play) { break; } } else { - this->dyna.actor.flags &= ~(ACTOR_FLAG_4 | ACTOR_FLAG_5); + this->dyna.actor.flags &= ~(ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); this->actionFunc = BgHeavyBlock_DoNothing; } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index ffe3b6c837..368ccedffa 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -7,7 +7,7 @@ #include "z_bg_hidan_curtain.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHidanCurtain_Init(Actor* thisx, PlayState* play); void BgHidanCurtain_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 83e984ee7b..d7868a5cc6 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -139,7 +139,7 @@ void BgHidanDalm_Wait(BgHidanDalm* this, PlayState* play) { this->dyna.actor.world.pos.z += 32.5f * Math_CosS(this->dyna.actor.world.rot.y); Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_8); - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgHidanDalm_Shrink; this->dyna.actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH; this->dyna.actor.bgCheckFlags &= ~BGCHECKFLAG_WALL; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 1b4ecb10eb..43525d92f7 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -7,7 +7,7 @@ #include "z_bg_hidan_fslift.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHidanFslift_Init(Actor* thisx, PlayState* play); void BgHidanFslift_Destroy(Actor* thisx, PlayState* play); @@ -32,9 +32,9 @@ ActorProfile Bg_Hidan_Fslift_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 350, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 350, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void BgHidanFslift_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index b8d0e63402..fef4a8d863 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum HidanFwbigMoveState { /* 0 */ FWBIG_MOVE, @@ -64,7 +64,7 @@ static ColliderCylinderInit sCylinderInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_STOP), }; void BgHidanFwbig_Init(Actor* thisx, PlayState* play2) { @@ -94,7 +94,7 @@ void BgHidanFwbig_Init(Actor* thisx, PlayState* play2) { BgHidanFwbig_UpdatePosition(this); Actor_SetScale(&this->actor, 0.15f); this->collider.dim.height = 230; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->moveState = FWBIG_MOVE; this->actionFunc = BgHidanFwbig_WaitForPlayer; this->actor.world.pos.y = this->actor.home.pos.y - (2400.0f * this->actor.scale.y); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index 3ef030dedd..53ce9892e9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -118,7 +118,7 @@ void BgHidanHrock_Init(Actor* thisx, PlayState* play) { this->actionFunc = func_808894A4; if (thisx->params == 0) { thisx->world.pos.y -= 2800.0f; - thisx->uncullZoneForward = 3000.0f; + thisx->cullingVolumeDistance = 3000.0f; } else if (thisx->params == 1) { thisx->world.pos.y -= 800.0f; } else if (thisx->params == 2) { @@ -126,8 +126,8 @@ void BgHidanHrock_Init(Actor* thisx, PlayState* play) { } } else { if (thisx->params == 0) { - thisx->flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; - thisx->uncullZoneForward = 3000.0f; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; + thisx->cullingVolumeDistance = 3000.0f; } this->actionFunc = func_808896B8; } @@ -185,7 +185,7 @@ void func_8088960C(BgHidanHrock* this, PlayState* play) { this->dyna.actor.velocity.y++; if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, this->dyna.actor.velocity.y)) { - this->dyna.actor.flags &= ~(ACTOR_FLAG_4 | ACTOR_FLAG_5); + this->dyna.actor.flags &= ~(ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); if (this->dyna.actor.params == 0) { @@ -204,7 +204,7 @@ void func_808896B8(BgHidanHrock* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; this->actionFunc = func_808894B0; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (this->dyna.actor.params == 0) { this->dyna.actor.room = -1; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 7a65b45343..e5e49a947f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -7,7 +7,7 @@ #include "z_bg_hidan_kousi.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHidanKousi_Init(Actor* thisx, PlayState* play); void BgHidanKousi_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 05e513a461..aaba19888f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -106,9 +106,9 @@ void BgHidanKowarerukabe_OffsetActorYPos(BgHidanKowarerukabe* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 02d864f83f..e115fb77f9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -91,7 +91,7 @@ void BgHidanRock_Init(Actor* thisx, PlayState* play) { } else { this->actionFunc = func_8088B268; } - thisx->flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; CollisionHeader_GetVirtual(&gFireTempleStoneBlock1Col, &colHeader); } else { CollisionHeader_GetVirtual(&gFireTempleStoneBlock2Col, &colHeader); @@ -114,7 +114,7 @@ void BgHidanRock_Destroy(Actor* thisx, PlayState* play) { } void func_8088B24C(BgHidanRock* this) { - this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = func_8088B990; } @@ -247,7 +247,7 @@ void func_8088B79C(BgHidanRock* this, PlayState* play) { } else { this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 15.0f; this->actionFunc = func_8088B90C; - this->dyna.actor.flags &= ~(ACTOR_FLAG_4 | ACTOR_FLAG_5); + this->dyna.actor.flags &= ~(ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); } Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 0b4df94e12..b496a4152e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -110,8 +110,8 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_STOP), }; static void* sFireballsTexs[] = { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index e5051d0461..206f852ee2 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -115,8 +115,8 @@ static CollisionCheckInfoInit sColChkInfoInit = { 1, 40, 240, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_STOP), }; static void* sFireballsTexs[] = { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index b5d5f4f372..e1a7007068 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -7,7 +7,7 @@ #include "z_bg_hidan_syoku.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHidanSyoku_Init(Actor* thisx, PlayState* play); void BgHidanSyoku_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index f257aa5ef4..15163c9842 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -141,7 +141,7 @@ void BgIceObjects_Idle(BgIceObjects* this, PlayState* play) { if ((this->dyna.unk_150 > 0.0f) && !Player_InCsMode(play)) { BgIceObjects_SetNextTarget(this, play); if (Actor_WorldDistXZToPoint(thisx, &this->targetPos) > 1.0f) { - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Player_SetCsActionWithHaltedActors(play, thisx, PLAYER_CSACTION_8); thisx->params = 1; this->actionFunc = BgIceObjects_Slide; @@ -169,7 +169,7 @@ void BgIceObjects_Slide(BgIceObjects* this, PlayState* play) { this->targetPos.x = thisx->world.pos.x; this->targetPos.z = thisx->world.pos.z; if (thisx->velocity.y <= 0.0f) { - thisx->flags &= ~ACTOR_FLAG_4; + thisx->flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } thisx->params = 0; Player_SetCsActionWithHaltedActors(play, thisx, PLAYER_CSACTION_7); @@ -206,7 +206,7 @@ void BgIceObjects_Reset(BgIceObjects* this, PlayState* play) { this->dyna.unk_150 = 0.0f; } if (Math_StepToF(&thisx->world.pos.y, thisx->home.pos.y, 1.0f)) { - thisx->flags &= ~ACTOR_FLAG_4; + thisx->flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; Math_Vec3f_Copy(&this->targetPos, &thisx->home.pos); this->actionFunc = BgIceObjects_Idle; thisx->speed = 0.0f; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 5f9a1a6ca1..39c891ab4f 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -141,9 +141,9 @@ void BgIceShelter_RotateY(Vec3f* dest, Vec3f* src, s16 angle) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgIceShelter_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index a27d455caf..d00358e230 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -7,7 +7,7 @@ #include "z_bg_ice_shutter.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgIceShutter_Init(Actor* thisx, PlayState* play); void BgIceShutter_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index a9a560bc09..094f585645 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -53,7 +53,7 @@ ActorProfile Bg_Ice_Turara_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 600, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -3, ICHAIN_CONTINUE), ICHAIN_F32(minVelocityY, -30, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index a9dd2adfa5..dc5b9323e3 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -52,7 +52,7 @@ void BgInGate_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->dyna.actor, 0.1f); if ((PARAMS_GET_U(this->dyna.actor.params, 0, 1) != 0) && - (GET_EVENTINF_HORSES_STATE() == EVENTINF_HORSES_STATE_6)) { + (GET_EVENTINF_INGO_RACE_STATE() == INGO_RACE_STATE_TRAPPED_WIN_EPONA)) { play->csCtx.curFrame = 0; BgInGate_SetupAction(this, func_80892890); } else { diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 0e35886304..7963199d74 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -7,7 +7,7 @@ #include "z_bg_jya_1flift.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJya1flift_Init(Actor* thisx, PlayState* play); void BgJya1flift_Destroy(Actor* thisx, PlayState* play); @@ -61,9 +61,9 @@ static f32 sFinalPositions[] = { 443.0f, -50.0f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; void BgJya1flift_InitDynapoly(BgJya1flift* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index df98fa50ae..23f5658ce8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -37,9 +37,9 @@ ActorProfile Bg_Jya_Amishutter_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index 4c065932f0..ecdf4aa4de 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -7,7 +7,7 @@ #include "z_bg_jya_bigmirror.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgJyaBigmirror_Init(Actor* thisx, PlayState* play); void BgJyaBigmirror_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index d7aaafba54..eea63927ed 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -28,9 +28,9 @@ ActorProfile Bg_Jya_Block_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 333, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; void BgJyaBlock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 061ef48fd1..cd177d8044 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -56,9 +56,9 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_3, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaBombchuiwa_SetupCollider(BgJyaBombchuiwa* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 6268abe6ab..691e2adbe2 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -57,9 +57,9 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index e40258f9f6..3b418afec1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -4,7 +4,7 @@ #include "assets/objects/object_jya_obj/object_jya_obj.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaCobra_Init(Actor* thisx, PlayState* play); void BgJyaCobra_Destroy(Actor* thisx, PlayState* play); @@ -94,9 +94,9 @@ static s32 D_80897518[] = { 0x80, 0xA0, 0xA0, 0x80 }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static Vec3s D_80897538 = { 0, -0x4000, 0 }; diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 9e2a0d9ad4..9122ebfcf9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -8,7 +8,7 @@ #include "z_bg_jya_goroiwa.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaGoroiwa_Init(Actor* thisx, PlayState* play); void BgJyaGoroiwa_Destroy(Actor* thisx, PlayState* play); @@ -66,9 +66,9 @@ static CollisionCheckInfoInit sColChkInfoInit = { 1, 15, 0, MASS_HEAVY }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaGoroiwa_UpdateCollider(BgJyaGoroiwa* this) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 0f100259bd..f327e15f8c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -8,7 +8,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "assets/objects/object_jya_iron/object_jya_iron.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaHaheniron_Init(Actor* thisx, PlayState* play); void BgJyaHaheniron_Destroy(Actor* thisx, PlayState* play); @@ -64,9 +64,9 @@ static ColliderJntSphInit sJntSphInit = { static s16 sKakeraScales[] = { 5, 8, 11, 14, 17 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static f32 D_80898794[] = { 0.13f, 0.1f, 0.1f }; diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index cf15c084b0..e5a8e139ba 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -72,9 +72,9 @@ static s16 D_80899530[] = { 48, 42, 36, 32, 28, 24, 20, 16 }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static CollisionHeader* sCollisionHeaders[] = { &gPillarCol, &gThroneCol }; diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 55f106a0ce..459e3f11af 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -35,9 +35,9 @@ ActorProfile Bg_Jya_Kanaami_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 8b3375967e..2d1092c8e5 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -7,7 +7,7 @@ #include "z_bg_jya_lift.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaLift_Init(Actor* thisx, PlayState* play); void BgJyaLift_Destroy(Actor* thisx, PlayState* play); @@ -36,9 +36,9 @@ ActorProfile Bg_Jya_Lift_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2500, ICHAIN_STOP), }; void BgJyaLift_InitDynapoly(BgJyaLift* this, PlayState* play, CollisionHeader* collisionHeader, s32 moveFlag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index eed3074280..546f8c8d64 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -105,9 +105,9 @@ static Vec3f sVelocity = { 0.0f, 0.0f, 0.8f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; void BgJyaMegami_InitDynaPoly(BgJyaMegami* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index d33e173cee..66875ae85b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -8,7 +8,7 @@ #include "assets/objects/object_jya_obj/object_jya_obj.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaZurerukabe_Init(Actor* thisx, PlayState* play); void BgJyaZurerukabe_Destroy(Actor* thisx, PlayState* play); @@ -54,9 +54,9 @@ static s16 D_8089BA30[6] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 4e2dea2a9c..e44f561d83 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -7,7 +7,7 @@ #include "z_bg_menkuri_eye.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" -#define FLAGS ACTOR_FLAG_5 +#define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED void BgMenkuriEye_Init(Actor* thisx, PlayState* play); void BgMenkuriEye_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 95b9bbb95d..cb3c724cf5 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -7,7 +7,7 @@ #include "z_bg_menkuri_kaiten.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMenkuriKaiten_Init(Actor* thisx, PlayState* play); void BgMenkuriKaiten_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 6c16b95e61..2bcc1974b2 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMizuBwall_Init(Actor* thisx, PlayState* play); void BgMizuBwall_Destroy(Actor* thisx, PlayState* play); @@ -157,9 +157,9 @@ static CollisionHeader* sColHeaders[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 96583b843f..095ab67e43 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define MOVEBG_TYPE(params) PARAMS_GET_U((u16)(params), 12, 4) #define MOVEBG_FLAGS(params) PARAMS_GET_U((u16)(params), 0, 6) @@ -62,9 +62,9 @@ static CollisionHeader* sColHeaders[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 44a2f7cce6..585f85f6f5 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -1,7 +1,7 @@ #include "z_bg_mizu_shutter.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMizuShutter_Init(Actor* thisx, PlayState* play); void BgMizuShutter_Destroy(Actor* thisx, PlayState* play); @@ -38,9 +38,9 @@ static Vec3f sDisplacements[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 1810d0bd2d..9f1884ea49 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -29,8 +29,8 @@ ActorProfile Bg_Mizu_Uzu_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 2b3abc2733..68f551be8b 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -7,7 +7,7 @@ #include "z_bg_mizu_water.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMizuWater_Init(Actor* thisx, PlayState* play); void BgMizuWater_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 7dd37baf58..69bbc3506c 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -14,7 +14,7 @@ #include "assets/objects/object_mjin_flash/object_mjin_flash.h" #include "assets/objects/object_mjin_oka/object_mjin_oka.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMjin_Init(Actor* thisx, PlayState* play); void BgMjin_Destroy(Actor* thisx, PlayState* play); @@ -40,9 +40,9 @@ extern UNK_TYPE D_06000000; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; static s16 sObjectIds[] = { OBJECT_MJIN_FLASH, OBJECT_MJIN_DARK, OBJECT_MJIN_FLAME, @@ -78,7 +78,7 @@ void func_808A0850(BgMjin* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { colHeader = NULL; - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.objectSlot = this->requiredObjectSlot; Actor_SetObjectDependency(play, &this->dyna.actor); DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 7726f3b2d1..7b02395228 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -8,7 +8,7 @@ #include "assets/objects/object_mori_objects/object_mori_objects.h" #include "quake.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMoriBigst_Init(Actor* thisx, PlayState* play); void BgMoriBigst_Destroy(Actor* thisx, PlayState* play); @@ -41,8 +41,8 @@ ActorProfile Bg_Mori_Bigst_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 3000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 3000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -12000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 3ed26dfe1c..b441ed008c 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -1,7 +1,7 @@ #include "z_bg_mori_elevator.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMoriElevator_Init(Actor* thisx, PlayState* play); void BgMoriElevator_Destroy(Actor* thisx, PlayState* play); @@ -32,9 +32,9 @@ ActorProfile Bg_Mori_Elevator_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 3000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 7db118d243..53bc3b6b47 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -64,18 +64,18 @@ static ColliderJntSphInit sJntSphInit = { }; static InitChainEntry sInitChainClasp[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_3, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 40, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; static InitChainEntry sInitChainLadder[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index e1ce8bdc05..c5f634640e 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -7,7 +7,7 @@ #include "z_bg_mori_hashira4.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMoriHashira4_Init(Actor* thisx, PlayState* play); void BgMoriHashira4_Destroy(Actor* thisx, PlayState* play); @@ -34,9 +34,9 @@ ActorProfile Bg_Mori_Hashira4_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 3e346641eb..70e60eacf4 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -14,7 +14,7 @@ #include "assets/objects/object_mori_hineri2a/object_mori_hineri2a.h" #include "assets/objects/object_mori_tex/object_mori_tex.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMoriHineri_Init(Actor* thisx, PlayState* play); void BgMoriHineri_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 507f92e73c..9af9f14f2f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -7,7 +7,7 @@ #include "z_bg_mori_idomizu.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMoriIdomizu_Init(Actor* thisx, PlayState* play); void BgMoriIdomizu_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index 261196640c..e9fc984f99 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -33,9 +33,9 @@ ActorProfile Bg_Mori_Kaitenkabe_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index e4d30217dd..61bbf6b9ef 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -8,7 +8,7 @@ #include "assets/objects/object_mori_objects/object_mori_objects.h" #include "quake.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play); void BgMoriRakkatenjo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 017f18606d..7199ec25b5 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -155,7 +155,7 @@ void BgPoEvent_InitBlocks(BgPoEvent* this, PlayState* play) { CollisionHeader* colHeader = NULL; s32 bgId; - this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; CollisionHeader_GetVirtual(&gPoSistersAmyBlockCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if ((this->type == 0) && (this->index != 3)) { @@ -308,7 +308,7 @@ void BgPoEvent_BlockFall(BgPoEvent* this, PlayState* play) { this->dyna.actor.velocity.y++; if (Math_StepToF(&this->dyna.actor.world.pos.y, 433.0f, this->dyna.actor.velocity.y)) { - this->dyna.actor.flags &= ~ACTOR_FLAG_5; + this->dyna.actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->dyna.actor.velocity.y = 0.0f; sBlocksAtRest++; if (this->type != 1) { diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 3b1f559479..f6dfcc3d37 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -7,7 +7,7 @@ #include "z_bg_relay_objects.h" #include "assets/objects/object_relay_objects/object_relay_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum WindmillSetpiecesMode { /* 0 */ WINDMILL_ROTATING_GEAR, @@ -62,7 +62,7 @@ void BgRelayObjects_Init(Actor* thisx, PlayState* play) { } Audio_PlayWindmillBgm(); thisx->room = -1; - thisx->flags |= ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; if (D_808A9508 & 2) { thisx->params = 0xFF; Actor_Kill(thisx); @@ -154,7 +154,7 @@ void func_808A9234(BgRelayObjects* this, PlayState* play) { return; } Flags_UnsetSwitch(play, this->switchFlag); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (play->roomCtx.curRoom.num == 4) { gSaveContext.timerState = TIMER_STATE_UP_FREEZE; } diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index 2ad49f6e71..3eb461a52f 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -27,9 +27,9 @@ ActorProfile Bg_Spot00_Break_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index 501d0f430b..c60865af16 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -8,7 +8,7 @@ #include "assets/objects/object_spot00_objects/object_spot00_objects.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum DrawbridgeType { /* -1 */ DT_DRAWBRIDGE = -1, @@ -40,9 +40,9 @@ ActorProfile Bg_Spot00_Hanebasi_Profile = { static f32 sTorchFlameScale = 0.0f; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 550, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 550, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 5000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 9dde534fa8..d8b3cfaba7 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -7,7 +7,7 @@ #include "z_bg_spot01_fusya.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot01Fusya_Init(Actor* thisx, PlayState* play); void BgSpot01Fusya_Destroy(Actor* thisx, PlayState* play); @@ -30,9 +30,9 @@ ActorProfile Bg_Spot01_Fusya_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 12800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 12800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1300, ICHAIN_STOP), }; void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, BgSpot01FusyaActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 475940dd53..ba1ff57d87 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -8,7 +8,7 @@ #include "assets/objects/object_spot01_objects/object_spot01_objects.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot01Idohashira_Init(Actor* thisx, PlayState* play); void BgSpot01Idohashira_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index b709fc11e3..f2c89a41de 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -7,14 +7,14 @@ #include "z_bg_spot01_idomizu.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" -#define FLAGS ACTOR_FLAG_5 +#define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED void BgSpot01Idomizu_Init(Actor* thisx, PlayState* play); void BgSpot01Idomizu_Destroy(Actor* thisx, PlayState* play); void BgSpot01Idomizu_Update(Actor* thisx, PlayState* play); void BgSpot01Idomizu_Draw(Actor* thisx, PlayState* play); -void func_808ABB84(BgSpot01Idomizu* this, PlayState* play); +void BgSpot01Idomizu_UpdateWaterLevel(BgSpot01Idomizu* this, PlayState* play); ActorProfile Bg_Spot01_Idomizu_Profile = { /**/ ACTOR_BG_SPOT01_IDOMIZU, @@ -36,20 +36,20 @@ void BgSpot01Idomizu_Init(Actor* thisx, PlayState* play) { BgSpot01Idomizu* this = (BgSpot01Idomizu*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); - if (GET_EVENTCHKINF(EVENTCHKINF_67) || LINK_AGE_IN_YEARS == YEARS_ADULT) { + if (GET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL) || LINK_AGE_IN_YEARS == YEARS_ADULT) { this->waterHeight = -550.0f; } else { this->waterHeight = 52.0f; } - this->actionFunc = func_808ABB84; + this->actionFunc = BgSpot01Idomizu_UpdateWaterLevel; this->actor.world.pos.y = this->waterHeight; } void BgSpot01Idomizu_Destroy(Actor* thisx, PlayState* play) { } -void func_808ABB84(BgSpot01Idomizu* this, PlayState* play) { - if (GET_EVENTCHKINF(EVENTCHKINF_67)) { +void BgSpot01Idomizu_UpdateWaterLevel(BgSpot01Idomizu* this, PlayState* play) { + if (GET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL)) { this->waterHeight = -550.0f; } play->colCtx.colHeader->waterBoxes[0].ySurface = this->actor.world.pos.y; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 964416c0b0..1bad86dd46 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -7,7 +7,7 @@ #include "z_bg_spot01_idosoko.h" #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot01Idosoko_Init(Actor* thisx, PlayState* play); void BgSpot01Idosoko_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index 6b35c92126..2ee4c58283 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -8,7 +8,7 @@ #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot01Objects2_Init(Actor* thisx, PlayState* play); void BgSpot01Objects2_Destroy(Actor* thisx, PlayState* play); @@ -31,9 +31,9 @@ ActorProfile Bg_Spot01_Objects2_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 12800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 12800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 811ce475ce..a0d74b4eda 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -7,7 +7,7 @@ #include "z_bg_spot02_objects.h" #include "assets/objects/object_spot02_objects/object_spot02_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot02Objects_Init(Actor* thisx, PlayState* play); void BgSpot02Objects_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index 12d6cced10..fccae09ba4 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -7,14 +7,14 @@ #include "z_bg_spot03_taki.h" #include "assets/objects/object_spot03_object/object_spot03_object.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot03Taki_Init(Actor* thisx, PlayState* play); void BgSpot03Taki_Destroy(Actor* thisx, PlayState* play); void BgSpot03Taki_Update(Actor* thisx, PlayState* play); void BgSpot03Taki_Draw(Actor* thisx, PlayState* play); -void func_808ADEF0(BgSpot03Taki* this, PlayState* play); +void BgSpot03Taki_HandleWaterfallState(BgSpot03Taki* this, PlayState* play); ActorProfile Bg_Spot03_Taki_Profile = { /**/ ACTOR_BG_SPOT03_TAKI, @@ -56,7 +56,7 @@ void BgSpot03Taki_Init(Actor* thisx, PlayState* play) { this->openingAlpha = 255.0f; BgSpot03Taki_ApplyOpeningAlpha(this, 0); BgSpot03Taki_ApplyOpeningAlpha(this, 1); - this->actionFunc = func_808ADEF0; + this->actionFunc = BgSpot03Taki_HandleWaterfallState; } void BgSpot03Taki_Destroy(Actor* thisx, PlayState* play) { @@ -65,7 +65,7 @@ void BgSpot03Taki_Destroy(Actor* thisx, PlayState* play) { DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); } -void func_808ADEF0(BgSpot03Taki* this, PlayState* play) { +void BgSpot03Taki_HandleWaterfallState(BgSpot03Taki* this, PlayState* play) { if (this->state == WATERFALL_CLOSED) { if (Flags_GetSwitch(play, this->switchFlag)) { this->state = WATERFALL_OPENING_ANIMATED; diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index 843b3e5235..93c30e65af 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -61,7 +61,7 @@ void BgSpot05Soko_Init(Actor* thisx, PlayState* play) { Actor_Kill(thisx); } else { this->actionFunc = func_808AE5B4; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader); diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 459667c5a9..d06e292e12 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -124,7 +124,7 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { Collider_SetJntSph(play, &this->collider, thisx, &sJntSphInit, this->colliderItem); if (LINK_IS_ADULT && Flags_GetSwitch(play, this->switchFlag)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_LOWERED; } else { thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_RAISED; @@ -148,9 +148,9 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { break; case LHO_WATER_PLANE: Actor_ProcessInitChain(thisx, sInitChainWaterPlane); - thisx->flags = ACTOR_FLAG_4 | ACTOR_FLAG_5; + thisx->flags = ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; - if (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { if (!IS_CUTSCENE_LAYER) { this->lakeHyliaWaterLevel = -681.0f; play->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].ySurface = @@ -291,7 +291,7 @@ void BgSpot06Objects_LockWait(BgSpot06Objects* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->timer = 130; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; sin = Math_SinS(this->dyna.actor.world.rot.y); cos = Math_CosS(this->dyna.actor.world.rot.y); this->dyna.actor.world.pos.x += (3.0f * sin); @@ -365,7 +365,7 @@ void BgSpot06Objects_LockSwimToSurface(BgSpot06Objects* this, PlayState* play) { this->dyna.actor.world.pos.z - (Math_CosS(this->dyna.actor.shape.rot.y) * 16.0f); this->dyna.actor.world.pos.y = -1993.0f; this->timer = 32; - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->collider.elements[0].dim.worldSphere.radius = this->collider.elements[0].dim.modelSphere.radius * 2; this->actionFunc = BgSpot06Objects_LockFloat; } @@ -482,7 +482,7 @@ void BgSpot06Objects_Draw(Actor* thisx, PlayState* play) { * cleared. */ void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, PlayState* play) { - if (GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneRise; } } diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index 76d6ce04e7..04d06a57a5 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -8,7 +8,7 @@ #include "versions.h" #include "assets/objects/object_spot07_object/object_spot07_object.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot07Taki_Init(Actor* thisx, PlayState* play); void BgSpot07Taki_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 39126bcde9..7d44d616d2 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -88,9 +88,9 @@ static Vec3f D_808B08AC[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void func_808B02D0(BgSpot08Bakudankabe* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index f9a7d9c695..dfaa807a93 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -278,9 +278,9 @@ void BgSpot08Iceblock_SpawnTwinFloe(BgSpot08Iceblock* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2200, ICHAIN_STOP), }; void BgSpot08Iceblock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 2cce032344..00ca47644f 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -41,15 +41,15 @@ static s32 (*D_808B1FA4[])(BgSpot09Obj* this, PlayState* play) = { }; static InitChainEntry sInitChain1[] = { - ICHAIN_F32(uncullZoneForward, 7200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 7200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 7200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 7200, ICHAIN_STOP), }; static InitChainEntry sInitChain2[] = { - ICHAIN_F32(uncullZoneForward, 7200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 7200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; static Gfx* sDLists[] = { @@ -63,7 +63,7 @@ s32 func_808B1AE0(BgSpot09Obj* this, PlayState* play) { return this->dyna.actor.params == 0; } - carpentersRescued = GET_EVENTCHKINF_CARPENTERS_FREE_ALL(); + carpentersRescued = GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED(); if (LINK_AGE_IN_YEARS == YEARS_ADULT) { switch (this->dyna.actor.params) { @@ -138,8 +138,7 @@ void BgSpot09Obj_Init(Actor* thisx, PlayState* play) { BgSpot09Obj* this = (BgSpot09Obj*)thisx; PRINTF("Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n", this->dyna.actor.params, - gSaveContext.save.info.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] & - EVENTCHKINF_CARPENTERS_FREE_MASK_ALL); + GET_EVENTCHKINF_CARPENTERS_RESCUED_FLAGS()); this->dyna.actor.params &= 0xFF; if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) { PRINTF("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot09_obj.c", diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 43dd1e73b9..d0568c23c8 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -9,7 +9,7 @@ #include "assets/objects/object_spot11_obj/object_spot11_obj.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot11Bakudankabe_Init(Actor* thisx, PlayState* play); void BgSpot11Bakudankabe_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 4218cc79fd..05987f0921 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot11Oasis_Init(Actor* thisx, PlayState* play); void BgSpot11Oasis_Update(Actor* thisx, PlayState* play); @@ -38,9 +38,9 @@ static s16 D_808B2E10[][2] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static Vec3f D_808B2E34[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 719baddf1b..b01eb98174 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -38,9 +38,9 @@ ActorProfile Bg_Spot12_Gate_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, PlayState* play, CollisionHeader* collision, s32 flags) { diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index bf53fec356..7fc67b38df 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -35,9 +35,9 @@ ActorProfile Bg_Spot12_Saku_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collision, s32 flags) { diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index d3aa4423c7..c0daacf78c 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -39,9 +39,9 @@ ActorProfile Bg_Spot15_Rrbox_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static Vec3f D_808B45C4[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 7e2f27fcc9..f7ba17ed02 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -4,7 +4,7 @@ #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play); void BgSpot16Bombstone_Destroy(Actor* thisx, PlayState* play); @@ -122,17 +122,17 @@ ActorProfile Bg_Spot16_Bombstone_Profile = { }; static InitChainEntry sInitChainBoulder[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static InitChainEntry sInitChainDebris[] = { ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE), ICHAIN_F32(minVelocityY, -10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static Vec3f sVelocity = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index ece0d3d6d4..b71c0fd137 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -31,9 +31,9 @@ ActorProfile Bg_Spot16_Doughnut_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 5500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 5000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 5000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 5500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 5000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 5000, ICHAIN_STOP), }; static s16 sScales[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 7d2166dd73..c6eafbdd47 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -30,9 +30,9 @@ ActorProfile Bg_Spot17_Bakudankabe_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void func_808B6BC0(BgSpot17Bakudankabe* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index 8fbdd14048..8ee2e9dadf 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -7,7 +7,7 @@ #include "z_bg_spot17_funen.h" #include "assets/objects/object_spot17_obj/object_spot17_obj.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot17Funen_Init(Actor* thisx, PlayState* play); void BgSpot17Funen_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index d41f0d86b9..95aecef7ff 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -2,7 +2,7 @@ #include "assets/objects/object_spot18_obj/object_spot18_obj.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot18Basket_Init(Actor* thisx, PlayState* play); void BgSpot18Basket_Destroy(Actor* thisx, PlayState* play); @@ -123,9 +123,9 @@ void func_808B7770(BgSpot18Basket* this, PlayState* play, f32 arg2) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgSpot18Basket_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index c321d5c550..cec6266a2e 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -28,9 +28,9 @@ ActorProfile Bg_Spot18_Futa_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgSpot18Futa_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 4156815ddf..505797f7e9 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -67,15 +67,15 @@ static BgSpot18ObjInitFunc D_808B910C[] = { }; static InitChainEntry sInitChain1[] = { - ICHAIN_F32(minVelocityY, -10, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -4, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(minVelocityY, -10, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -4, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; static InitChainEntry sInitChain2[] = { - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 700, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 700, ICHAIN_STOP), }; static BgSpot18ObjInitFunc D_808B913C[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 789921509e..a078991b46 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -7,7 +7,7 @@ #include "z_bg_spot18_shutter.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot18Shutter_Init(Actor* thisx, PlayState* play); void BgSpot18Shutter_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index d328a2379b..5d96a0d750 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -7,7 +7,7 @@ #include "z_bg_sst_floor.h" #include "assets/objects/object_sst/object_sst.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSstFloor_Init(Actor* thisx, PlayState* play); void BgSstFloor_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index f24ed0c28a..4ed9f8854c 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -7,7 +7,7 @@ #include "z_bg_toki_hikari.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" -#define FLAGS ACTOR_FLAG_5 +#define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED void BgTokiHikari_Init(Actor* thisx, PlayState* play); void BgTokiHikari_Destroy(Actor* thisx, PlayState* play); @@ -46,7 +46,7 @@ void BgTokiHikari_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgTokiHikari_DoNothing; break; case 1: - if (!GET_EVENTCHKINF(EVENTCHKINF_4B)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { this->actionFunc = func_808BA204; this->unk_14C = 0.0f; } else { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index e25280ed0b..8dcc00db30 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -7,7 +7,7 @@ #include "z_bg_toki_swd.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgTokiSwd_Init(Actor* thisx, PlayState* play); void BgTokiSwd_Destroy(Actor* thisx, PlayState* play); @@ -18,9 +18,9 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play); void func_808BB0AC(BgTokiSwd* this, PlayState* play); void func_808BB128(BgTokiSwd* this, PlayState* play); -extern CutsceneData D_808BB2F0[]; -extern CutsceneData D_808BB7A0[]; -extern CutsceneData D_808BBD90[]; +extern CutsceneData gPullMasterSwordCs[]; +extern CutsceneData gPlaceMasterSwordCs[]; +extern CutsceneData gRevealMasterSwordCs[]; ActorProfile Bg_Toki_Swd_Profile = { /**/ ACTOR_BG_TOKI_SWD, @@ -93,19 +93,19 @@ void BgTokiSwd_Destroy(Actor* thisx, PlayState* play) { } void func_808BAF40(BgTokiSwd* this, PlayState* play) { - if (!GET_EVENTCHKINF(EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS) && !IS_CUTSCENE_LAYER && + if (!GET_EVENTCHKINF(EVENTCHKINF_REVEALED_MASTER_SWORD) && !IS_CUTSCENE_LAYER && Actor_IsFacingAndNearPlayer(&this->actor, 800.0f, 0x7530) && !Play_InCsMode(play)) { - SET_EVENTCHKINF(EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS); - play->csCtx.script = D_808BBD90; + SET_EVENTCHKINF(EVENTCHKINF_REVEALED_MASTER_SWORD); + play->csCtx.script = gRevealMasterSwordCs; gSaveContext.cutsceneTrigger = 1; } if (!LINK_IS_ADULT || GET_EVENTCHKINF(EVENTCHKINF_55)) { if (Actor_HasParent(&this->actor, play)) { if (!LINK_IS_ADULT) { Item_Give(play, ITEM_SWORD_MASTER); - play->csCtx.script = D_808BB2F0; + play->csCtx.script = gPullMasterSwordCs; } else { - play->csCtx.script = D_808BB7A0; + play->csCtx.script = gPlaceMasterSwordCs; } SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_MASTER_SWORD); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c index f6f5e3da76..f11a8a551a 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c @@ -2,8 +2,8 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_808BB2F0[] = { - CS_BEGIN_CUTSCENE(9, 425), +CutsceneData gPullMasterSwordCs[] = { + CS_HEADER(9, 425), CS_PLAYER_CUE_LIST(1), CS_PLAYER_CUE(PLAYER_CUEID_12, 0, 256, 0x0000, 0x0000, 0x0000, 0, 54, 52, 0, 54, 52, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_LIGHT_SETTING_LIST(1), @@ -74,6 +74,6 @@ CutsceneData D_808BB2F0[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42700000, 60.0f), -1, 117, 7, 0x0000), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42700000, 60.0f), -1, 117, 7, 0x2F73), CS_CAM_POINT(CS_CAM_STOP, 0x00, 20, CS_FLOAT(0x42700000, 60.0f), -1, 117, 7, 0x6B2F), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c index ca4c06b775..de138790da 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c @@ -2,8 +2,8 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_808BB7A0[] = { - CS_BEGIN_CUTSCENE(9, 368), +CutsceneData gPlaceMasterSwordCs[] = { + CS_HEADER(9, 368), CS_CAM_EYE_SPLINE(0, 126), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1, 101, -110, 0x616D), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42200000, 40.0f), -1, 101, -110, 0x6964), @@ -94,6 +94,6 @@ CutsceneData D_808BB7A0[] = { CS_MISC(CS_MISC_SET_CSFLAG_1, 90, 91, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 190, 210), CS_DESTINATION(CS_DEST_TEMPLE_OF_TIME_FROM_MASTER_SWORD, 210, 211), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c index f7f8d0067e..c6c5e4eb60 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c @@ -2,15 +2,15 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_808BBD90[] = { - CS_BEGIN_CUTSCENE(11, 3000), +CutsceneData gRevealMasterSwordCs[] = { + CS_HEADER(11, 3000), CS_UNK_DATA_LIST(0x00000021, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000), CS_PLAYER_CUE_LIST(3), CS_PLAYER_CUE(PLAYER_CUEID_5, 0, 1, 0x0000, 0x8000, 0x0000, 0, 0, 820, 0, 0, 820, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_2, 1, 16, 0x0000, 0x8000, 0x0000, 0, 0, 820, 0, 0, 720, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 16, 176, 0x0000, 0x8000, 0x0000, 0, 0, 720, 0, 0, 720, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_ACTOR_CUE_LIST(62, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 3), CS_ACTOR_CUE(0x0004, 40, 70, 0x7D74, 0x0000, 0x0000, -1, 49, 719, 1, 47, 687, CS_FLOAT(0x3D888889, 0.06666667f), CS_FLOAT(0xBD888889, -0.06666667f), CS_FLOAT(0xBD888889, -0.06666667f)), CS_ACTOR_CUE(0x0004, 70, 220, 0x8010, 0x0000, 0x0000, 1, 47, 687, 0, 134, 21, CS_FLOAT(0xBBDA740E, -0.006666667f), CS_FLOAT(0x3F147AE1, 0.58f), CS_FLOAT(0x3BDA740E, 0.006666667f)), CS_ACTOR_CUE(0x0002, 220, 272, 0x8000, 0x0000, 0x0000, 0, 134, 21, 0, 101, 2, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBF227627, -0.63461536f), CS_FLOAT(0x0, 0.0f)), @@ -18,11 +18,11 @@ CutsceneData D_808BBD90[] = { CS_MISC(CS_MISC_STOP_CUTSCENE, 340, 341, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000), CS_TEXT_LIST(6), CS_TEXT_NONE(0, 50), - CS_TEXT(0x70E6, 50, 60, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x70E6, 50, 60, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(60, 250), - CS_TEXT(0x70E7, 250, 260, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x70E7, 250, 260, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(260, 290), - CS_TEXT(0x70E8, 290, 320, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x70E8, 290, 320, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_CAM_EYE_SPLINE(0, 251), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -59, 12, 690, 0x0222), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -59, 12, 690, 0x00FA), @@ -91,6 +91,6 @@ CutsceneData D_808BBD90[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700001, 60.000004f), 0, 98, -31, 0x0000), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700001, 60.000004f), 0, 98, -31, 0x2D70), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700001, 60.000004f), 0, 98, -31, 0x0085), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index ef0e25f404..d245fce7cd 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -9,7 +9,7 @@ #include "assets/objects/object_spot04_objects/object_spot04_objects.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgTreemouth_Init(Actor* thisx, PlayState* play); void BgTreemouth_Destroy(Actor* thisx, PlayState* play); @@ -25,10 +25,10 @@ void func_808BC8B8(BgTreemouth* this, PlayState* play); void func_808BC9EC(BgTreemouth* this, PlayState* play); void func_808BCAF0(BgTreemouth* this, PlayState* play); -extern CutsceneData D_808BCE20[]; -extern CutsceneData D_808BD2A0[]; -extern CutsceneData D_808BD520[]; -extern CutsceneData D_808BD790[]; +extern CutsceneData gDekuTreeMeetingCs[]; +extern CutsceneData gDekuTreeChoiceCs[]; +extern CutsceneData gDekuTreeMouthOpeningCs[]; +extern CutsceneData gDekuTreeAskAgainCs[]; ActorProfile Bg_Treemouth_Profile = { /**/ ACTOR_BG_TREEMOUTH, @@ -45,9 +45,9 @@ ActorProfile Bg_Treemouth_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_5, ICHAIN_CONTINUE), ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 8000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 8000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; // unused @@ -146,14 +146,14 @@ void func_808BC8B8(BgTreemouth* this, PlayState* play) { this->dyna.actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; if (this->dyna.actor.isLockedOn) { this->dyna.actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - play->csCtx.script = D_808BD2A0; + play->csCtx.script = gDekuTreeChoiceCs; gSaveContext.cutsceneTrigger = 1; BgTreemouth_SetupAction(this, func_808BC9EC); } } } else if (Actor_IsFacingAndNearPlayer(&this->dyna.actor, 1658.0f, 0x4E20)) { Flags_SetEventChkInf(EVENTCHKINF_0C); - play->csCtx.script = D_808BCE20; + play->csCtx.script = gDekuTreeMeetingCs; gSaveContext.cutsceneTrigger = 1; BgTreemouth_SetupAction(this, func_808BC9EC); } @@ -186,11 +186,11 @@ void func_808BC9EC(BgTreemouth* this, PlayState* play) { play->csCtx.state = CS_STATE_RUN; if (play->msgCtx.choiceIndex == 0) { - play->csCtx.script = D_808BD520; + play->csCtx.script = gDekuTreeMouthOpeningCs; Flags_SetEventChkInf(EVENTCHKINF_05); BgTreemouth_SetupAction(this, func_808BCAF0); } else { - play->csCtx.script = D_808BD790; + play->csCtx.script = gDekuTreeAskAgainCs; play->csCtx.curFrame = 0; BgTreemouth_SetupAction(this, func_808BC8B8); } diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c index 0d06793b69..020b2972b1 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c @@ -2,8 +2,8 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_808BCE20[] = { - CS_BEGIN_CUTSCENE(12, 3000), +CutsceneData gDekuTreeMeetingCs[] = { + CS_HEADER(12, 3000), CS_UNK_DATA_LIST(0x00000015, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), CS_PLAYER_CUE_LIST(2), @@ -43,14 +43,14 @@ CutsceneData D_808BCE20[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x423CCCC1, 47.199955f), 2673, 127, -267, 0x7805), CS_TEXT_LIST(4), CS_TEXT_NONE(0, 40), - CS_TEXT(0x107D, 40, 60, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x107D, 40, 60, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_TEXT_NONE(60, 160), - CS_TEXT(0x1015, 160, 170, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x1015, 160, 170, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 180, 200, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(46, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_6, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -41, -28, 0, -41, -28, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(62, 4), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 4), CS_ACTOR_CUE(0x0001, 0, 1, 0x0000, 0x0000, 0x0000, 2668, 46, -490, 2668, 46, -490, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 1, 50, 0x5479, 0x0000, 0x0000, 2668, 46, -490, 2890, 43, -612, CS_FLOAT(0x4090FAC7, 4.5306125f), CS_FLOAT(0xBD7AC688, -0.06122449f), CS_FLOAT(0xC090FAC7, -4.5306125f)), CS_ACTOR_CUE(0x0004, 50, 100, 0x505C, 0x0000, 0x0000, 2890, 43, -612, 3109, 121, -705, CS_FLOAT(0x408C28F6, 4.38f), CS_FLOAT(0x3FC7AE14, 1.56f), CS_FLOAT(0xC08C28F6, -4.38f)), @@ -59,16 +59,16 @@ CutsceneData D_808BCE20[] = { CS_START_SEQ(NA_BGM_DEKU_TREE_CS, 140, 141, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000094, 0x00000000, 0xFFFFFFBA, 0x00000094), CS_FADE_OUT_SEQ_LIST(1), CS_FADE_OUT_SEQ(CS_FADE_OUT_BGM_MAIN, 0, 20, 0x0000, 0x00000000, 0xFFFFFFA2, 0x00000000, 0x00000027, 0xFFFFFFA2, 0x00000000, 0x00000027), - CS_END(), + CS_END_OF_SCRIPT(), }; -CutsceneData D_808BD2A0[] = { - CS_BEGIN_CUTSCENE(9, 3000), +CutsceneData gDekuTreeChoiceCs[] = { + CS_HEADER(9, 3000), CS_UNK_DATA_LIST(0x00000015, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 90, 172, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0x00000012, 0x00000000, 0xFFFFFFE3, 0x00000012, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(46, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_6, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -27, 26, 0, -27, 26, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_CAM_EYE_SPLINE(0, 1091), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3740, -141, -530, 0x7065), @@ -96,17 +96,17 @@ CutsceneData D_808BD2A0[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 1, 35, -36, 0x9D94), CS_TEXT_LIST(2), CS_TEXT_NONE(0, 20), - CS_TEXT(0x1016, 20, 80, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x1016, 20, 80, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_DEKU_TREE_CS, 0, 1, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFAC, 0x0000007E, 0x00000000, 0xFFFFFFAC, 0x0000007E), - CS_END(), + CS_END_OF_SCRIPT(), }; -CutsceneData D_808BD520[] = { - CS_BEGIN_CUTSCENE(8, 3000), +CutsceneData gDekuTreeMouthOpeningCs[] = { + CS_HEADER(8, 3000), CS_UNK_DATA_LIST(0x00000015, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(46, 2), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_6, 2), CS_ACTOR_CUE(0x0001, 0, 20, 0x0000, 0x0000, 0x0000, 42, 0, 77, 42, 0, 77, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0003, 20, 357, 0x0000, 0x0000, 0x0000, 42, 0, 77, 42, 0, 77, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_CAM_EYE_SPLINE(0, 1151), @@ -127,21 +127,21 @@ CutsceneData D_808BD520[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4223FFED, 40.999928f), 3765, -118, -617, 0x01BC), CS_TEXT_LIST(2), CS_TEXT_NONE(0, 20), - CS_TEXT(0x1017, 20, 60, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x1017, 20, 60, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 100, 150, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF5, 0x00000010, 0x00000000, 0xFFFFFFF5, 0x00000010, 0x00000000, 0x00000000, 0x00000000), CS_STOP_SEQ_LIST(1), CS_STOP_SEQ(NA_BGM_DEKU_TREE_CS, 90, 91, 0x0000, 0x00000000, 0xFFFFFFAC, 0x00000000, 0x00000034, 0xFFFFFFAC, 0x00000000, 0x00000034), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_KOKIRI, 99, 100, 0x0000, 0x00000000, 0xFFFFFFD0, 0x00000000, 0x00000041, 0xFFFFFFD0, 0x00000000, 0x00000041), - CS_END(), + CS_END_OF_SCRIPT(), }; -CutsceneData D_808BD790[] = { - CS_BEGIN_CUTSCENE(8, 3000), +CutsceneData gDekuTreeAskAgainCs[] = { + CS_HEADER(8, 3000), CS_UNK_DATA_LIST(0x00000015, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(46, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_6, 1), CS_ACTOR_CUE(0x0001, 0, 119, 0x0000, 0x0000, 0x0000, 42, 0, 77, 42, 0, 77, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_CAM_EYE_SPLINE(0, 1091), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4297331E, 75.59984f), 3716, 790, -1171, 0x54EC), @@ -157,13 +157,13 @@ CutsceneData D_808BD790[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4297331E, 75.59984f), 3769, 718, -1186, 0x56AC), CS_TEXT_LIST(2), CS_TEXT_NONE(0, 20), - CS_TEXT(0x1018, 20, 60, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x1018, 20, 60, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 80, 110, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEA, 0x00000006, 0x00000000, 0xFFFFFFEA, 0x00000006, 0x00000000, 0x00000000, 0x00000000), CS_STOP_SEQ_LIST(1), CS_STOP_SEQ(NA_BGM_DEKU_TREE_CS, 70, 71, 0x0000, 0x00000000, 0xFFFFFFB7, 0x00000000, 0x00000044, 0xFFFFFFB7, 0x00000000, 0x00000044), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_KOKIRI, 79, 80, 0x0000, 0x00000000, 0xFFFFFFE8, 0x00000000, 0x0000003A, 0xFFFFFFE8, 0x00000000, 0x0000003A), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index 822a9ddd59..dbd5148b74 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -41,11 +41,11 @@ void BgUmaJump_Init(Actor* thisx, PlayState* play) { this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.actor.params == 1) { - if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && (DREG(1) == 0)) { + if (!(Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED)) { Actor_Kill(&this->dyna.actor); return; } - this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; } } diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 020b056bb4..df6e12f851 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -7,7 +7,7 @@ #include "z_bg_ydan_hasi.h" #include "assets/objects/object_ydan_objects/object_ydan_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgYdanHasi_Init(Actor* thisx, PlayState* play); void BgYdanHasi_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 6e5a1010fb..2d9b6f9296 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -293,7 +293,7 @@ void BgYdanSp_FloorWebIdle(BgYdanSp* this, PlayState* play) { if (this->dyna.actor.xzDistToPlayer < 80.0f) { this->unk_16C = 200.0f; this->dyna.actor.room = -1; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->timer = 40; Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WEB_BROKEN); this->actionFunc = BgYdanSp_FloorWebBreaking; diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index d5d3244348..958e3c3f4f 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -8,7 +8,7 @@ #include "assets/objects/object_zg/object_zg.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgZg_Init(Actor* thisx, PlayState* play); void BgZg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 5363ae0c54..ee1142b45a 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -3,7 +3,9 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void BossDodongo_Init(Actor* thisx, PlayState* play); void BossDodongo_Destroy(Actor* thisx, PlayState* play); @@ -333,7 +335,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) { this->subCamAt.z = player->actor.world.pos.z; } - if (GET_EVENTCHKINF(EVENTCHKINF_71)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE)) { if (this->unk_198 == 100) { this->actor.world.pos.x = -1114.0f; this->actor.world.pos.z = -2804.0f; @@ -374,7 +376,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) { case 4: Math_SmoothStepToF(&this->unk_20C, 0.0f, 1.0f, 0.01f, 0.0f); - if (GET_EVENTCHKINF(EVENTCHKINF_71)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE)) { phi_f0 = -50.0f; } else { phi_f0 = 0.0f; @@ -402,7 +404,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) { } if (this->unk_198 == 0x5A) { - if (!GET_EVENTCHKINF(EVENTCHKINF_71)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gKingDodongoTitleCardTex), 160, 180, 128, 40); } @@ -421,7 +423,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) { this->unk_1DA = 50; this->unk_1BC = 0; player->actor.shape.rot.y = -0x4002; - SET_EVENTCHKINF(EVENTCHKINF_71); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_KING_DODONGO_BATTLE); } break; } diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 8ea0553c3e..490b8986c8 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -12,7 +12,9 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum BossFdIntroFlyState { /* 0 */ INTRO_FLY_EMERGE, @@ -337,7 +339,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { this->timers[0] = 0; this->subCamVelFactor = 0.0f; this->subCamAccel = 0.0f; - if (GET_EVENTCHKINF(EVENTCHKINF_73)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE)) { this->introState = BFD_CS_EMERGE; this->subCamEyeNext.x = player2->actor.world.pos.x + 100.0f + 300.0f - 600.0f; this->subCamEyeNext.y = player2->actor.world.pos.y + 100.0f - 50.0f; @@ -459,7 +461,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { PRINTF("WAY_SPD X = %f\n", this->subCamAtVel.x); PRINTF("WAY_SPD Y = %f\n", this->subCamAtVel.y); PRINTF("WAY_SPD Z = %f\n", this->subCamAtVel.z); - if ((this->timers[3] > 190) && !GET_EVENTCHKINF(EVENTCHKINF_73)) { + if ((this->timers[3] > 190) && !GET_EVENTCHKINF(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE)) { Audio_PlaySfxGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } @@ -486,7 +488,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { if (this->timers[3] == 160) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_FIRE_BOSS); } - if ((this->timers[3] == 130) && !GET_EVENTCHKINF(EVENTCHKINF_73)) { + if ((this->timers[3] == 130) && !GET_EVENTCHKINF(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gVolvagiaTitleCardTex), 160, 180, 128, 40); } @@ -539,7 +541,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_7); this->actionFunc = BossFd_Wait; this->handoffSignal = FD2_SIGNAL_GROUND; - SET_EVENTCHKINF(EVENTCHKINF_73); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE); } break; } diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index d28e4e031d..9b9fd17c75 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -10,7 +10,9 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum BossFd2CutsceneState { /* 0 */ DEATH_START, diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 3266f61006..a4bc08270e 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -10,7 +10,9 @@ #include "assets/objects/object_ganon_anime2/object_ganon_anime2.h" #include "assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void BossGanon_Init(Actor* thisx, PlayState* play2); void BossGanon_Destroy(Actor* thisx, PlayState* play); @@ -578,7 +580,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE); this->csCamFov = 60.0f; - if (GET_EVENTCHKINF(EVENTCHKINF_78)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_GANONDORF_BATTLE)) { // watched cutscene already, skip most of it this->csState = 17; this->csTimer = 0; @@ -1096,12 +1098,12 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[Object_GetSlot(&play->objectCtx, OBJECT_GANON)].segment); - if (!GET_EVENTCHKINF(EVENTCHKINF_78)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_BEGAN_GANONDORF_BATTLE)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gGanondorfTitleCardTex), 160, 180, 128, 40); } - SET_EVENTCHKINF(EVENTCHKINF_78); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_GANONDORF_BATTLE); } if (this->csTimer >= 20) { diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 8255e36d0b..53efb2bad5 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -9,7 +9,9 @@ #include "assets/objects/object_geff/object_geff.h" #include "assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define BOSS_GANON2_EFFECT_COUNT 100 diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 4a8842ce8e..7473f8d2d8 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -12,7 +12,9 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum BossGanondrofDeathState { /* 0 */ NOT_DEAD, diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index de21070a97..a2d5a34db4 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -4,7 +4,9 @@ #include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) // IRIS_FOLLOW: gohma looks towards the player (iris rotation) // BONUS_IFRAMES: gain invincibility frames when the player does something (throwing things?), or @@ -682,7 +684,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) { // entrance of the boss room if (fabsf(player->actor.world.pos.x - 150.0f) < 60.0f && fabsf(player->actor.world.pos.z - 350.0f) < 60.0f) { - if (GET_EVENTCHKINF(EVENTCHKINF_70)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_GOHMA_BATTLE)) { BossGoma_SetupEncounterState4(this, play); Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_SHUTTER, 164.72f, -480.0f, 397.68002f, 0, -0x705C, 0, DOORSHUTTER_PARAMS(SHUTTER_GOHMA_BLOCK, 0)); @@ -920,13 +922,13 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) { if (Animation_OnFrame(&this->skelanime, 40.0f)) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_CRY1); - if (!GET_EVENTCHKINF(EVENTCHKINF_70)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_BEGAN_GOHMA_BATTLE)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gGohmaTitleCardTex), 160, 180, 128, 40); } SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_BOSS); - SET_EVENTCHKINF(EVENTCHKINF_70); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_GOHMA_BATTLE); } if (Animation_OnFrame(&this->skelanime, this->currentAnimFrameCount)) { diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index df146be4a2..3ad6c417b7 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -13,7 +13,9 @@ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "pal-1.0:128 pal-1.1:128" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define MO_WATER_LEVEL(play) play->colCtx.colHeader->waterBoxes[0].ySurface @@ -362,7 +364,7 @@ void BossMo_Init(Actor* thisx, PlayState* play2) { MO_WATER_LEVEL(play) = -500; return; } - if (GET_EVENTCHKINF(EVENTCHKINF_74)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_MORPHA_BATTLE)) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_BOSS); this->tentMaxAngle = 5.0f; this->timers[0] = 50; @@ -1432,7 +1434,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { if (this->timers[2] == 130) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gMorphaTitleCardTex), 160, 180, 128, 40); - SET_EVENTCHKINF(EVENTCHKINF_74); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_MORPHA_BATTLE); } break; case MO_INTRO_FINISH: diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 95d7609c70..ea77056756 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -14,8 +14,9 @@ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "pal-1.0:128 pal-1.1:128" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) #define vParity actionVar #define vVanish actionVar @@ -382,7 +383,7 @@ void BossSst_HeadSetupIntro(BossSst* this, PlayState* play) { Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT); Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_ACTIVE); Math_Vec3f_Copy(&sSubCamAt, &player->actor.world.pos); - if (GET_EVENTCHKINF(EVENTCHKINF_77)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE)) { sSubCamEye.z = ROOM_CENTER_Z - 100.0f; } @@ -418,7 +419,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) { Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_WAIT); Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_ACTIVE); Play_ClearCamera(play, sSubCamId); - SET_EVENTCHKINF(EVENTCHKINF_77); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE); BossSst_HeadSetupNeutral(this); this->colliderJntSph.base.ocFlags1 |= OC1_ON; sHands[LEFT]->colliderJntSph.base.ocFlags1 |= OC1_ON; @@ -441,7 +442,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) { this->ready = true; Rumble_Request(this->actor.xyzDistToPlayerSq, 255, 20, 150); Actor_PlaySfx(&sFloor->dyna.actor, NA_SE_EN_SHADEST_TAIKO_HIGH); - } else if (GET_EVENTCHKINF(EVENTCHKINF_77)) { + } else if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE)) { //! @bug This condition assumes that the second bounce on the ground will occur before frame 545 on the //! timer. However, it is possible to delay Player's descent to the ground by, for example, jumpslashing //! on the last possible frame before the cutscene takes control. This delays Player's fall to the @@ -574,7 +575,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) { } if (this->timer <= 198) { revealStateTimer = 198 - this->timer; - if (GET_EVENTCHKINF(EVENTCHKINF_77) && (revealStateTimer <= 44)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE) && (revealStateTimer <= 44)) { sSubCamAt.x += 492.0f * 0.01f; sSubCamAt.y += 200.0f * 0.01f; sSubCamEye.x -= 80.0f * 0.01f; @@ -603,7 +604,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) { sSubCamEye.y += 125.0f * 0.01f; sSubCamEye.z -= 350.0f * 0.01f; } else if (revealStateTimer == 85) { - if (!GET_EVENTCHKINF(EVENTCHKINF_77)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gBongoTitleCardTex), 160, 180, 128, 40); } diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 61cac2ec1d..110c3325e9 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -3,7 +3,9 @@ #include "assets/objects/object_tw/object_tw.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum TwEffType { /* 0 */ TWEFF_NONE, @@ -513,7 +515,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) { this->actor.naviEnemyId = NAVI_ENEMY_TWINROVA_KOTAKE; SkelAnime_InitFlex(play, &this->skelAnime, &gTwinrovaKotakeSkel, &gTwinrovaKotakeKoumeFlyAnim, NULL, NULL, 0); - if (GET_EVENTCHKINF(EVENTCHKINF_75)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) { // began twinrova battle BossTw_SetupFlyTo(this, play); this->actor.world.pos.x = -600.0f; @@ -531,7 +533,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) { this->actor.naviEnemyId = NAVI_ENEMY_TWINROVA_KOUME; SkelAnime_InitFlex(play, &this->skelAnime, &gTwinrovaKoumeSkel, &gTwinrovaKotakeKoumeFlyAnim, NULL, NULL, 0); - if (GET_EVENTCHKINF(EVENTCHKINF_75)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) { // began twinrova battle BossTw_SetupFlyTo(this, play); this->actor.world.pos.x = 600.0f; @@ -553,7 +555,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) { SkelAnime_InitFlex(play, &this->skelAnime, &gTwinrovaSkel, &gTwinrovaTPoseAnim, NULL, NULL, 0); Animation_MorphToLoop(&this->skelAnime, &gTwinrovaTPoseAnim, -3.0f); - if (GET_EVENTCHKINF(EVENTCHKINF_75)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) { // began twinrova battle BossTw_SetupWait(this, play); } else { @@ -2217,7 +2219,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) { play->envCtx.lightBlend = 0.0f; TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gTwinrovaTitleCardTex), 160, 180, 128, 40); - SET_EVENTCHKINF(EVENTCHKINF_75); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_TWINROVA_BATTLE); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_BOSS); } diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index cac3a21812..fa9448d126 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -12,7 +12,9 @@ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ntsc-1.2:128 pal-1.0:128 pal-1.1:128" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define GET_BODY(this) ((BossVa*)(this)->actor.parent) #define vaGorePulse offset.x @@ -640,7 +642,7 @@ void BossVa_Init(Actor* thisx, PlayState* play2) { } else { this->actor.colChkInfo.damageTable = sDamageTable; sPhase2Timer = 0xFFFF; - if (GET_EVENTCHKINF(EVENTCHKINF_76)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_BARINADE_BATTLE)) { sCsState = INTRO_CALL_BARI; sDoorState = 100; Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); @@ -975,7 +977,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) { sSubCamAtNext.y = 140.0f; sSubCamAtNext.z = -200.0f; - if (!GET_EVENTCHKINF(EVENTCHKINF_76)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_BEGAN_BARINADE_BATTLE)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gBarinadeTitleCardTex), 160, 180, 128, 40); } @@ -1017,7 +1019,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) { Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_ACTIVE); Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_7); sCsState++; - SET_EVENTCHKINF(EVENTCHKINF_76); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_BARINADE_BATTLE); player->actor.shape.rot.y = player->actor.world.rot.y = this->actor.yawTowardsPlayer + 0x8000; } break; diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 1887f64672..7657cf7432 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -11,7 +11,7 @@ #include "assets/objects/object_gnd_magic/object_gnd_magic.h" #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void Demo6K_Init(Actor* thisx, PlayState* play); void Demo6K_Destroy(Actor* thisx, PlayState* play); @@ -162,7 +162,7 @@ void Demo6K_Init(Actor* thisx, PlayState* play) { case 17: case 18: case 19: - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->drawFunc = func_8096865C; this->initActionFunc = func_80967410; this->flags |= 1; diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 4323de1380..a5e7139f07 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -4,7 +4,7 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef void (*DemoDuActionFunc)(DemoDu*, PlayState*); typedef void (*DemoDuDrawFunc)(Actor*, PlayState*); @@ -201,7 +201,7 @@ void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, PlayState* play) { Player* player = GET_PLAYER(play); this->updateIndex = CS_FIREMEDALLION_SUBSCENE(1); - play->csCtx.script = D_8096C1A4; + play->csCtx.script = gFireMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_FIRE); diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c index 37506612a3..06dbb35c11 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c @@ -2,11 +2,11 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_8096C1A4[] = { - CS_BEGIN_CUTSCENE(31, 3000), +static CutsceneData gFireMedallionCs[] = { + CS_HEADER(31, 3000), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(31, 5), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_6_0, 5), CS_ACTOR_CUE(0x0001, 0, 546, 0x0000, 0x0000, 0x0000, 0, 216, -10, 0, 216, -10, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 546, 547, 0x0000, 0x0000, 0x0000, 0, 216, -10, 0, 216, -10, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 547, 616, 0x0000, 0x0000, 0x0000, 0, 216, -10, 0, 216, -10, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -16,21 +16,21 @@ static CutsceneData D_8096C1A4[] = { CS_PLAYER_CUE(PLAYER_CUEID_13, 0, 280, 0x0000, 0x6AAA, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 280, 531, 0x0000, 0x6AAA, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_19, 531, 1716, 0x0000, 0xEAAA, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_ACTOR_CUE_LIST(41, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_2_2, 3), CS_ACTOR_CUE(0x0001, 0, 170, 0x0000, 0x0000, 0x0000, 98, 6, -169, 98, 6, -169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 170, 465, 0x0000, 0x0000, 0x0000, 98, 6, -169, 98, 6, -169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0003, 465, 2915, 0x0000, 0x0000, 0x0000, 98, 6, -169, 98, 6, -169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(49, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_7_0, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -16, -121, 0, -16, -121, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 530, 539), CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 540, 570), CS_LIGHT_SETTING_LIST(2), CS_LIGHT_SETTING(0x0000, 0, 10, 0x0000, 0x00000000, 0xFFFFFFDC, 0x00000000, 0x00000018, 0xFFFFFFDC, 0x00000000, 0x00000018, 0x00000000, 0x00000000, 0x00000000), CS_LIGHT_SETTING(0x0000, 10, 3000, 0x0000, 0x00000000, 0xFFFFFFDC, 0x00000000, 0x00000018, 0xFFFFFFDC, 0x00000000, 0x00000018, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(39, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_5, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, 0, -2, 0, 0, -2, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 805, 835), - CS_ACTOR_CUE_LIST(62, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 1), CS_ACTOR_CUE(0x0004, 0, 3000, 0x0000, 0x0000, 0x0000, 32, 80, -51, 32, 80, -51, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_DESTINATION(CS_DEST_DEATH_MOUNTAIN_CRATER_FROM_CHAMBER_OF_SAGES, 905, 1030), CS_START_SEQ_LIST(1), @@ -39,15 +39,15 @@ static CutsceneData D_8096C1A4[] = { CS_FADE_OUT_SEQ(CS_FADE_OUT_BGM_MAIN, 500, 550, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC3, 0x0000006E, 0x00000000, 0xFFFFFFC3, 0x0000006E), CS_TEXT_LIST(10), CS_TEXT_NONE(0, 310), - CS_TEXT(0x303C, 310, 323, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x303C, 310, 323, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(323, 344), - CS_TEXT(0x3045, 344, 394, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x3045, 344, 394, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(394, 415), - CS_TEXT(0x3046, 415, 465, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x3046, 415, 465, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(465, 800), - CS_TEXT(0x003C, 800, 805, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x003C, 800, 805, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(805, 865), - CS_TEXT(0x303D, 865, 875, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x303D, 865, 875, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_CAM_EYE_SPLINE(0, 1361), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4271999A, 60.4f), -85, 3211, 795, 0x00C6), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4271999A, 60.4f), -85, 3211, 795, 0x00C8), @@ -182,6 +182,6 @@ static CutsceneData D_8096C1A4[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x013D), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x013F), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x002E), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 0d6ba9ed5d..3f19529df0 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -37,7 +37,7 @@ #include "assets/objects/object_bba/object_bba.h" #include "assets/objects/object_ane/object_ane.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoEc_Init(Actor* thisx, PlayState* play); void DemoEc_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 2a3e8c4531..9ed730455f 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -11,7 +11,7 @@ #include "assets/objects/object_efc_tw/object_efc_tw.h" #include "assets/objects/object_gi_jewel/object_gi_jewel.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoEffect_Init(Actor* thisx, PlayState* play2); void DemoEffect_Destroy(Actor* thisx, PlayState* play); @@ -1541,8 +1541,8 @@ void DemoEffect_UpdateJewelChild(DemoEffect* this, PlayState* play) { if (play->csCtx.state && play->csCtx.actorCues[this->cueChannel]) { switch (play->csCtx.actorCues[this->cueChannel]->id) { case 3: - if (GET_EVENTCHKINF(EVENTCHKINF_4B)) { - SET_EVENTCHKINF(EVENTCHKINF_4B); + if (GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { + SET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME); } DemoEffect_MoveJewelActivateDoorOfTime(this, play); if ((play->gameplayFrames & 1) == 0) { @@ -1575,7 +1575,7 @@ void DemoEffect_UpdateJewelChild(DemoEffect* this, PlayState* play) { } if (gSaveContext.save.entranceIndex == ENTR_TEMPLE_OF_TIME_0) { - if (!GET_EVENTCHKINF(EVENTCHKINF_4B)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { hasCue = (play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.actorCues[this->cueChannel] != NULL); if (!hasCue) { diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 94bda4604b..caae4cff14 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -8,7 +8,7 @@ #include "terminal.h" #include "assets/objects/object_fhg/object_fhg.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum DemoExtAction { /* 0x00 */ EXT_WAIT, diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index a7087e8975..f0b240070d 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -8,7 +8,7 @@ #include "assets/objects/object_geff/object_geff.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoGeff_Init(Actor* thisx, PlayState* play); void DemoGeff_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index d69f207b59..ae85f3ce89 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -8,7 +8,7 @@ #include "assets/objects/object_gj/object_gj.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoGj_Init(Actor* thisx, PlayState* play); void DemoGj_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 2a6ac15c52..01c173dcc4 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -8,7 +8,7 @@ #include "assets/objects/object_oF1d_map/object_oF1d_map.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoGo_Init(Actor* thisx, PlayState* play); void DemoGo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index c81aa63e65..977a0b9135 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -7,7 +7,7 @@ #include "terminal.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoGt_Init(Actor* thisx, PlayState* play); void DemoGt_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 88cdaa7203..82db3d7fa6 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -2,7 +2,7 @@ #include "terminal.h" #include "assets/objects/object_ik/object_ik.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoIk_Init(Actor* thisx, PlayState* play); void DemoIk_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index ac9afd8d84..7e359f6625 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -11,7 +11,7 @@ #include "assets/objects/object_im/object_im.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void DemoIm_Init(Actor* thisx, PlayState* play); void DemoIm_Destroy(Actor* thisx, PlayState* play); @@ -333,7 +333,7 @@ void func_8098544C(DemoIm* this, PlayState* play) { Player* player = GET_PLAYER(play); this->action = 1; - play->csCtx.script = D_8098786C; + play->csCtx.script = gShadowMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_SHADOW); player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000; @@ -841,7 +841,7 @@ s32 func_809869F8(DemoIm* this, PlayState* play) { f32 playerPosX = player->actor.world.pos.x; f32 thisPosX = this->actor.world.pos.x; - if ((thisPosX - (kREG(16) + 30.0f) > playerPosX) && !(this->actor.flags & ACTOR_FLAG_6)) { + if ((thisPosX - (kREG(16) + 30.0f) > playerPosX) && !(this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { return true; } else { return false; diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c index 46b08bc125..f56097680c 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c @@ -2,11 +2,11 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_8098786C[] = { - CS_BEGIN_CUTSCENE(32, 3000), +static CutsceneData gShadowMedallionCs[] = { + CS_HEADER(32, 3000), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(31, 5), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_6_0, 5), CS_ACTOR_CUE(0x0001, 0, 697, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 697, 698, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 698, 768, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -16,11 +16,11 @@ static CutsceneData D_8098786C[] = { CS_PLAYER_CUE(PLAYER_CUEID_13, 0, 300, 0x0000, 0x0000, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 300, 661, 0x0000, 0xEAAA, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_PLAYER_CUE(PLAYER_CUEID_19, 661, 1934, 0x0000, 0x6AAA, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(44, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_5_0, 3), CS_ACTOR_CUE(0x0001, 0, 145, 0x0000, 0x0000, 0x0000, -97, 6, 169, -97, 6, 169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 145, 615, 0x0000, 0x0000, 0x0000, -97, 6, 169, -97, 6, 169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0003, 615, 1906, 0x0000, 0x0000, 0x0000, -97, 6, 169, -97, 6, 169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(49, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_7_0, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, -22, 0, -55, -22, 0, -55, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_LIGHT_SETTING_LIST(2), CS_LIGHT_SETTING(0x0001, 0, 10, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x0000000D, 0xFFFFFFFE, 0x00000000, 0x0000000D, 0x00000000, 0x00000000, 0x00000000), @@ -28,26 +28,26 @@ static CutsceneData D_8098786C[] = { CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 694, 724), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 960, 990), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 683, 692), - CS_ACTOR_CUE_LIST(62, 2), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 2), CS_ACTOR_CUE(0x0001, 0, 10, 0x0000, 0x0000, 0x0000, 64, 80, 130, 64, 80, 130, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 10, 3000, 0x0000, 0x0000, 0x0000, 64, 80, 130, 64, 80, 130, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_MEDALLION_GET, 770, 771, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC9, 0x0000005C, 0x00000000, 0xFFFFFFC9, 0x0000005C), CS_TEXT_LIST(14), CS_TEXT_NONE(0, 340), - CS_TEXT(0x5022, 340, 353, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x5022, 340, 353, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(353, 374), - CS_TEXT(0x5025, 374, 404, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x5025, 374, 404, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(404, 424), - CS_TEXT(0x502B, 424, 474, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x502B, 424, 474, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(474, 494), - CS_TEXT(0x502C, 494, 543, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x502C, 494, 543, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(543, 564), - CS_TEXT(0x5026, 564, 613, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x5026, 564, 613, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(613, 955), - CS_TEXT(0x0041, 955, 959, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x0041, 955, 959, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(959, 1020), - CS_TEXT(0x5023, 1020, 1029, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x5023, 1020, 1029, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_DESTINATION(CS_DEST_GRAVEYARD_FROM_CHAMBER_OF_SAGES, 1060, 1061), CS_FADE_OUT_SEQ_LIST(1), CS_FADE_OUT_SEQ(CS_FADE_OUT_BGM_MAIN, 673, 723, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC1, 0x00000058, 0x00000000, 0xFFFFFFC1, 0x00000058), @@ -217,6 +217,6 @@ static CutsceneData D_8098786C[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0xFFFF), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x0000), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0xE6A0), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index caea0b981f..a1253dbae6 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -7,9 +7,9 @@ #include "assets/objects/object_toki_objects/object_toki_objects.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.2:128" + "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoKankyo_Init(Actor* thisx, PlayState* play); void DemoKankyo_Destroy(Actor* thisx, PlayState* play); @@ -237,7 +237,7 @@ void DemoKankyo_Init(Actor* thisx, PlayState* play) { case DEMOKANKYO_DOOR_OF_TIME: this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; this->unk_150[0].unk_18 = 0.0f; - if (!GET_EVENTCHKINF(EVENTCHKINF_4B)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_TOKI, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0x0000); } else { @@ -424,7 +424,7 @@ void DemoKankyo_UpdateDoorOfTime(DemoKankyo* this, PlayState* play) { this->unk_150[0].unk_18 += 1.0f; if (this->unk_150[0].unk_18 >= 102.0f) { Actor_PlaySfx(&this->actor, NA_SE_EV_STONEDOOR_STOP); - SET_EVENTCHKINF(EVENTCHKINF_4B); + SET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME); Actor_Kill(this->actor.child); DemoKankyo_SetupAction(this, DemoKankyo_KillDoorOfTimeCollision); } diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c index f46747a1ac..3a0a95a907 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c @@ -3,7 +3,7 @@ // clang-format off CutsceneData gAdultWarpInCS[] = { - CS_BEGIN_CUTSCENE(2, 164), + CS_HEADER(2, 164), CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 135), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 79, 59, 0x010F), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 78, 60, 0x0120), @@ -20,6 +20,6 @@ CutsceneData gAdultWarpInCS[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 101, 21, 0x01F6), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 101, 21, 0x0207), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 101, 21, 0x0000), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c index b98b849922..2a6e3f3e5d 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c @@ -3,7 +3,7 @@ // clang-format off CutsceneData gAdultWarpOutCS[] = { - CS_BEGIN_CUTSCENE(5, 1167), + CS_HEADER(5, 1167), CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1138), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0x20BA), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0xA1BC), @@ -26,6 +26,6 @@ CutsceneData gAdultWarpOutCS[] = { CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 30, 35), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 95, 97, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x00000000), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c index 512eb4749a..e742384ec2 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c @@ -3,7 +3,7 @@ // clang-format off CutsceneData gAdultWarpInToTCS[] = { - CS_BEGIN_CUTSCENE(2, 118), + CS_HEADER(2, 118), CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 89), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428EA647, 71.32476f), 53, 53, 40, 0x010F), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 53, 53, 40, 0x0120), @@ -20,6 +20,6 @@ CutsceneData gAdultWarpInToTCS[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 71, 25, 0x01F6), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 71, 25, 0x0207), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 71, 25, 0x0047), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c index ac79db6258..53f2b5133a 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c @@ -3,7 +3,7 @@ // clang-format off CutsceneData gAdultWarpOutToTCS[] = { - CS_BEGIN_CUTSCENE(5, 1120), + CS_HEADER(5, 1120), CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 36, 46), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 30, 35), CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1091), @@ -20,6 +20,6 @@ CutsceneData gAdultWarpOutToTCS[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 24, 66, 29, 0x29D0), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0x00000000, 0x00000000), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c index c0af714eba..e1092b34dd 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c @@ -3,7 +3,7 @@ // clang-format off CutsceneData gChildWarpInCS[] = { - CS_BEGIN_CUTSCENE(2, 1164), + CS_HEADER(2, 1164), CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1135), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 68, 59, 0x010F), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 32, 68, 60, 0x0120), @@ -22,6 +22,6 @@ CutsceneData gChildWarpInCS[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x42714CA7, 60.324856f), 57, 86, 21, 0x0207), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 86, 21, 0xB46C), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 86, 21, 0x05BC), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c index 17db7679a1..9e8a7c6bc6 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c @@ -3,7 +3,7 @@ // clang-format off CutsceneData gChildWarpOutCS[] = { - CS_BEGIN_CUTSCENE(5, 1167), + CS_HEADER(5, 1167), CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 36, 46), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 30, 35), CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1138), @@ -26,6 +26,6 @@ CutsceneData gChildWarpOutCS[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA9, 60.324863f), 15, 42, 30, 0xEEC0), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c index f5ce4770a2..3a718366c3 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c @@ -3,7 +3,7 @@ // clang-format off CutsceneData gChildWarpInToTCS[] = { - CS_BEGIN_CUTSCENE(2, 1118), + CS_HEADER(2, 1118), CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1089), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428EA647, 71.32476f), 53, 53, 40, 0x010F), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 53, 53, 40, 0x0120), @@ -22,6 +22,6 @@ CutsceneData gChildWarpInToTCS[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x428D3328, 70.599915f), 29, 58, 25, 0x0207), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 58, 25, 0x0000), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 58, 25, 0x0000), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c index e61672a66a..84e12ec7a8 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c @@ -3,7 +3,7 @@ // clang-format off CutsceneData gChildWarpOutToTCS[] = { - CS_BEGIN_CUTSCENE(5, 1120), + CS_HEADER(5, 1120), CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 36, 46), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 30, 35), CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1091), @@ -20,6 +20,6 @@ CutsceneData gChildWarpOutToTCS[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CAA, 60.324867f), 24, 52, 29, 0x20DC), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0x00000000, 0x00000000), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 21f7a4c763..8c6ded1651 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -8,7 +8,7 @@ #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #include "assets/scenes/dungeons/ganontika/ganontika_scene.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoKekkai_Init(Actor* thisx, PlayState* play); void DemoKekkai_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 63ab50cee7..36e521701b 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -11,7 +11,7 @@ #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoSa_Init(Actor* thisx, PlayState* play); void DemoSa_Destroy(Actor* thisx, PlayState* play); @@ -261,7 +261,7 @@ void func_8098E960(DemoSa* this, PlayState* play) { if ((gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) && !IS_CUTSCENE_LAYER) { player = GET_PLAYER(play); this->action = 1; - play->csCtx.script = D_8099010C; + play->csCtx.script = gForestMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_FOREST); player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c index 4f0e530ac3..67edd6cb9f 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c @@ -2,11 +2,11 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_8099010C[] = { - CS_BEGIN_CUTSCENE(29, 3001), +static CutsceneData gForestMedallionCs[] = { + CS_HEADER(29, 3001), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(31, 5), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_6_0, 5), CS_ACTOR_CUE(0x0001, 0, 612, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 612, 613, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 613, 684, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -16,29 +16,29 @@ static CutsceneData D_8099010C[] = { CS_PLAYER_CUE(PLAYER_CUEID_13, 0, 261, 0x0000, 0x0000, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 261, 600, 0x0000, 0x9555, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_PLAYER_CUE(PLAYER_CUEID_19, 600, 1243, 0x0000, 0x1555, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(43, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_4_2, 3), CS_ACTOR_CUE(0x0001, 0, 165, 0x0000, 0x0000, 0x0000, -98, 6, -169, -98, 6, -169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 165, 466, 0x0000, 0x0000, 0x0000, -98, 6, -169, -98, 6, -169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0003, 466, 3001, 0x0000, 0x0000, 0x0000, -98, 6, -169, -98, 6, -169, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 590, 607), CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 617, 647), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 875, 905), - CS_ACTOR_CUE_LIST(49, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_7_0, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, -98, 0, 98, -98, 0, 98, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(62, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 1), CS_ACTOR_CUE(0x0004, 0, 3000, 0x0000, 0x0000, 0x0000, -35, 97, -60, -35, 97, -60, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_DESTINATION(CS_DEST_KOKIRI_FOREST_FROM_CHAMBER_OF_SAGES, 974, 1050), CS_TEXT_LIST(10), CS_TEXT_NONE(0, 303), - CS_TEXT(0x106A, 303, 323, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x106A, 303, 323, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(323, 344), - CS_TEXT(0x108F, 344, 394, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x108F, 344, 394, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(394, 415), - CS_TEXT(0x1090, 415, 465, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x1090, 415, 465, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(465, 871), - CS_TEXT(0x003E, 871, 875, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x003E, 871, 875, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(875, 936), - CS_TEXT(0x106B, 936, 946, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x106B, 936, 946, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_MEDALLION_GET, 686, 687, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0xFFFFFFC5, 0x00000057), CS_FADE_OUT_SEQ_LIST(1), @@ -179,6 +179,6 @@ static CutsceneData D_8099010C[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x006F), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x006D), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x0065), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 2b373bec30..d5cb025e46 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -6,7 +6,7 @@ #include "z_demo_shd.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoShd_Init(Actor* thisx, PlayState* play); void DemoShd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index d71810b23d..67adb46e78 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -2,7 +2,7 @@ #include "overlays/actors/ovl_En_Box/z_en_box.h" #include "assets/objects/object_box/object_box.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoTreLgt_Init(Actor* thisx, PlayState* play); void DemoTreLgt_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index b2b735c3ad..40f4878831 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -72,7 +72,7 @@ void DoorAna_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); } else { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } Actor_SetScale(&this->actor, 0); DoorAna_SetupAction(this, DoorAna_WaitClosed); @@ -99,7 +99,7 @@ void DoorAna_WaitClosed(DoorAna* this, PlayState* play) { // opening with song of storms if (this->actor.xyzDistToPlayerSq < SQ(200.0f) && CutsceneFlags_Get(play, 5)) { openGrotto = true; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } else { // bombing/hammering open a grotto @@ -131,7 +131,8 @@ void DoorAna_WaitOpen(DoorAna* this, PlayState* play) { if ((this->actor.attentionRangeType != 0) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (player->stateFlags1 & PLAYER_STATE1_31) && (player->av1.actionVar1 == 0)) { destinationIdx = PARAMS_GET_U(this->actor.params, 12, 3) - 1; - Play_SetupRespawnPoint(play, RESPAWN_MODE_RETURN, 0x4FF); + Play_SetupRespawnPoint(play, RESPAWN_MODE_RETURN, + PLAYER_PARAMS(PLAYER_START_MODE_GROTTO, PLAYER_START_BG_CAM_DEFAULT)); gSaveContext.respawn[RESPAWN_MODE_RETURN].pos.y = this->actor.world.pos.y; gSaveContext.respawn[RESPAWN_MODE_RETURN].yaw = this->actor.home.rot.y; gSaveContext.respawn[RESPAWN_MODE_RETURN].data = PARAMS_GET_U(this->actor.params, 0, 16); diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 01e2762657..0f2d3163ec 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -11,7 +11,7 @@ #include "assets/objects/object_haka_door/object_haka_door.h" #include "assets/objects/object_door_killer/object_door_killer.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum DoorKillerBehaviour { /* 0 */ DOOR_KILLER_DOOR, diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 1cfb4255d3..0bb5e1074a 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -26,7 +26,7 @@ #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #include "assets/objects/object_ouke_haka/object_ouke_haka.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DoorShutter_Init(Actor* thisx, PlayState* play2); void DoorShutter_Destroy(Actor* thisx, PlayState* play); @@ -273,9 +273,9 @@ static s8 sTypeStyles[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; typedef struct DoorShutterSceneInfo { @@ -457,7 +457,7 @@ void DoorShutter_Init(Actor* thisx, PlayState* play2) { } else if (styleType == DOORSHUTTER_STYLE_JABU_JABU) { Actor_SetScale(&this->dyna.actor, 0.1f); this->jabuDoorClosedAmount = 100; - this->dyna.actor.uncullZoneScale = 200.0f; + this->dyna.actor.cullingVolumeScale = 200.0f; Actor_SetFocus(&this->dyna.actor, 0.0f); } else { Actor_SetFocus(&this->dyna.actor, 60.0f); @@ -821,7 +821,8 @@ void DoorShutter_SetupClosed(DoorShutter* this, PlayState* play) { play->roomCtx.activeBufPage ^= 1; } Room_FinishRoomChange(play, &play->roomCtx); - Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, 0x0EFF); + Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, + PLAYER_PARAMS(PLAYER_START_MODE_MOVE_FORWARD_SLOW, PLAYER_START_BG_CAM_DEFAULT)); } this->isActive = false; this->dyna.actor.velocity.y = 0.0f; @@ -878,7 +879,7 @@ void DoorShutter_GohmaBlockFall(DoorShutter* this, PlayState* play) { Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2); if (this->dyna.actor.bgCheckFlags & BGCHECKFLAG_GROUND) { DoorShutter_SetupAction(this, DoorShutter_GohmaBlockBounce); - if (!GET_EVENTCHKINF(EVENTCHKINF_70)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_BEGAN_GOHMA_BATTLE)) { BossGoma* parent = (BossGoma*)this->dyna.actor.parent; this->isActive = 10; diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index e2e6ada56b..bf423a09b5 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -49,7 +49,7 @@ void DoorToki_Destroy(Actor* thisx, PlayState* play) { void DoorToki_Update(Actor* thisx, PlayState* play) { DoorToki* this = (DoorToki*)thisx; - if (GET_EVENTCHKINF(EVENTCHKINF_4B)) { + if (GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); } else { DynaPoly_EnableCollision(play, &play->colCtx.dyna, this->dyna.bgId); diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index b5ff0dbaaf..23ff72a00e 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -46,9 +46,9 @@ ActorProfile Door_Warp1_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 4000, ICHAIN_STOP), }; static s16 sWarpTimerTarget; diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 3aa35ec587..ae7c4a807a 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -1,7 +1,7 @@ #include "z_efc_erupc.h" #include "assets/objects/object_efc_erupc/object_efc_erupc.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EfcErupc_Init(Actor* thisx, PlayState* play); void EfcErupc_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 907f6d096d..f23a974a32 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -7,7 +7,7 @@ #include "z_eff_dust.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EffDust_Init(Actor* thisx, PlayState* play); void EffDust_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index f0b2937df3..a4ebdfb131 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -9,7 +9,7 @@ #include "terminal.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ElfMsg_Init(Actor* thisx, PlayState* play); void ElfMsg_Destroy(Actor* thisx, PlayState* play); @@ -39,7 +39,7 @@ ActorProfile Elf_Msg_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 769578d004..0f0edc34e5 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -7,7 +7,7 @@ #include "z_elf_msg2.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ElfMsg2_Init(Actor* thisx, PlayState* play); void ElfMsg2_Destroy(Actor* thisx, PlayState* play); @@ -38,7 +38,7 @@ ActorProfile Elf_Msg2_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 9b552cc5ac..6f793ba1a3 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -8,7 +8,9 @@ #include "assets/objects/object_am/object_am.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_CAN_PRESS_SWITCHES) void EnAm_Init(Actor* thisx, PlayState* play); void EnAm_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 6b493aa874..242afc095f 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -64,7 +64,7 @@ void EnAni_SetupAction(EnAni* this, EnAniActionFunc actionFunc) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 850, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 850, ICHAIN_STOP), }; void EnAni_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index f6742f9810..5773eb17ba 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -10,7 +10,7 @@ #include "overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnAnubice_Init(Actor* thisx, PlayState* play); void EnAnubice_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 1b2a1e0185..9e408a3350 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_anubice/object_anubice.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnAnubiceFire_Init(Actor* thisx, PlayState* play); void EnAnubiceFire_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 870ac86b15..d7a32e6b7b 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -7,7 +7,7 @@ #include "z_en_anubice_tag.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnAnubiceTag_Init(Actor* thisx, PlayState* play); void EnAnubiceTag_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c index 60b2121000..d44d380430 100644 --- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c @@ -6,7 +6,7 @@ #include "z_en_arow_trap.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnArowTrap_Init(Actor* thisx, PlayState* play); void EnArowTrap_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 3cec8313e6..669e5ed1fb 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -8,7 +8,7 @@ #include "global.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnArrow_Init(Actor* thisx, PlayState* play); void EnArrow_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index d1b915ee45..d215d02cf3 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -9,7 +9,7 @@ #include "assets/objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnAttackNiw_Init(Actor* thisx, PlayState* play); void EnAttackNiw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 9662ec26ac..098980836e 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -7,7 +7,7 @@ #include "z_en_ba.h" #include "assets/objects/object_bxa/object_bxa.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBa_Init(Actor* thisx, PlayState* play); void EnBa_Destroy(Actor* thisx, PlayState* play); @@ -83,8 +83,8 @@ static Vec3f D_809B80E4 = { 0.01f, 0.01f, 0.01f }; static InitChainEntry sInitChain[] = { ICHAIN_S8(naviEnemyId, NAVI_ENEMY_PARASITIC_TENTACLE, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2500, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 0, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 3b26ad61d2..26af25354a 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -8,7 +8,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_Bb/object_Bb.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) #define vBombHopPhase actionVar1 #define vTrailIdx actionVar1 diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index b16cd52dbd..930eff2854 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -7,7 +7,7 @@ #include "z_en_bdfire.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBdfire_Init(Actor* thisx, PlayState* play); void EnBdfire_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 559305e71d..1bb808abaf 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -1,7 +1,9 @@ #include "z_en_bigokuta.h" #include "assets/objects/object_bigokuta/object_bigokuta.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBigokuta_Init(Actor* thisx, PlayState* play); void EnBigokuta_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 73a8addd8f..8e9eba0c60 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -221,7 +221,7 @@ void EnBili_SetupBurnt(EnBili* this) { this->timer = 20; this->collider.base.atFlags &= ~AT_ON; this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.speed = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 200, COLORFILTER_BUFFLAG_XLU, 20); this->actionFunc = EnBili_Burnt; @@ -594,7 +594,7 @@ void EnBili_UpdateDamage(EnBili* this, PlayState* play) { } if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_ARROW) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } } diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index a42e48252a..2e1141ffea 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -7,7 +7,7 @@ #include "z_en_blkobj.h" #include "assets/objects/object_blkobj/object_blkobj.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBlkobj_Init(Actor* thisx, PlayState* play); void EnBlkobj_Destroy(Actor* thisx, PlayState* play); @@ -33,9 +33,9 @@ ActorProfile En_Blkobj_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; static Gfx sSetupOpaDL[] = { @@ -87,7 +87,7 @@ void EnBlkobj_Wait(EnBlkobj* this, PlayState* play) { } void EnBlkobj_SpawnDarkLink(EnBlkobj* this, PlayState* play) { - if (!(this->dyna.actor.flags & ACTOR_FLAG_6)) { + if (!(this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_TORCH2, this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, this->dyna.actor.yawTowardsPlayer, 0, 0); EnBlkobj_SetupAction(this, EnBlkobj_DarkLinkFight); diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 120bbaa1b2..a542cbfcb0 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -8,7 +8,7 @@ #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBom_Init(Actor* thisx, PlayState* play); void EnBom_Destroy(Actor* thisx, PlayState* play); @@ -170,7 +170,7 @@ void EnBom_Explode(EnBom* this, PlayState* play) { Player* player; if (this->explosionCollider.elements[0].dim.modelSphere.radius == 0) { - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); } @@ -323,7 +323,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) { Camera_RequestQuake(&play->mainCamera, 2, 11, 8); thisx->params = BOMB_EXPLOSION; this->timer = 10; - thisx->flags |= ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; EnBom_SetupAction(this, EnBom_Explode); } } diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index bf2f41c6c1..4df7b35ce3 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -4,8 +4,9 @@ #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" #include "assets/objects/object_bg/object_bg.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) typedef enum BombchuGirlEyeMode { /* 0 */ CHU_GIRL_EYES_ASLEEP, diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index 3e8ff39453..17657586c9 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -3,7 +3,7 @@ #include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnBomBowlPit_Init(Actor* thisx, PlayState* play); void EnBomBowlPit_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index f5deec7285..9f4263d8cd 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -2,7 +2,7 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define BOMBCHU_SCALE 0.01f diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 87ed4120d4..34dd30010e 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -8,7 +8,7 @@ #include "assets/objects/object_bombf/object_bombf.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBombf_Init(Actor* thisx, PlayState* play); void EnBombf_Destroy(Actor* thisx, PlayState* play); @@ -104,7 +104,7 @@ void EnBombf_Init(Actor* thisx, PlayState* play) { thisx->focus.pos = thisx->world.pos; if (Actor_FindNearby(play, thisx, ACTOR_BG_DDAN_KD, ACTORCAT_BG, 10000.0f) != NULL) { - thisx->flags |= ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; } thisx->colChkInfo.cylRadius = 10.0f; @@ -126,8 +126,8 @@ void EnBombf_Init(Actor* thisx, PlayState* play) { EnBombf_SetupGrowBomb(this, thisx->params); } - thisx->uncullZoneScale += 31000.0f; - thisx->uncullZoneForward += 31000.0f; + thisx->cullingVolumeScale += 31000.0f; + thisx->cullingVolumeDistance += 31000.0f; } void EnBombf_Destroy(Actor* thisx, PlayState* play) { @@ -260,7 +260,7 @@ void EnBombf_Explode(EnBombf* this, PlayState* play) { Player* player; if (this->explosionCollider.elements[0].dim.modelSphere.radius == 0) { - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); } @@ -431,7 +431,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { Camera_RequestQuake(&play->mainCamera, 2, 11, 8); thisx->params = BOMBFLOWER_EXPLOSION; this->timer = 10; - thisx->flags |= ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; EnBombf_SetupAction(this, EnBombf_Explode); } } diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 932e84f68a..982df71a03 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -8,7 +8,7 @@ #include "global.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBoom_Init(Actor* thisx, PlayState* play); void EnBoom_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 9468fae6bb..2d7c748b47 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -135,7 +135,7 @@ void EnBox_Init(Actor* thisx, PlayState* play2) { EnBox_SetupAction(this, EnBox_FallOnSwitchFlag); this->alpha = 0; this->movementFlags |= ENBOX_MOVE_IMMOBILE; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if ((this->type == ENBOX_TYPE_ROOM_CLEAR_BIG || this->type == ENBOX_TYPE_ROOM_CLEAR_SMALL) && !Flags_GetClear(play, this->dyna.actor.room)) { EnBox_SetupAction(this, EnBox_AppearOnRoomClear); @@ -143,7 +143,7 @@ void EnBox_Init(Actor* thisx, PlayState* play2) { this->movementFlags |= ENBOX_MOVE_IMMOBILE; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 50.0f; this->alpha = 0; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if (this->type == ENBOX_TYPE_9 || this->type == ENBOX_TYPE_10) { EnBox_SetupAction(this, func_809C9700); this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; @@ -151,14 +151,14 @@ void EnBox_Init(Actor* thisx, PlayState* play2) { this->movementFlags |= ENBOX_MOVE_IMMOBILE; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 50.0f; this->alpha = 0; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if (this->type == ENBOX_TYPE_SWITCH_FLAG_BIG && !Flags_GetSwitch(play, this->switchFlag)) { EnBox_SetupAction(this, EnBox_AppearOnSwitchFlag); DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->movementFlags |= ENBOX_MOVE_IMMOBILE; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 50.0f; this->alpha = 0; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else { if (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6) { this->dyna.actor.flags |= ACTOR_FLAG_REACT_TO_LENS; diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 4a93d3f8dd..b3deb35f9e 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -139,9 +139,9 @@ void EnButte_DrawTransformationEffect(EnButte* this, PlayState* play) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 20, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 20, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 600, ICHAIN_STOP), }; void EnButte_Init(Actor* thisx, PlayState* play) { @@ -154,7 +154,7 @@ void EnButte_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (PARAMS_GET_U(this->actor.params, 0, 1) == 1) { - this->actor.uncullZoneScale = 200.0f; + this->actor.cullingVolumeScale = 200.0f; } SkelAnime_Init(play, &this->skelAnime, &gButterflySkel, &gButterflyAnim, this->jointTable, this->morphTable, 8); @@ -347,7 +347,7 @@ void EnButte_FollowLink(EnButte* this, PlayState* play) { void EnButte_SetupTransformIntoFairy(EnButte* this) { this->timer = 9; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->skelAnime.playSpeed = 1.0f; EnButte_ResetTransformationEffect(); this->actionFunc = EnButte_TransformIntoFairy; diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 4c5c38e36a..6ab5fd6fcf 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_bw/object_bw.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBw_Init(Actor* thisx, PlayState* play); void EnBw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 91b701d0d7..efc4d4f5cf 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -7,7 +7,7 @@ #include "z_en_bx.h" #include "assets/objects/object_bxa/object_bxa.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnBx_Init(Actor* thisx, PlayState* play); void EnBx_Destroy(Actor* thisx, PlayState* play); @@ -98,7 +98,7 @@ void EnBx_Init(Actor* thisx, PlayState* play) { Collider_SetQuad(play, &this->colliderQuad, &this->actor, &sQuadInit); thisx->colChkInfo.mass = MASS_IMMOVABLE; this->unk_14C = 0; - thisx->uncullZoneDownward = 2000.0f; + thisx->cullingVolumeDownward = 2000.0f; if (Flags_GetSwitch(play, PARAMS_GET_U(thisx->params, 8, 8))) { Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index e83dbc2dc8..c6cf2c7ad3 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -1,6 +1,8 @@ #include "z_en_clear_tag.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnClearTag_Init(Actor* thisx, PlayState* play); void EnClearTag_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index c8319a7e79..a2533df3d5 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -98,7 +98,7 @@ static DamageTable sDamageTable = { static u32 sDeathCount = 0; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 3000, ICHAIN_CONTINUE), ICHAIN_S8(naviEnemyId, NAVI_ENEMY_GUAY, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -200, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 2000, ICHAIN_STOP), @@ -181,7 +181,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { } this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnCrow_Damaged; } @@ -402,7 +402,7 @@ void EnCrow_Respawn(EnCrow* this, PlayState* play) { } if (Math_StepToF(&this->actor.scale.x, target, target * 0.1f)) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.colChkInfo.health = 1; EnCrow_SetupFlyIdle(this); } diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 0f84c7784a..64b3cc1088 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -2,7 +2,9 @@ #include "overlays/actors/ovl_En_GeldB/z_en_geldb.h" #include "assets/objects/object_daiku/object_daiku.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) + +#define ENDAIKU_GET_TYPE(thisx) PARAMS_GET_U((thisx)->params, 0, 2) typedef struct EnDaikuEscapeSubCamParam { Vec3f eyePosDeltaLocal; @@ -150,21 +152,21 @@ void EnDaiku_Init(Actor* thisx, PlayState* play) { EnDaiku* this = (EnDaiku*)thisx; s32 pad; s32 noKill = true; - s32 isFree = false; - - if (PARAMS_GET_U(this->actor.params, 0, 2) == 0 && GET_EVENTCHKINF(EVENTCHKINF_CARPENTERS_FREE(0))) { - isFree = true; - } else if (PARAMS_GET_U(this->actor.params, 0, 2) == 1 && GET_EVENTCHKINF(EVENTCHKINF_CARPENTERS_FREE(1))) { - isFree = true; - } else if (PARAMS_GET_U(this->actor.params, 0, 2) == 2 && GET_EVENTCHKINF(EVENTCHKINF_CARPENTERS_FREE(2))) { - isFree = true; - } else if (PARAMS_GET_U(this->actor.params, 0, 2) == 3 && GET_EVENTCHKINF(EVENTCHKINF_CARPENTERS_FREE(3))) { - isFree = true; + s32 isRescued = false; + + if (ENDAIKU_GET_TYPE(&this->actor) == ENDAIKU_TYPE0 && GET_EVENTCHKINF(EVENTCHKINF_CARPENTER_0_RESCUED)) { + isRescued = true; + } else if (ENDAIKU_GET_TYPE(&this->actor) == ENDAIKU_TYPE1 && GET_EVENTCHKINF(EVENTCHKINF_CARPENTER_1_RESCUED)) { + isRescued = true; + } else if (ENDAIKU_GET_TYPE(&this->actor) == ENDAIKU_TYPE2 && GET_EVENTCHKINF(EVENTCHKINF_CARPENTER_2_RESCUED)) { + isRescued = true; + } else if (ENDAIKU_GET_TYPE(&this->actor) == ENDAIKU_TYPE3 && GET_EVENTCHKINF(EVENTCHKINF_CARPENTER_3_RESCUED)) { + isRescued = true; } - if (isFree == true && play->sceneId == SCENE_THIEVES_HIDEOUT) { + if (isRescued == true && play->sceneId == SCENE_THIEVES_HIDEOUT) { noKill = false; - } else if (!isFree && play->sceneId == SCENE_CARPENTERS_TENT) { + } else if (!isRescued && play->sceneId == SCENE_CARPENTERS_TENT) { noKill = false; } @@ -200,7 +202,7 @@ void EnDaiku_Init(Actor* thisx, PlayState* play) { this->stateFlags |= ENDAIKU_STATEFLAG_1 | ENDAIKU_STATEFLAG_2; this->actionFunc = EnDaiku_Jailed; } else { - if (PARAMS_GET_U(this->actor.params, 0, 2) == 1 || PARAMS_GET_U(this->actor.params, 0, 2) == 3) { + if (ENDAIKU_GET_TYPE(&this->actor) == ENDAIKU_TYPE1 || ENDAIKU_GET_TYPE(&this->actor) == ENDAIKU_TYPE3) { EnDaiku_ChangeAnim(this, ENDAIKU_ANIM_SIT, &this->currentAnimIndex); this->stateFlags |= ENDAIKU_STATEFLAG_1; } else { @@ -254,7 +256,7 @@ s32 EnDaiku_UpdateTalking(EnDaiku* this, PlayState* play) { void EnDaiku_UpdateText(EnDaiku* this, PlayState* play) { s32 carpenterType; - s32 freedCount; + s32 rescuedCount; s16 sp2E; s16 sp2C; @@ -268,15 +270,14 @@ void EnDaiku_UpdateText(EnDaiku* this, PlayState* play) { Actor_OfferTalk(&this->actor, play, 100.0f) == 1) { if (play->sceneId == SCENE_THIEVES_HIDEOUT) { if (this->stateFlags & ENDAIKU_STATEFLAG_GERUDODEFEATED) { - freedCount = 0; + rescuedCount = 0; for (carpenterType = 0; carpenterType < 4; carpenterType++) { - if (gSaveContext.save.info.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] & - EVENTCHKINF_CARPENTERS_FREE_MASK(carpenterType)) { - freedCount++; + if (ENDAIKU_IS_CARPENTER_RESCUED(carpenterType)) { + rescuedCount++; } } - switch (freedCount) { + switch (rescuedCount) { case 0: this->actor.textId = 0x605B; break; @@ -295,15 +296,15 @@ void EnDaiku_UpdateText(EnDaiku* this, PlayState* play) { this->actor.textId = 0x6007; } } else if (play->sceneId == SCENE_CARPENTERS_TENT) { - switch (PARAMS_GET_U(this->actor.params, 0, 2)) { - case 0: + switch (ENDAIKU_GET_TYPE(&this->actor)) { + case ENDAIKU_TYPE0: if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) { this->actor.textId = 0x6060; } else { this->actor.textId = 0x605F; } break; - case 1: + case ENDAIKU_TYPE1: if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) { this->actor.textId = 0x6063; } else { @@ -314,7 +315,7 @@ void EnDaiku_UpdateText(EnDaiku* this, PlayState* play) { } } break; - case 2: + case ENDAIKU_TYPE2: if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) { this->actor.textId = 0x6066; } else { @@ -325,7 +326,7 @@ void EnDaiku_UpdateText(EnDaiku* this, PlayState* play) { } } break; - case 3: + case ENDAIKU_TYPE3: if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) { this->actor.textId = 0x6068; } else { @@ -385,7 +386,7 @@ void EnDaiku_WaitFreedom(EnDaiku* this, PlayState* play) { } /** - * The carpenter is free, initializes his running away animation + * The carpenter is rescued, initializes his running away animation */ void EnDaiku_InitEscape(EnDaiku* this, PlayState* play) { Path* path; @@ -399,11 +400,10 @@ void EnDaiku_InitEscape(EnDaiku* this, PlayState* play) { EnDaiku_ChangeAnim(this, ENDAIKU_ANIM_RUN, &this->currentAnimIndex); this->stateFlags &= ~(ENDAIKU_STATEFLAG_1 | ENDAIKU_STATEFLAG_2); - gSaveContext.save.info.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] |= - EVENTCHKINF_CARPENTERS_FREE_MASK(PARAMS_GET_U(this->actor.params, 0, 2)); + ENDAIKU_SET_CARPENTER_RESCUED(ENDAIKU_GET_TYPE(&this->actor)); this->actor.gravity = -1.0f; - this->escapeSubCamTimer = sEscapeSubCamParams[PARAMS_GET_U(this->actor.params, 0, 2)].maxFramesActive; + this->escapeSubCamTimer = sEscapeSubCamParams[ENDAIKU_GET_TYPE(&this->actor)].maxFramesActive; EnDaiku_InitSubCamera(this, play); exitLoop = false; @@ -444,11 +444,11 @@ void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) { Vec3f eyePosDeltaWorld; this->subCamActive = true; - this->escapeSubCamTimer = sEscapeSubCamParams[PARAMS_GET_U(this->actor.params, 0, 2)].maxFramesActive; + this->escapeSubCamTimer = sEscapeSubCamParams[ENDAIKU_GET_TYPE(&this->actor)].maxFramesActive; - eyePosDeltaLocal.x = sEscapeSubCamParams[PARAMS_GET_U(this->actor.params, 0, 2)].eyePosDeltaLocal.x; - eyePosDeltaLocal.y = sEscapeSubCamParams[PARAMS_GET_U(this->actor.params, 0, 2)].eyePosDeltaLocal.y; - eyePosDeltaLocal.z = sEscapeSubCamParams[PARAMS_GET_U(this->actor.params, 0, 2)].eyePosDeltaLocal.z; + eyePosDeltaLocal.x = sEscapeSubCamParams[ENDAIKU_GET_TYPE(&this->actor)].eyePosDeltaLocal.x; + eyePosDeltaLocal.y = sEscapeSubCamParams[ENDAIKU_GET_TYPE(&this->actor)].eyePosDeltaLocal.y; + eyePosDeltaLocal.z = sEscapeSubCamParams[ENDAIKU_GET_TYPE(&this->actor)].eyePosDeltaLocal.z; Matrix_RotateY(BINANG_TO_RAD(this->actor.world.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&eyePosDeltaLocal, &eyePosDeltaWorld); @@ -493,7 +493,7 @@ void EnDaiku_EscapeSuccess(EnDaiku* this, PlayState* play) { Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_ACTIVE); this->subCamActive = false; - if (GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) { + if (GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) { Actor* gerudoGuard; Vec3f vec; @@ -594,13 +594,13 @@ void EnDaiku_Draw(Actor* thisx, PlayState* play) { Gfx_SetupDL_25Opa(play->state.gfxCtx); - if (PARAMS_GET_U(thisx->params, 0, 2) == 0) { + if (ENDAIKU_GET_TYPE(thisx) == ENDAIKU_TYPE0) { gDPSetEnvColor(POLY_OPA_DISP++, 170, 10, 70, 255); - } else if (PARAMS_GET_U(thisx->params, 0, 2) == 1) { + } else if (ENDAIKU_GET_TYPE(thisx) == ENDAIKU_TYPE1) { gDPSetEnvColor(POLY_OPA_DISP++, 170, 200, 255, 255); - } else if (PARAMS_GET_U(thisx->params, 0, 2) == 2) { + } else if (ENDAIKU_GET_TYPE(thisx) == ENDAIKU_TYPE2) { gDPSetEnvColor(POLY_OPA_DISP++, 0, 230, 70, 255); - } else if (PARAMS_GET_U(thisx->params, 0, 2) == 3) { + } else if (ENDAIKU_GET_TYPE(thisx) == ENDAIKU_TYPE3) { gDPSetEnvColor(POLY_OPA_DISP++, 200, 0, 150, 255); } @@ -637,7 +637,7 @@ void EnDaiku_PostLimbDraw(PlayState* play, s32 limb, Gfx** dList, Vec3s* rot, vo if (limb == 15) { // head Matrix_MultVec3f(&targetPosHeadLocal, &this->actor.focus.pos); - gSPDisplayList(POLY_OPA_DISP++, hairDLists[PARAMS_GET_U(this->actor.params, 0, 2)]); + gSPDisplayList(POLY_OPA_DISP++, hairDLists[ENDAIKU_GET_TYPE(&this->actor)]); } CLOSE_DISPS(play->state.gfxCtx, "../z_en_daiku.c", 1330); diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h index 82b7a06346..69136f6a92 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h @@ -8,6 +8,13 @@ struct EnDaiku; typedef void (*EnDaikuActionFunc)(struct EnDaiku*, PlayState*); +typedef enum EnDaikuType { + ENDAIKU_TYPE0, + ENDAIKU_TYPE1, + ENDAIKU_TYPE2, + ENDAIKU_TYPE3 +} EnDaikuType; + typedef struct EnDaiku { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 2612749b4e..6b27191f79 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -7,7 +7,7 @@ #include "z_en_daiku_kakariko.h" #include "assets/objects/object_daiku/object_daiku.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum KakarikoCarpenterType { /* 0x0 */ CARPENTER_ICHIRO, // Red and purple pants, normal hair @@ -171,7 +171,7 @@ void EnDaikuKakariko_Init(Actor* thisx, PlayState* play) { this->actor.gravity = 0.0f; this->runSpeed = 3.0f; - this->actor.uncullZoneForward = 1200.0f; + this->actor.cullingVolumeDistance = 1200.0f; this->actor.attentionRangeType = ATTENTION_RANGE_6; this->currentAnimIndex = -1; diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index b2d7f0c8af..a770abcb63 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -402,7 +402,7 @@ void EnDekubaba_SetupPrunedSomersault(EnDekubaba* this) { this->actor.world.rot.y = this->actor.shape.rot.y + 0x8000; this->collider.base.acFlags &= ~AC_ON; this->actor.speed = this->size * 3.0f; - this->actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnDekubaba_PrunedSomersault; } @@ -455,7 +455,7 @@ void EnDekubaba_SetupDeadStickDrop(EnDekubaba* this, PlayState* play) { this->actor.velocity.y = 0.0f; this->actor.shape.shadowScale = 3.0f; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_MISC); - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->timer = 200; this->actionFunc = EnDekubaba_DeadStickDrop; } diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 4d0e0c269d..d0b44336bf 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -1,7 +1,9 @@ #include "z_en_dh.h" #include "assets/objects/object_dh/object_dh.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) typedef enum EnDhAction { /* 0 */ DH_WAIT, diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 3d31717cd6..8ecca0200a 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Dh/z_en_dh.h" #include "assets/objects/object_dh/object_dh.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDha_Init(Actor* thisx, PlayState* play); void EnDha_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 536be6a77d..504b26eaa9 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -9,7 +9,7 @@ #include "assets/objects/object_zo/object_zo.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDivingGame_Init(Actor* thisx, PlayState* play); void EnDivingGame_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index 0899a4592b..ba11fe4aa3 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -164,7 +164,7 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { delay = 0; switch (Player_GetMask(play)) { case PLAYER_MASK_SKULL: - if (!GET_ITEMGETINF(ITEMGETINF_1E)) { + if (!GET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_STICK_UPGRADE)) { reaction = DNT_SIGNAL_CELEBRATE; this->prize = DNT_PRIZE_STICK; SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_SARIA_THEME); @@ -172,7 +172,8 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { } FALLTHROUGH; case PLAYER_MASK_TRUTH: - if (!GET_ITEMGETINF(ITEMGETINF_1F) && (Player_GetMask(play) != PLAYER_MASK_SKULL)) { + if (!GET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE) && + (Player_GetMask(play) != PLAYER_MASK_SKULL)) { Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); this->prize = DNT_PRIZE_NUTS; diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 71942c91aa..fd76aa60ba 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -10,7 +10,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDntJiji_Init(Actor* thisx, PlayState* play); void EnDntJiji_Destroy(Actor* thisx, PlayState* play); @@ -282,7 +282,7 @@ void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) { PRINTF("実 \n"); PRINTF("実 \n"); PRINTF("実 \n"); - SET_ITEMGETINF(ITEMGETINF_1F); + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE); } else { // "stick" PRINTF("棒 \n"); @@ -291,7 +291,7 @@ void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) { PRINTF("棒 \n"); PRINTF("棒 \n"); PRINTF("棒 \n"); - SET_ITEMGETINF(ITEMGETINF_1E); + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_STICK_UPGRADE); } this->actor.textId = 0; if ((this->stage != NULL) && (this->stage->actor.update != NULL)) { diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 2863aa1f80..b1631fe434 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnDntNomal_Init(Actor* thisx, PlayState* play); void EnDntNomal_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 0a4242d020..5cd7fec6c5 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -3,7 +3,7 @@ #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #include "assets/objects/object_dodongo/object_dodongo.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum EnDodongoActionState { DODONGO_SWEEP_TAIL, diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 301b804966..4d650f0a1b 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -12,7 +12,7 @@ #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #include "assets/objects/object_haka_door/object_haka_door.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define DOOR_AJAR_SLAM_RANGE 120.0f #define DOOR_AJAR_OPEN_RANGE (2 * DOOR_AJAR_SLAM_RANGE) @@ -75,7 +75,7 @@ static EnDoorInfo sDoorInfo[] = { static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; static AnimationHeader* sDoorAnims[DOOR_OPEN_ANIM_MAX] = { @@ -177,7 +177,7 @@ void EnDoor_SetupType(EnDoor* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { s32 doorType = ENDOOR_GET_TYPE(&this->actor); - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->requiredObjectSlot; this->actionFunc = EnDoor_Idle; if (doorType == DOOR_EVENING) { diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index b3899ae0b8..c76713a756 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -206,7 +206,7 @@ void EnDs_Wait(EnDs* this, PlayState* play) { s16 yawDiff; if (Actor_TalkOfferAccepted(&this->actor, play)) { - if (func_8002F368(play) == EXCH_ITEM_ODD_MUSHROOM) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_ODD_MUSHROOM) { Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); player->actor.textId = 0x504A; diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index 67ddf4a1f7..f77bec5a85 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -293,7 +293,7 @@ void EnDu_Init(Actor* thisx, PlayState* play) { this->interactInfo.talkState = NPC_TALK_STATE_IDLE; if (gSaveContext.save.cutsceneIndex >= 0xFFF0) { - play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDarunia01Cs); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaDancingCs); gSaveContext.cutsceneTrigger = 1; EnDu_SetupAction(this, func_809FE890); } else if (play->sceneId == SCENE_FIRE_TEMPLE) { @@ -341,7 +341,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) { play->msgCtx.ocarinaMode = OCARINA_MODE_00; EnDu_SetupAction(this, func_809FE3C0); } else if (play->msgCtx.ocarinaMode >= OCARINA_MODE_06) { - play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaWrongCs); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaWrongSongCs); gSaveContext.cutsceneTrigger = 1; this->unk_1E8 = 1; EnDu_SetupAction(this, func_809FE890); @@ -349,7 +349,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) { } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) { Audio_PlaySfxGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectCs); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectSongCs); gSaveContext.cutsceneTrigger = 1; this->unk_1E8 = 0; EnDu_SetupAction(this, func_809FE890); diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 784e28e072..836610b781 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -8,7 +8,7 @@ #include "assets/objects/object_dy_obj/object_dy_obj.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnDyExtra_Init(Actor* thisx, PlayState* play); void EnDyExtra_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index 733a9ccf83..c646cdf249 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -7,7 +7,7 @@ #include "z_en_eg.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnEg_Init(Actor* thisx, PlayState* play); void EnEg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 63e509986b..554512b148 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -215,7 +215,7 @@ void EnEiyer_SetupUnderground(EnEiyer* this) { } this->collider.base.acFlags |= AC_ON; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; } @@ -265,7 +265,7 @@ void EnEiyer_SetupDiveAttack(EnEiyer* this, PlayState* play) { void EnEiyer_SetupLand(EnEiyer* this) { Animation_MorphToPlayOnce(&this->skelanime, &gStingerDiveAnim, -3.0f); this->collider.base.atFlags &= ~AT_ON; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; // Update BgCheck info, play sound, and spawn effect on the first frame of the land action this->timer = -1; diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index a83552b9bf..cd3658756e 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -8,7 +8,7 @@ #include "global.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) #define FAIRY_FLAG_TIMED (1 << 8) #define FAIRY_FLAG_BIG (1 << 9) diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index bcd652c776..7c58fb68a2 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -2,7 +2,7 @@ #include "terminal.h" #include "overlays/actors/ovl_En_Tite/z_en_tite.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnEncount1_Init(Actor* thisx, PlayState* play); void EnEncount1_Update(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 972f06b6f7..d0ba211fda 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -4,7 +4,7 @@ #include "terminal.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum Encount2State { /* 0x0 */ ENCOUNT2_INACTIVE, diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 53507b0e39..fea14bc560 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnExItem_Init(Actor* thisx, PlayState* play); void EnExItem_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 6db126576b..3e1ec6cee9 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -3,7 +3,7 @@ #include "../ovl_En_Diving_Game/z_en_diving_game.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnExRuppy_Init(Actor* thisx, PlayState* play); void EnExRuppy_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 53234952ce..c4175c7fe4 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -9,7 +9,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fw/object_fw.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) void EnFd_Init(Actor* thisx, PlayState* play); void EnFd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index 472ff44b25..d408b7b9ac 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -1,7 +1,7 @@ #include "z_en_fd_fire.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnFdFire_Init(Actor* thisx, PlayState* play); void EnFdFire_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index a76c0b8783..aa3f190cee 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -11,7 +11,7 @@ #include "overlays/actors/ovl_En_fHG/z_en_fhg.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum StrikeMode { /* 0 */ STRIKE_INIT, diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index c3740bf9e4..0e91c96ea0 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -3,7 +3,7 @@ #include "terminal.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnFireRock_Init(Actor* thisx, PlayState* play); void EnFireRock_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index eb1be1b9cf..6a72e29224 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -215,7 +215,7 @@ void EnFirefly_SetupFall(EnFirefly* this) { this->actor.velocity.y = 0.0f; Animation_Change(&this->skelAnime, &gKeeseFlyAnim, 0.5f, 0.0f, 0.0f, ANIMMODE_LOOP_INTERP, -3.0f); Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_DEAD); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 40); this->actionFunc = EnFirefly_Fall; } @@ -262,7 +262,7 @@ void EnFirefly_SetupFrozenFall(EnFirefly* this, PlayState* play) { s32 i; Vec3f iceParticlePos; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->auraType = KEESE_AURA_NONE; this->actor.speed = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 255); diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index ccc27510e2..7f16563730 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -79,9 +79,9 @@ ActorProfile En_Fish_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 40, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 700, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 900, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 40, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 700, ICHAIN_STOP), }; f32 EnFish_XZDistanceSquared(Vec3f* v1, Vec3f* v2) { @@ -117,7 +117,7 @@ void EnFish_SetCutsceneData(EnFish* this) { thisx->shape.yOffset = 600.0f; D_80A17014 = 10.0f; D_80A17018 = 0.0f; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnFish_SetOutOfWaterAnimation(this); } } @@ -141,7 +141,7 @@ void EnFish_Init(Actor* thisx, PlayState* play) { this->fastPhase = Rand_ZeroOne() * (0xFFFF + 0.5f); if (params == FISH_DROPPED) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 8.0f); EnFish_Dropped_SetupFall(this); } else if (params == FISH_SWIMMING_UNIQUE) { @@ -476,7 +476,7 @@ void EnFish_Dropped_SetupSwimAway(EnFish* this) { this->actor.gravity = 0.0f; this->actor.minVelocityY = 0.0f; this->actor.shape.yOffset = 0.0f; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->timer = 200; EnFish_SetInWaterAnimation(this); this->actionFunc = EnFish_Dropped_SwimAway; diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index e08b501210..035a825073 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -279,7 +279,7 @@ void EnFloormas_SetupLand(EnFloormas* this) { void EnFloormas_SetupSplit(EnFloormas* this) { Actor_SetScale(&this->actor, 0.004f); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { this->actor.draw = EnFloormas_DrawHighlighted; } else { @@ -384,7 +384,7 @@ void EnFloormas_SetupSmallWait(EnFloormas* this) { } this->actor.draw = NULL; this->actionFunc = EnFloormas_SmallWait; - this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4); + this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); } void EnFloormas_SetupTakeDamage(EnFloormas* this) { @@ -911,7 +911,7 @@ void EnFloormas_Merge(EnFloormas* this, PlayState* play) { if (SkelAnime_Update(&this->skelAnime)) { if (this->actor.scale.x >= 0.01f) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnFloormas_MakeVulnerable(this); this->actor.params = 0; this->collider.elem.acElemFlags |= ACELEM_HOOKABLE; diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index ef6b640712..6e0ec63175 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -3,7 +3,9 @@ #include "terminal.h" #include "assets/objects/object_fr/object_fr.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnFr_Init(Actor* thisx, PlayState* play); void EnFr_Destroy(Actor* thisx, PlayState* play); @@ -106,22 +108,22 @@ static EnFrPointers sEnFrPointers = { }; #define FROG_HAS_SONG_BEEN_PLAYED(frogSongIndex) \ - (gSaveContext.save.info.eventChkInf[EVENTCHKINF_SONGS_FOR_FROGS_INDEX] & \ + (gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_SONGS_FOR_FROGS] & \ sFrogSongIndexToEventChkInfSongsForFrogsMask[frogSongIndex]) #define FROG_SET_SONG_PLAYED(frogSongIndex) \ - gSaveContext.save.info.eventChkInf[EVENTCHKINF_SONGS_FOR_FROGS_INDEX] |= \ + gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_SONGS_FOR_FROGS] |= \ sFrogSongIndexToEventChkInfSongsForFrogsMask[frogSongIndex]; static u16 sFrogSongIndexToEventChkInfSongsForFrogsMask[] = { - EVENTCHKINF_SONGS_FOR_FROGS_ZL_MASK, // FROG_ZL - EVENTCHKINF_SONGS_FOR_FROGS_EPONA_MASK, // FROG_EPONA - EVENTCHKINF_SONGS_FOR_FROGS_SARIA_MASK, // FROG_SARIA - EVENTCHKINF_SONGS_FOR_FROGS_SUNS_MASK, // FROG_SUNS - EVENTCHKINF_SONGS_FOR_FROGS_SOT_MASK, // FROG_SOT - EVENTCHKINF_SONGS_FOR_FROGS_STORMS_MASK, // FROG_STORMS - EVENTCHKINF_SONGS_FOR_FROGS_CHOIR_MASK, // FROG_CHOIR_SONG - 0, // FROG_NO_SONG + EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_ZL), // FROG_ZL + EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_EPONA), // FROG_EPONA + EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_SARIA), // FROG_SARIA + EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_SUNS), // FROG_SUNS + EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_SOT), // FROG_SOT + EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_STORMS), // FROG_STORMS + EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_CHOIR), // FROG_CHOIR_SONG + 0, // FROG_NO_SONG }; static u8 sFrogToFrogSongIndex[] = { @@ -236,7 +238,7 @@ void EnFr_Init(Actor* thisx, PlayState* play) { this->actor.destroy = NULL; this->actor.draw = NULL; this->actor.update = EnFr_UpdateIdle; - this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4); + this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); this->actor.flags &= ~0; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_PROP); this->actor.textId = 0x40AC; @@ -278,7 +280,7 @@ void EnFr_Update(Actor* thisx, PlayState* play) { s32 pad2; if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; frogIndex = this->actor.params - 1; sEnFrPointers.frogs[frogIndex] = this; Actor_ProcessInitChain(&this->actor, sInitChain); diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 942bb6777e..8069e6cb26 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -8,7 +8,9 @@ #include "assets/objects/object_fu/object_fu.h" #include "assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) #define FU_RESET_LOOK_ANGLE (1 << 0) #define FU_WAIT (1 << 1) @@ -134,7 +136,7 @@ void EnFu_WaitChild(EnFu* this, PlayState* play) { u16 textId = MaskReaction_GetTextId(play, MASK_REACTION_SET_WINDMILL_MAN); if (textId == 0) { - textId = GET_EVENTCHKINF(EVENTCHKINF_67) ? 0x5033 : 0x5032; + textId = GET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL) ? 0x5033 : 0x5032; } // if ACTOR_FLAG_TALK is set and textId is 0x5033, change animation diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index c1a18d41c4..09bf51927f 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -9,7 +9,9 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) void EnFw_Init(Actor* thisx, PlayState* play); void EnFw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index d22dbe06c2..af3ca60170 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -1,7 +1,9 @@ #include "z_en_fz.h" #include "assets/objects/object_fz/object_fz.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnFz_Init(Actor* thisx, PlayState* play); void EnFz_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index afadb9d886..378d790e0e 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -12,7 +12,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum GSwitchMoveState { /* 0 */ MOVE_TARGET, diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 0153109acd..6e323a62c8 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -7,7 +7,7 @@ #include "z_en_ganon_mant.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGanonMant_Init(Actor* thisx, PlayState* play); void EnGanonMant_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 1a36f849ac..d64111fb9d 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -7,7 +7,7 @@ #include "z_en_ganon_organ.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGanonOrgan_Init(Actor* thisx, PlayState* play); void EnGanonOrgan_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 8488152086..e37400ce5d 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -284,7 +284,7 @@ void func_80A2F83C(EnGb* this, PlayState* play) { if (Actor_TalkOfferAccepted(&this->dyna.actor, play)) { s32 pad; - switch (func_8002F368(play)) { + switch (Actor_GetPlayerExchangeItemId(play)) { case EXCH_ITEM_NONE: func_80A2F180(this); this->actionFunc = func_80A2F94C; diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index bfd827349a..8082c7d87c 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -5,6 +5,7 @@ */ #include "z_en_ge1.h" +#include "z64horse.h" #include "terminal.h" #include "assets/objects/object_ge1/object_ge1.h" @@ -26,7 +27,7 @@ void EnGe1_Destroy(Actor* thisx, PlayState* play); void EnGe1_Update(Actor* thisx, PlayState* play); void EnGe1_Draw(Actor* thisx, PlayState* play); -s32 EnGe1_CheckCarpentersFreed(void); +s32 EnGe1_CheckAllCarpentersRescued(void); void EnGe1_WatchForPlayerFrontOnly(EnGe1* this, PlayState* play); void EnGe1_SetNormalText(EnGe1* this, PlayState* play); void EnGe1_WatchForAndSensePlayer(EnGe1* this, PlayState* play); @@ -101,7 +102,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { this->actor.attentionRangeType = ATTENTION_RANGE_6; Actor_SetScale(&this->actor, 0.01f); - this->actor.uncullZoneForward = ((play->sceneId == SCENE_GERUDO_VALLEY) ? 1000.0f : 1200.0f); + this->actor.cullingVolumeDistance = ((play->sceneId == SCENE_GERUDO_VALLEY) ? 1000.0f : 1200.0f); switch (PARAMS_GET_U(this->actor.params, 0, 8)) { @@ -113,7 +114,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { case GE1_TYPE_GATE_OPERATOR: this->hairstyle = GE1_HAIR_STRAIGHT; - if (EnGe1_CheckCarpentersFreed()) { + if (EnGe1_CheckAllCarpentersRescued()) { this->actionFunc = EnGe1_CheckGate_GateOp; } else { this->actionFunc = EnGe1_WatchForPlayerFrontOnly; @@ -123,7 +124,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { case GE1_TYPE_NORMAL: this->hairstyle = GE1_HAIR_STRAIGHT; - if (EnGe1_CheckCarpentersFreed()) { + if (EnGe1_CheckAllCarpentersRescued()) { this->actionFunc = EnGe1_SetNormalText; } else { this->actionFunc = EnGe1_WatchForAndSensePlayer; @@ -153,7 +154,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { if (GET_EVENTINF(EVENTINF_HORSES_08)) { this->actionFunc = EnGe1_TalkAfterGame_Archery; - } else if (EnGe1_CheckCarpentersFreed()) { + } else if (EnGe1_CheckAllCarpentersRescued()) { this->actionFunc = EnGe1_Wait_Archery; } else { this->actionFunc = EnGe1_WatchForPlayerFrontOnly; @@ -163,7 +164,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { case GE1_TYPE_TRAINING_GROUNDS_GUARD: this->hairstyle = GE1_HAIR_STRAIGHT; - if (EnGe1_CheckCarpentersFreed()) { + if (EnGe1_CheckAllCarpentersRescued()) { this->actionFunc = EnGe1_CheckForCard_GTGGuard; } else { this->actionFunc = EnGe1_WatchForPlayerFrontOnly; @@ -207,9 +208,9 @@ void EnGe1_SetAnimationIdle(EnGe1* this) { this->animFunc = EnGe1_CueUpAnimation; } -s32 EnGe1_CheckCarpentersFreed(void) { - if (!(GET_EVENTCHKINF(EVENTCHKINF_CARPENTERS_FREE(0)) && GET_EVENTCHKINF(EVENTCHKINF_CARPENTERS_FREE(1)) && - GET_EVENTCHKINF(EVENTCHKINF_CARPENTERS_FREE(2)) && GET_EVENTCHKINF(EVENTCHKINF_CARPENTERS_FREE(3)))) { +s32 EnGe1_CheckAllCarpentersRescued(void) { + if (!(GET_EVENTCHKINF(EVENTCHKINF_CARPENTER_0_RESCUED) && GET_EVENTCHKINF(EVENTCHKINF_CARPENTER_1_RESCUED) && + GET_EVENTCHKINF(EVENTCHKINF_CARPENTER_2_RESCUED) && GET_EVENTCHKINF(EVENTCHKINF_CARPENTER_3_RESCUED))) { return false; } return true; @@ -224,7 +225,7 @@ void EnGe1_KickPlayer(EnGe1* this, PlayState* play) { if (this->cutsceneTimer > 0) { this->cutsceneTimer--; } else { - func_8006D074(play); + Horse_ResetHorseData(play); if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) { play->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index da5b380082..0df133fe4f 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -5,10 +5,11 @@ */ #include "z_en_ge2.h" +#include "z64horse.h" #include "terminal.h" #include "assets/objects/object_gla/object_gla.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define GE2_STATE_ANIMCOMPLETE (1 << 1) #define GE2_STATE_KO (1 << 2) @@ -38,7 +39,7 @@ void EnGe2_Destroy(Actor* thisx, PlayState* play); void EnGe2_Update(Actor* thisx, PlayState* play); void EnGe2_Draw(Actor* thisx, PlayState* play); -s32 EnGe2_CheckCarpentersFreed(void); +s32 EnGe2_CheckAllCarpentersRescued(void); void EnGe2_CaptureClose(EnGe2* this, PlayState* play); void EnGe2_CaptureCharge(EnGe2* this, PlayState* play); void EnGe2_CaptureTurn(EnGe2* this, PlayState* play); @@ -124,9 +125,9 @@ void EnGe2_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.01f); if (play->sceneId == SCENE_GERUDO_VALLEY) { - this->actor.uncullZoneForward = 1000.0f; + this->actor.cullingVolumeDistance = 1000.0f; } else { - this->actor.uncullZoneForward = 1200.0f; + this->actor.cullingVolumeDistance = 1200.0f; } this->yDetectRange = (this->actor.world.rot.z + 1) * 40.0f; @@ -136,14 +137,14 @@ void EnGe2_Init(Actor* thisx, PlayState* play) { switch (PARAMS_GET_S(thisx->params, 0, 8)) { case GE2_TYPE_PATROLLING: EnGe2_ChangeAction(this, GE2_ACTION_WALK); - if (EnGe2_CheckCarpentersFreed()) { + if (EnGe2_CheckAllCarpentersRescued()) { this->actor.update = EnGe2_UpdateFriendly; this->actor.attentionRangeType = ATTENTION_RANGE_6; } break; case GE2_TYPE_STATIONARY: EnGe2_ChangeAction(this, GE2_ACTION_STAND); - if (EnGe2_CheckCarpentersFreed()) { + if (EnGe2_CheckAllCarpentersRescued()) { this->actor.update = EnGe2_UpdateFriendly; this->actor.attentionRangeType = ATTENTION_RANGE_6; } @@ -223,13 +224,11 @@ s32 Ge2_DetectPlayerInUpdate(PlayState* play, EnGe2* this, Vec3f* pos, s16 yRot, return 1; } -s32 EnGe2_CheckCarpentersFreed(void) { - if (CHECK_FLAG_ALL(gSaveContext.save.info.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] & - (EVENTCHKINF_CARPENTERS_FREE_MASK_ALL | 0xF0), - EVENTCHKINF_CARPENTERS_FREE_MASK_ALL)) { - return 1; +s32 EnGe2_CheckAllCarpentersRescued(void) { + if (GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED2()) { + return true; } - return 0; + return false; } // Actions @@ -238,7 +237,7 @@ void EnGe2_CaptureClose(EnGe2* this, PlayState* play) { if (this->timer > 0) { this->timer--; } else { - func_8006D074(play); + Horse_ResetHorseData(play); if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) { play->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; @@ -264,7 +263,7 @@ void EnGe2_CaptureCharge(EnGe2* this, PlayState* play) { if (this->timer > 0) { this->timer--; } else { - func_8006D074(play); + Horse_ResetHorseData(play); if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) { play->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; @@ -593,7 +592,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) { } EnGe2_MoveAndBlink(this, play); - if (EnGe2_CheckCarpentersFreed() && !(this->stateFlags & GE2_STATE_KO)) { + if (EnGe2_CheckAllCarpentersRescued() && !(this->stateFlags & GE2_STATE_KO)) { this->actor.update = EnGe2_UpdateFriendly; this->actor.attentionRangeType = ATTENTION_RANGE_6; } @@ -619,7 +618,7 @@ void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2) { } CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); - if (EnGe2_CheckCarpentersFreed()) { + if (EnGe2_CheckAllCarpentersRescued()) { this->actor.update = EnGe2_UpdateFriendly; this->actor.attentionRangeType = ATTENTION_RANGE_6; this->actor.colorFilterTimer = 0; diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index c49252ace7..614936d3bc 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -8,7 +8,7 @@ #include "assets/objects/object_geldb/object_geldb.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGe3_Init(Actor* thisx, PlayState* play2); void EnGe3_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 4c1a386975..8ecd36af5e 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -7,7 +7,7 @@ #include "z_en_geldb.h" #include "assets/objects/object_geldb/object_geldb.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum EnGeldBAction { /* 0 */ GELDB_WAIT, diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 34bd2e0eb1..4261af7b18 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -7,7 +7,7 @@ #include "z_en_girla.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGirlA_Init(Actor* thisx, PlayState* play); void EnGirlA_Destroy(Actor* thisx, PlayState* play); @@ -982,7 +982,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) { ShopItemEntry* itemEntry = &sShopItemEntries[params]; if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->requiredObjectSlot; switch (this->actor.params) { case SI_KEATON_MASK: diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index f26c6db2ec..55c10f147d 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -9,7 +9,7 @@ #include "assets/objects/object_gm/object_gm.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGm_Init(Actor* thisx, PlayState* play); void EnGm_Destroy(Actor* thisx, PlayState* play); @@ -103,7 +103,7 @@ s32 func_80A3D7C8(void) { void func_80A3D838(EnGm* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->gmObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; SkelAnime_InitFlex(play, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable, 18); gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[this->gmObjectSlot].segment); Animation_Change(&this->skelAnime, &object_gm_Anim_0002B8, 1.0f, 0.0f, diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 9877909df5..265d806fe5 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -3,7 +3,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGo_Init(Actor* thisx, PlayState* play); void EnGo_Destroy(Actor* thisx, PlayState* play); @@ -597,7 +599,7 @@ void func_80A3F908(EnGo* this, PlayState* play) { if ((PARAMS_GET_NOSHIFT(this->actor.params, 4, 4) == 0x90) && (dialogStarted == true)) { if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_BROKEN_GORONS_SWORD) { - if (func_8002F368(play) == EXCH_ITEM_BROKEN_GORONS_SWORD) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_BROKEN_GORONS_SWORD) { if (GET_INFTABLE(INFTABLE_B4)) { this->actor.textId = 0x3055; } else { @@ -610,7 +612,7 @@ void func_80A3F908(EnGo* this, PlayState* play) { } if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) { - if (func_8002F368(play) == EXCH_ITEM_EYE_DROPS) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_EYE_DROPS) { this->actor.textId = 0x3059; } else { this->actor.textId = 0x3058; @@ -639,8 +641,8 @@ void EnGo_Init(Actor* thisx, PlayState* play) { } if (PARAMS_GET_NOSHIFT(this->actor.params, 4, 4) && (PARAMS_GET_NOSHIFT(this->actor.params, 4, 4) != 0x90)) { - this->actor.flags &= ~ACTOR_FLAG_4; - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; } EnGo_ChangeAnim(this, ENGO_ANIM_0); diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 52e41a6cf6..af0c4e4512 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -5,7 +5,9 @@ #include "quake.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) /* FLAGS @@ -593,7 +595,7 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) { case TEXT_STATE_DONE_FADING: switch (this->actor.textId) { case 0x305E: - if (func_8002F368(play) != EXCH_ITEM_CLAIM_CHECK) { + if (Actor_GetPlayerExchangeItemId(play) != EXCH_ITEM_CLAIM_CHECK) { break; } FALLTHROUGH; @@ -1027,7 +1029,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) { if (PARAMS_GET_S(this->actor.params, 0, 5) == GORON_DMT_BIGGORON) { if (gSaveContext.save.info.playerData.bgsFlag) { - if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_CLAIM_CHECK) { this->actor.textId = 0x3003; } else { this->actor.textId = 0x305E; @@ -1035,7 +1037,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) { player->actor.textId = this->actor.textId; } else if (!gSaveContext.save.info.playerData.bgsFlag && (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)) { - if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_CLAIM_CHECK) { if (Environment_GetBgsDayCount() >= 3) { textId = 0x305E; } else { @@ -1054,7 +1056,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) { } else if ((INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_PRESCRIPTION) && (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_CLAIM_CHECK)) { - if (func_8002F368(play) == EXCH_ITEM_EYE_DROPS) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_EYE_DROPS) { this->actor.textId = 0x3059; } else { this->actor.textId = 0x3058; @@ -1065,7 +1067,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) { player->actor.textId = this->actor.textId; } else if (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_BROKEN_GORONS_SWORD) { - if (func_8002F368(play) == EXCH_ITEM_BROKEN_GORONS_SWORD) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_BROKEN_GORONS_SWORD) { if (GET_INFTABLE(INFTABLE_B4)) { textId = 0x3055; } else { @@ -1538,8 +1540,8 @@ void EnGo2_Init(Actor* thisx, PlayState* play) { case GORON_CITY_LOST_WOODS: case GORON_DMT_FAIRY_HINT: case GORON_MARKET_BAZAAR: - this->actor.flags &= ~ACTOR_FLAG_4; - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; } EnGo2_SetColliderDim(this); diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 5791eccb67..06be045412 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -4,7 +4,9 @@ #include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGoma_Init(Actor* thisx, PlayState* play); void EnGoma_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index acf8a7b615..923d4e3e70 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -11,7 +11,7 @@ #include "quake.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef s32 (*EnGoroiwaUnkFunc1)(EnGoroiwa* this, PlayState* play); typedef void (*EnGoroiwaUnkFunc2)(EnGoroiwa* this); @@ -536,9 +536,9 @@ void EnGoroiwa_SpawnFragments(EnGoroiwa* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -860, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -860, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; void EnGoroiwa_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index c1e9ed9d8d..46d470c330 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -356,8 +356,8 @@ void func_80A4ED34(EnGs* this, PlayState* play) { Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); if (this->unk_200++ >= 40) { this->unk_19E |= 0x10; - this->actor.flags |= ACTOR_FLAG_4; - this->actor.uncullZoneForward = 12000.0f; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.cullingVolumeDistance = 12000.0f; this->actor.gravity = 0.3f; this->unk_19F++; diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 5594103fd4..9bb3cb6783 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -9,7 +9,7 @@ #include "assets/objects/object_boj/object_boj.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGuest_Init(Actor* thisx, PlayState* play); void EnGuest_Destroy(Actor* thisx, PlayState* play); @@ -77,7 +77,7 @@ void EnGuest_Update(Actor* thisx, PlayState* play) { s32 pad; if (Object_IsLoaded(&play->objectCtx, this->osAnimeObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_ProcessInitChain(&this->actor, sInitChain); SkelAnime_InitFlex(play, &this->skelAnime, &gHylianMan2Skel, NULL, this->jointTable, this->morphTable, 16); diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index a339b3c3f4..6cdb51f59b 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -61,9 +61,9 @@ void EnHata_Init(Actor* thisx, PlayState* play) { DynaPolyActor_Init(&this->dyna, 0); CollisionHeader_GetVirtual(&gFlagpoleCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); - this->dyna.actor.uncullZoneScale = 500.0f; - this->dyna.actor.uncullZoneDownward = 550.0f; - this->dyna.actor.uncullZoneForward = 2200.0f; + this->dyna.actor.cullingVolumeScale = 500.0f; + this->dyna.actor.cullingVolumeDownward = 550.0f; + this->dyna.actor.cullingVolumeDistance = 2200.0f; this->invScale = 6; this->maxStep = 1000; this->minStep = 1; diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index df24f1f959..e6bdfeac22 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -8,7 +8,7 @@ #include "assets/objects/object_sd/object_sd.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnHeishi1_Init(Actor* thisx, PlayState* play2); void EnHeishi1_Destroy(Actor* thisx, PlayState* play); @@ -346,7 +346,7 @@ void EnHeishi1_Kick(EnHeishi1* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) { Message_CloseTextbox(play); if (!this->loadStarted) { - SET_EVENTCHKINF(EVENTCHKINF_4E); + SET_EVENTCHKINF(EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS); play->nextEntranceIndex = ENTR_HYRULE_CASTLE_3; play->transitionTrigger = TRANS_TRIGGER_START; this->loadStarted = true; @@ -404,9 +404,9 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); - this->actor.uncullZoneForward = 550.0f; - this->actor.uncullZoneScale = 350.0f; - this->actor.uncullZoneDownward = 700.0f; + this->actor.cullingVolumeDistance = 550.0f; + this->actor.cullingVolumeScale = 350.0f; + this->actor.cullingVolumeDownward = 700.0f; if (this->type != 5) { path = this->path * 2; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index b1ee099721..b31974f3b3 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -112,7 +112,7 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) { this->actor.shape.rot.y = this->actor.world.rot.y; Collider_DestroyCylinder(play, &this->collider); Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_8); - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_80A544AC; } } else { @@ -402,7 +402,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) { this->unk_300 = TEXT_STATE_DONE; if (Actor_TalkOfferAccepted(&this->actor, play)) { - s32 exchangeItemId = func_8002F368(play); + s32 exchangeItemId = Actor_GetPlayerExchangeItemId(play); if (exchangeItemId == EXCH_ITEM_ZELDAS_LETTER) { Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 7dc72a610b..8a10e8f96e 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -136,7 +136,7 @@ void EnHeishi3_StandSentinelInGrounds(EnHeishi3* this, PlayState* play) { PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); #if OOT_PAL_N64 - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED; #endif this->actionFunc = EnHeishi3_CatchStart; } @@ -167,7 +167,7 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, PlayState* play) { PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); #if OOT_PAL_N64 - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED; #endif this->actionFunc = EnHeishi3_CatchStart; } @@ -208,7 +208,7 @@ void func_80A55D00(EnHeishi3* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play) && (this->respawnFlag == 0)) { - SET_EVENTCHKINF(EVENTCHKINF_4E); + SET_EVENTCHKINF(EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS); play->nextEntranceIndex = ENTR_HYRULE_CASTLE_4; play->transitionTrigger = TRANS_TRIGGER_START; this->respawnFlag = 1; diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 2b2b65d392..541e8b8519 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -170,7 +170,7 @@ void EnHintnuts_HitByScrubProjectile2(EnHintnuts* this) { } sPuzzleCounter--; } - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnHintnuts_BeginFreeze; } else { this->actionFunc = EnHintnuts_BeginRun; @@ -195,7 +195,7 @@ void EnHintnuts_SetupLeave(EnHintnuts* this, PlayState* play) { this->animFlagAndTimer = 100; this->actor.world.rot.y = this->actor.shape.rot.y; this->collider.base.ocFlags1 &= ~OC1_ON; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DAMAGE); Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0x0, 0x0, 0x0, 0x3); // recovery heart @@ -451,7 +451,7 @@ void EnHintnuts_Freeze(EnHintnuts* this, PlayState* play) { Actor_Kill(&this->actor); } else { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.colChkInfo.health = sColChkInfoInit.health; this->actor.colorFilterTimer = 0; EnHintnuts_SetupWait(this); diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 2dd6b7d810..43710f7fb0 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -1,7 +1,7 @@ #include "z_en_holl.h" #include "config.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED /* * Horizontal holls parameters (`ENHOLL_H_*`) @@ -100,9 +100,9 @@ static EnHollActionFunc sActionFuncs[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; void EnHoll_SetupAction(EnHoll* this, EnHollActionFunc func) { diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index e0a1f34432..9a77366416 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define HONOTRAP_AT_ACTIVE (1 << 0) #define HONOTRAP_AC_ACTIVE (1 << 1) @@ -121,9 +121,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 9, 23, 1 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void EnHonotrap_FlameCollisionCheck(EnHonotrap* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 843427fc8b..075facff4d 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -5,6 +5,7 @@ */ #include "z_en_horse.h" +#include "z64horse.h" #include "global.h" #include "versions.h" #include "overlays/actors/ovl_En_In/z_en_in.h" @@ -12,7 +13,7 @@ #include "assets/objects/object_hni/object_hni.h" #include "assets/scenes/overworld/spot09/spot09_scene.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef void (*EnHorseCsFunc)(EnHorse*, PlayState*, CsCmdActorCue*); typedef void (*EnHorseActionFunc)(EnHorse*, PlayState*); @@ -370,8 +371,8 @@ static RaceInfo sIngoRace = { ARRAY_COUNT(sIngoRaceWaypoints), sIngoRaceWaypoint static s32 sAnimSoundFrames[] = { 0, 16 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 600, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; static u8 sResetNoInput[] = { 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0 }; @@ -456,7 +457,7 @@ s32 EnHorse_BgCheckBridgeJumpPoint(EnHorse* this, PlayState* play) { if (this->actor.speed < 12.8f) { return false; } - if (GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) { + if (GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) { return false; } @@ -525,7 +526,7 @@ void EnHorse_RaceWaypointPos(RaceWaypoint* waypoints, s32 index, Vec3f* pos) { } void EnHorse_RotateToPoint(EnHorse* this, PlayState* play, Vec3f* pos, s16 turnAmount) { - func_8006DD9C(&this->actor, pos, turnAmount); + Horse_RotateToPoint(&this->actor, pos, turnAmount); } void EnHorse_UpdateIngoRaceInfo(EnHorse* this, PlayState* play, RaceInfo* raceInfo) { @@ -645,7 +646,7 @@ int func_80A5BBBC(PlayState* play, EnHorse* this, Vec3f* pos) { return false; } eyeDist = Math3D_Vec3f_DistXYZ(pos, &play->view.eye); - return func_800314D4(play, &this->actor, &sp24, sp20) || eyeDist < 100.0f; + return Actor_CullingVolumeTest(play, &this->actor, &sp24, sp20) || eyeDist < 100.0f; } void EnHorse_IdleAnimSounds(EnHorse* this, PlayState* play) { @@ -678,7 +679,7 @@ s32 EnHorse_Spawn(EnHorse* this, PlayState* play) { if (play->sceneId != SCENE_LON_LON_RANCH || //! Same flag checked twice (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && - (GET_EVENTINF_HORSES_STATE() != EVENTINF_HORSES_STATE_6 || + (GET_EVENTINF_INGO_RACE_STATE() != INGO_RACE_STATE_TRAPPED_WIN_EPONA || Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED))) || // always load two spawns inside lon lon ((sHorseSpawns[i].pos.x == 856 && sHorseSpawns[i].pos.y == 0 && sHorseSpawns[i].pos.z == -918) || @@ -747,7 +748,7 @@ void EnHorse_Init(Actor* thisx, PlayState* play2) { EnHorse* this = (EnHorse*)thisx; PlayState* play = play2; - AREG(6) = 0; + R_EXITED_SCENE_RIDING_HORSE = false; Actor_ProcessInitChain(&this->actor, sInitChain); EnHorse_ClearDustFlags(&this->dustFlags); R_EPONAS_SONG_PLAYED = false; @@ -782,7 +783,7 @@ void EnHorse_Init(Actor* thisx, PlayState* play2) { // params was -1 if (this->actor.params == 0x7FFF) { - this->actor.params = 1; + this->actor.params = HORSE_PTYPE_1; } if (play->sceneId == SCENE_LON_LON_BUILDINGS) { @@ -790,25 +791,25 @@ void EnHorse_Init(Actor* thisx, PlayState* play2) { } else if (play->sceneId == SCENE_GERUDOS_FORTRESS && this->type == HORSE_HNI) { this->stateFlags = ENHORSE_FLAG_18 | ENHORSE_UNRIDEABLE; } else { - if (this->actor.params == 3) { + if (this->actor.params == HORSE_PTYPE_INGO_SPAWNED_RIDING) { this->stateFlags = ENHORSE_FLAG_19 | ENHORSE_CANT_JUMP | ENHORSE_UNRIDEABLE; - } else if (this->actor.params == 6) { + } else if (this->actor.params == HORSE_PTYPE_6) { this->stateFlags = ENHORSE_FLAG_19 | ENHORSE_CANT_JUMP; - if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || DREG(1) != 0) { + if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED) { this->stateFlags &= ~ENHORSE_CANT_JUMP; this->stateFlags |= ENHORSE_FLAG_26; - } else if (GET_EVENTINF(EVENTINF_HORSES_06) && this->type == HORSE_HNI) { + } else if (GET_EVENTINF(EVENTINF_INGO_RACE_SECOND_RACE) && this->type == HORSE_HNI) { this->stateFlags |= ENHORSE_FLAG_21 | ENHORSE_FLAG_20; } - } else if (this->actor.params == 1) { + } else if (this->actor.params == HORSE_PTYPE_1) { this->stateFlags = ENHORSE_FLAG_7; } else { this->stateFlags = 0; } } - if (play->sceneId == SCENE_LON_LON_RANCH && GET_EVENTINF_HORSES_STATE() == EVENTINF_HORSES_STATE_6 && - !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && !DREG(1)) { + if (play->sceneId == SCENE_LON_LON_RANCH && GET_EVENTINF_INGO_RACE_STATE() == INGO_RACE_STATE_TRAPPED_WIN_EPONA && + !(Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED)) { this->stateFlags |= ENHORSE_FLAG_25; } @@ -842,12 +843,13 @@ void EnHorse_Init(Actor* thisx, PlayState* play2) { Actor_Kill(&this->actor); return; } - } else if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && !DREG(1) && !IS_DAY) { + } else if (!(Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED) && !IS_DAY) { Actor_Kill(&this->actor); return; } } else if (play->sceneId == SCENE_STABLE) { - if (IS_DAY || Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || DREG(1) != 0 || !LINK_IS_ADULT) { + if (IS_DAY || Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED || + !LINK_IS_ADULT) { Actor_Kill(&this->actor); return; } @@ -865,24 +867,25 @@ void EnHorse_Init(Actor* thisx, PlayState* play2) { EnHorse_ResetRace(this, play); EnHorse_ResetHorsebackArchery(this, play); - if (this->actor.params == 2) { + if (this->actor.params == HORSE_PTYPE_INACTIVE) { EnHorse_InitInactive(this); - } else if (this->actor.params == 3) { + } else if (this->actor.params == HORSE_PTYPE_INGO_SPAWNED_RIDING) { EnHorse_InitIngoHorse(this); this->rider = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_IN, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, this->actor.shape.rot.x, this->actor.shape.rot.y, 1, 1); ASSERT(this->rider != NULL, "this->race.rider != NULL", "../z_en_horse.c", 3077); - if (!GET_EVENTINF(EVENTINF_HORSES_06)) { + if (!GET_EVENTINF(EVENTINF_INGO_RACE_SECOND_RACE)) { this->ingoHorseMaxSpeed = 12.07f; } else { this->ingoHorseMaxSpeed = 12.625f; } - } else if (this->actor.params == 7) { + } else if (this->actor.params == HORSE_PTYPE_7) { EnHorse_InitCutscene(this, play); - } else if (this->actor.params == 8) { + } else if (this->actor.params == HORSE_PTYPE_HORSEBACK_ARCHERY) { EnHorse_InitHorsebackArchery(this); Interface_InitHorsebackArchery(play); - } else if (play->sceneId == SCENE_LON_LON_RANCH && !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && !DREG(1)) { + } else if (play->sceneId == SCENE_LON_LON_RANCH && !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && + !R_DEBUG_FORCE_EPONA_OBTAINED) { EnHorse_InitFleePlayer(this); } else { if (play->sceneId == SCENE_LON_LON_BUILDINGS) { @@ -918,7 +921,7 @@ void EnHorse_RotateToPlayer(EnHorse* this, PlayState* play) { void EnHorse_Freeze(EnHorse* this) { if (this->action != ENHORSE_ACT_CS_UPDATE && this->action != ENHORSE_ACT_HBA) { - if (sResetNoInput[this->actor.params] != 0 && this->actor.params != 4) { + if (!(sResetNoInput[this->actor.params] == 0 || this->actor.params == HORSE_PTYPE_4)) { this->noInputTimer = 0; this->noInputTimerMax = 0; } @@ -945,10 +948,10 @@ void EnHorse_Frozen(EnHorse* this, PlayState* play) { this->jntSph.base.ocFlags1 |= OC1_ON; if (this->playerControlled == true) { this->stateFlags &= ~ENHORSE_FLAG_7; - if (this->actor.params == 4) { + if (this->actor.params == HORSE_PTYPE_4) { EnHorse_StartMountedIdleResetAnim(this); - } else if (this->actor.params == 9) { - this->actor.params = 5; + } else if (this->actor.params == HORSE_PTYPE_PLAYER_SPAWNED_RIDING) { + this->actor.params = HORSE_PTYPE_5; if (play->csCtx.state != CS_STATE_IDLE) { EnHorse_StartMountedIdle(this); } else { @@ -960,8 +963,8 @@ void EnHorse_Frozen(EnHorse* this, PlayState* play) { } else { EnHorse_StartMountedIdleResetAnim(this); } - if (this->actor.params != 0) { - this->actor.params = 0; + if (this->actor.params != HORSE_PTYPE_0) { + this->actor.params = HORSE_PTYPE_0; return; } } else { @@ -1741,7 +1744,7 @@ void EnHorse_Inactive(EnHorse* this, PlayState* play2) { if (R_EPONAS_SONG_PLAYED && this->type == HORSE_EPONA) { R_EPONAS_SONG_PLAYED = false; - if (EnHorse_Spawn(this, play) != 0) { + if (EnHorse_Spawn(this, play)) { #if OOT_VERSION >= PAL_1_0 Audio_PlaySfxGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -1758,7 +1761,7 @@ void EnHorse_Inactive(EnHorse* this, PlayState* play2) { if (!(this->stateFlags & ENHORSE_INACTIVE)) { this->followTimer = 0; EnHorse_SetFollowAnimation(this, play); - this->actor.params = 0; + this->actor.params = HORSE_PTYPE_0; this->cyl1.base.ocFlags1 |= OC1_ON; this->cyl2.base.ocFlags1 |= OC1_ON; this->jntSph.base.ocFlags1 |= OC1_ON; @@ -2397,7 +2400,7 @@ void EnHorse_CutsceneUpdate(EnHorse* this, PlayState* play) { if (play->csCtx.state == 3) { this->playerControlled = 1; - this->actor.params = 10; + this->actor.params = HORSE_PTYPE_10; this->action = ENHORSE_ACT_IDLE; EnHorse_Freeze(this); return; @@ -3592,7 +3595,7 @@ void EnHorse_Update(Actor* thisx, PlayState* play2) { this->stateFlags &= ~ENHORSE_FLAG_24; } - if (play->sceneId == SCENE_GERUDO_VALLEY && !GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) { + if (play->sceneId == SCENE_GERUDO_VALLEY && !GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) { EnHorse_CheckBridgeJumps(this, play); } diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index e4c98beb2e..059cf67682 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -28,7 +28,7 @@ typedef enum EnHorseAction { /* 19 */ ENHORSE_ACT_FLEE_PLAYER } EnHorseAction; - +// stateFlags #define ENHORSE_BOOST (1 << 0) /* 0x1 */ #define ENHORSE_BOOST_DECEL (1 << 1) /* 0x2 */ #define ENHORSE_JUMPING (1 << 2) /* 0x4 */ @@ -90,6 +90,21 @@ typedef enum HorseType { /* 1 */ HORSE_HNI } HorseType; +typedef enum HorseParamType { + /* 00 */ HORSE_PTYPE_0, + /* 01 */ HORSE_PTYPE_1, + /* 02 */ HORSE_PTYPE_INACTIVE, // Waits for Epona's Song to appear + /* 03 */ HORSE_PTYPE_INGO_SPAWNED_RIDING, + /* 04 */ HORSE_PTYPE_4, + /* 05 */ HORSE_PTYPE_5, + /* 06 */ HORSE_PTYPE_6, + /* 07 */ HORSE_PTYPE_7, + /* 08 */ HORSE_PTYPE_HORSEBACK_ARCHERY, + /* 09 */ HORSE_PTYPE_PLAYER_SPAWNED_RIDING, + /* 10 */ HORSE_PTYPE_10, + /* 11 */ HORSE_PTYPE_11 +} HorseParamType; + typedef void (*EnHorsePostdrawFunc)(struct EnHorse*, struct PlayState*); typedef struct EnHorse { diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 839b25df2b..b201607cf4 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -6,8 +6,9 @@ #include "z_en_horse_game_check.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" +#include "line_numbers.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define AT_FINISH_LINE(actor) \ (Math3D_PointInSquare2D(sFinishLine[0], sFinishLine[1], sFinishLine[2], sFinishLine[3], (actor)->world.pos.x, \ @@ -16,15 +17,15 @@ (Math3D_PointInSquare2D(sRanchExit[0], sRanchExit[1], sRanchExit[2], sRanchExit[3], (actor)->world.pos.x, \ (actor)->world.pos.z)) -#define INGORACE_PLAYER_MOVE (1 << 0) -#define INGORACE_SET_TIMER (1 << 1) -#define INGORACE_INGO_MOVE (1 << 2) +#define INGO_RACE_PLAYER_MOVE (1 << 0) +#define INGO_RACE_SET_TIMER (1 << 1) +#define INGO_RACE_INGO_MOVE (1 << 2) typedef enum HorseGameIngoRaceResult { - /* 0 */ INGORACE_NO_RESULT, - /* 1 */ INGORACE_PLAYER_WIN, - /* 2 */ INGORACE_INGO_WIN, - /* 3 */ INGORACE_TIME_UP + /* 0 */ INGO_RACE_NO_RESULT, + /* 1 */ INGO_RACE_PLAYER_WIN, + /* 2 */ INGO_RACE_INGO_WIN, + /* 3 */ INGO_RACE_TIME_UP } HorseGameIngoRaceResult; #define MALONRACE_PLAYER_MOVE (1 << 0) @@ -90,15 +91,12 @@ s32 EnHorseGameCheck_InitIngoRace(EnHorseGameCheckBase* base, PlayState* play) { this->ingoHorse = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -250.0f, 1.0f, -1650.0f, 0, 0x4000, 0, 0x8003); if (this->ingoHorse == NULL) { -#if OOT_VERSION < NTSC_1_1 - LogUtils_HungupThread("../z_en_horse_game_check.c", 382); -#else - LogUtils_HungupThread("../z_en_horse_game_check.c", 385); -#endif + LogUtils_HungupThread("../z_en_horse_game_check.c", LN1(382, 385)); } + this->startTimer = 0; this->finishTimer = 0; - this->result = INGORACE_NO_RESULT; + this->result = INGO_RACE_NO_RESULT; this->playerFinish = 0; this->ingoFinish = 0; @@ -111,24 +109,24 @@ s32 EnHorseGameCheck_DestroyIngoRace(EnHorseGameCheckBase* base, PlayState* play void EnHorseGameCheck_FinishIngoRace(EnHorseGameCheckIngoRace* this, PlayState* play) { gSaveContext.save.cutsceneIndex = 0; - if (this->result == INGORACE_PLAYER_WIN) { + if (this->result == INGO_RACE_PLAYER_WIN) { play->nextEntranceIndex = ENTR_LON_LON_RANCH_7; - if (GET_EVENTINF(EVENTINF_HORSES_06)) { - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_6); - SET_EVENTINF_HORSES_0F(1); + if (GET_EVENTINF(EVENTINF_INGO_RACE_SECOND_RACE)) { + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_TRAPPED_WIN_EPONA); + WRITE_EVENTINF_INGO_RACE_0F(1); play->transitionType = TRANS_TYPE_FADE_WHITE; Environment_ForcePlaySequence(NA_BGM_INGO); } else { - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_4); - SET_EVENTINF_HORSES_0F(1); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_FIRST_WIN); + WRITE_EVENTINF_INGO_RACE_0F(1); Environment_ForcePlaySequence(NA_BGM_INGO); play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); } } else { play->nextEntranceIndex = ENTR_LON_LON_RANCH_8; - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_3); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_PLAYER_LOSE); play->transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST); - SET_EVENTINF_HORSES_0F(1); + WRITE_EVENTINF_INGO_RACE_0F(1); } DREG(25) = 0; play->transitionTrigger = TRANS_TRIGGER_START; @@ -142,20 +140,20 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play) EnHorse* ingoHorse; Player* player2 = player; - if ((this->startTimer > 50) && !(this->startFlags & INGORACE_SET_TIMER)) { - this->startFlags |= INGORACE_SET_TIMER; + if ((this->startTimer > 50) && !(this->startFlags & INGO_RACE_SET_TIMER)) { + this->startFlags |= INGO_RACE_SET_TIMER; Interface_SetTimer(0); - } else if ((this->startTimer > 80) && (player->rideActor != NULL) && !(this->startFlags & INGORACE_PLAYER_MOVE)) { + } else if ((this->startTimer > 80) && (player->rideActor != NULL) && !(this->startFlags & INGO_RACE_PLAYER_MOVE)) { EnHorse* horse; - this->startFlags |= INGORACE_PLAYER_MOVE; + this->startFlags |= INGO_RACE_PLAYER_MOVE; horse = (EnHorse*)player->rideActor; horse->inRace = 1; - } else if ((this->startTimer > 81) && !(this->startFlags & INGORACE_INGO_MOVE)) { + } else if ((this->startTimer > 81) && !(this->startFlags & INGO_RACE_INGO_MOVE)) { ingoHorse = (EnHorse*)this->ingoHorse; ingoHorse->inRace = 1; - this->startFlags |= INGORACE_INGO_MOVE; + this->startFlags |= INGO_RACE_INGO_MOVE; Audio_PlaySfxGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } @@ -180,11 +178,11 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play) } } - if (this->result == INGORACE_NO_RESULT) { + if (this->result == INGO_RACE_NO_RESULT) { if ((player2->rideActor != NULL) && (this->playerCheck[2] == 1) && AT_FINISH_LINE(player2->rideActor)) { this->playerFinish++; if (this->playerFinish > 0) { - this->result = INGORACE_PLAYER_WIN; + this->result = INGO_RACE_PLAYER_WIN; this->finishTimer = 55; SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_HORSE_GOAL); Audio_PlaySfxGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -199,7 +197,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play) if (this->ingoFinish > 0) { ingoHorse = (EnHorse*)this->ingoHorse; - this->result = INGORACE_INGO_WIN; + this->result = INGO_RACE_INGO_WIN; this->finishTimer = 70; ingoHorse->stateFlags |= ENHORSE_INGO_WON; SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_HORSE_GOAL); @@ -212,12 +210,12 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play) } if (((player2->rideActor != NULL) && AT_RANCH_EXIT(player2->rideActor)) || AT_RANCH_EXIT(&player2->actor)) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_HORSE_GOAL); - this->result = INGORACE_INGO_WIN; + this->result = INGO_RACE_INGO_WIN; this->finishTimer = 20; } if ((gSaveContext.timerSeconds >= 180) && (this->startFlags & 2)) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_HORSE_GOAL); - this->result = INGORACE_TIME_UP; + this->result = INGO_RACE_TIME_UP; this->finishTimer = 20; } } else { @@ -449,7 +447,8 @@ void EnHorseGameCheck_Init(Actor* thisx, PlayState* play) { s32 pad; EnHorseGameCheckBase* this = (EnHorseGameCheckBase*)thisx; - if ((play->sceneId == SCENE_LON_LON_RANCH) && (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || DREG(1))) { + if ((play->sceneId == SCENE_LON_LON_RANCH) && + (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED)) { this->actor.params = HORSEGAME_MALON_RACE; } if (sInitFuncs[this->actor.params] != NULL) { diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 0612993947..0ce01f2d6e 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -7,7 +7,7 @@ #include "z_en_horse_ganon.h" #include "assets/objects/object_horse_ganon/object_horse_ganon.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef struct unk_D_80A69248 { /* 0x0 */ Vec3s unk_0; @@ -102,7 +102,7 @@ static unk_D_80A69248 D_80A69248[] = { static s32 D_80A692B8[] = { 0, 16 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; static EnHorseGanonActionFunc sActionFuncs[] = { func_80A68AF0, func_80A68DB0 }; diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index c23c2a68de..755916a390 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -4,10 +4,21 @@ * Description: Young Epona */ +#include "global.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rand.h" +#include "regs.h" +#include "sfx.h" +#include "z64actor.h" +#include "z64horse.h" +#include "z64player.h" +#include "z64play.h" #include "z_en_horse_link_child.h" #include "assets/objects/object_horse_link_child/object_horse_link_child.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnHorseLinkChild_Init(Actor* thisx, PlayState* play); void EnHorseLinkChild_Destroy(Actor* thisx, PlayState* play); @@ -136,7 +147,7 @@ f32 func_80A695A4(EnHorseLinkChild* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; void EnHorseLinkChild_Init(Actor* thisx, PlayState* play) { @@ -451,7 +462,7 @@ void func_80A6A5A4(EnHorseLinkChild* this, PlayState* play) { yawDiff = Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor) - this->actor.world.rot.y; // 0.7071 = cos(pi/4) if ((Math_CosS(yawDiff) < 0.7071f) && (this->animationIdx == 2)) { - func_8006DD9C(&this->actor, &GET_PLAYER(play)->actor.world.pos, 300); + Horse_RotateToPoint(&this->actor, &GET_PLAYER(play)->actor.world.pos, 300); } if (SkelAnime_Update(&this->skin.skelAnime)) { @@ -488,9 +499,9 @@ void func_80A6A7D0(EnHorseLinkChild* this, PlayState* play) { if ((this->animationIdx == 4) || (this->animationIdx == 3) || (this->animationIdx == 2)) { if (!this->unk_1E8) { - func_8006DD9C(&this->actor, &player->actor.world.pos, 300); + Horse_RotateToPoint(&this->actor, &player->actor.world.pos, 300); } else { - func_8006DD9C(&this->actor, &this->actor.home.pos, 300); + Horse_RotateToPoint(&this->actor, &this->actor.home.pos, 300); } } diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h index a61248c70a..3ad5a449af 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h @@ -2,11 +2,12 @@ #define Z_EN_HORSE_LINK_CHILD_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" +#include "z64skin.h" struct EnHorseLinkChild; -typedef void (*EnHorseLinkChildActionFunc)(struct EnHorseLinkChild*, PlayState*); +typedef void (*EnHorseLinkChildActionFunc)(struct EnHorseLinkChild*, struct PlayState*); typedef struct EnHorseLinkChild { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 79e8998762..c760dc54d7 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -177,8 +177,8 @@ f32 func_80A6B30C(EnHorseNormal* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; void EnHorseNormal_Init(Actor* thisx, PlayState* play) { @@ -216,7 +216,7 @@ void EnHorseNormal_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->actor); return; } - } else if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || (DREG(1) != 0)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED) { if (this->actor.world.rot.z != 7) { Actor_Kill(&this->actor); return; @@ -276,7 +276,7 @@ void EnHorseNormal_Destroy(Actor* thisx, PlayState* play) { } void func_80A6B91C(EnHorseNormal* this, PlayState* play) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->action = HORSE_FOLLOW_PATH; this->animationIdx = 6; this->waypoint = 0; @@ -520,7 +520,7 @@ void func_80A6C6B0(EnHorseNormal* this) { this->unk_218 = 0.0f; this->unk_21C = 0; this->unk_21E = 0; - this->actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f, Animation_GetLastFrame(sAnimations[this->animationIdx]), ANIMMODE_ONCE, 0.0f); } diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index dd8068cd2c..04b7b19336 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -7,7 +7,7 @@ #include "z_en_horse_zelda.h" #include "assets/objects/object_horse_zelda/object_horse_zelda.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnHorseZelda_Init(Actor* thisx, PlayState* play); void EnHorseZelda_Destroy(Actor* thisx, PlayState* play); @@ -97,7 +97,7 @@ static HorsePosSpeed sHorseFieldPositions[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; static EnHorseZeldaActionFunc sActionFuncs[] = { diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index b5c521da2d..66d12bafb2 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -206,7 +206,7 @@ void func_80A6E9AC(EnHs* this, PlayState* play) { s16 yawDiff; if (Actor_TalkOfferAccepted(&this->actor, play)) { - if (func_8002F368(play) == EXCH_ITEM_COJIRO) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_COJIRO) { player->actor.textId = 0x10B2; func_80A6E3A0(this, func_80A6E8CC); Animation_Change(&this->skelAnime, &object_hs_Anim_000304, 1.0f, 0.0f, diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index b861717e86..2aa163d0fb 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -16,7 +16,7 @@ #include "assets/objects/object_cob/object_cob.h" #include "assets/objects/object_os_anime/object_os_anime.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnHy_Init(Actor* thisx, PlayState* play); void EnHy_Destroy(Actor* thisx, PlayState* play); @@ -605,7 +605,7 @@ u16 EnHy_GetTextId(PlayState* play, Actor* thisx) { switch (ENHY_GET_TYPE(&this->actor)) { case ENHY_TYPE_DOG_LADY: if (play->sceneId == SCENE_KAKARIKO_CENTER_GUEST_HOUSE) { - return (this->talonEventChkInf & EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_MASK) + return (this->talonEventChkInf & EVENTCHKINF_MASK(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) ? 0x508D : (GET_INFTABLE(INFTABLE_CB) ? 0x508C : 0x508B); } else if (play->sceneId == SCENE_MARKET_DAY) { @@ -738,7 +738,7 @@ u16 EnHy_GetTextId(PlayState* play, Actor* thisx) { if (!LINK_IS_ADULT) { return GET_EVENTCHKINF(EVENTCHKINF_80) ? 0x505F : (GET_INFTABLE(INFTABLE_163) ? 0x505E : 0x505D); } else { - return (this->talonEventChkInf & EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_MASK) + return (this->talonEventChkInf & EVENTCHKINF_MASK(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) ? 0x5062 : (GET_INFTABLE(INFTABLE_164) ? 0x5061 : 0x5060); } @@ -957,7 +957,7 @@ void EnHy_OfferBuyBottledItem(EnHy* this, PlayState* play) { if (ENHY_GET_TYPE(&this->actor) == ENHY_TYPE_BEGGAR) { if (!Inventory_HasSpecificBottle(ITEM_BOTTLE_BLUE_FIRE) && !Inventory_HasSpecificBottle(ITEM_BOTTLE_BUG) && !Inventory_HasSpecificBottle(ITEM_BOTTLE_FISH)) { - switch (func_8002F368(play)) { + switch (Actor_GetPlayerExchangeItemId(play)) { case EXCH_ITEM_BOTTLE_POE: case EXCH_ITEM_BOTTLE_BIG_POE: case EXCH_ITEM_BOTTLE_RUTOS_LETTER: @@ -971,7 +971,7 @@ void EnHy_OfferBuyBottledItem(EnHy* this, PlayState* play) { break; } } else { - switch (func_8002F368(play)) { + switch (Actor_GetPlayerExchangeItemId(play)) { case EXCH_ITEM_BOTTLE_BLUE_FIRE: this->actor.textId = 0x70F0; break; @@ -1160,12 +1160,12 @@ void EnHy_WaitForObjects(EnHy* this, PlayState* play) { Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, sModelInfo[ENHY_GET_TYPE(&this->actor)].animInfoIndex); if ((play->sceneId == SCENE_BACK_ALLEY_DAY) || (play->sceneId == SCENE_MARKET_DAY)) { - this->actor.flags &= ~ACTOR_FLAG_4; - this->actor.uncullZoneScale = 0.0f; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.cullingVolumeScale = 0.0f; } if (play->sceneId == SCENE_KAKARIKO_CENTER_GUEST_HOUSE) { - this->talonEventChkInf = gSaveContext.save.info.eventChkInf[EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO_INDEX]; + this->talonEventChkInf = gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_TALON_RETURNED_FROM_KAKARIKO]; } EnHy_InitSetProperties(this); diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 386b8c5e26..a0fc6e7bde 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -79,21 +79,21 @@ static ColliderCylinderInit sCylinderInitDroppedFlame = { static InitChainEntry sInitChainCapturableFlame[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_0, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 60, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static InitChainEntry sInitChainDroppedFlame[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static InitChainEntry sInitChainSmallFlame[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; f32 EnIceHono_XZDistanceSquared(Vec3f* v1, Vec3f* v2) { diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 223b2a515c..e95e5d4fac 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -10,7 +10,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef void (*EnIkDrawFunc)(struct EnIk*, PlayState*); @@ -1528,7 +1528,7 @@ void EnIk_StartDefeatCutscene(Actor* thisx, PlayState* play) { Cutscene_SetScript(play, gSpiritBossNabooruKnuckleDefeatCs); gSaveContext.cutsceneTrigger = 1; Actor_SetScale(&this->actor, 0.01f); - SET_EVENTCHKINF(EVENTCHKINF_3C); + SET_EVENTCHKINF(EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE); EnIk_SetupCsAction3(this, play); } } @@ -1537,7 +1537,8 @@ void EnIk_Init(Actor* thisx, PlayState* play) { EnIk* this = (EnIk*)thisx; s32 upperParams = IK_GET_UPPER_PARAMS(&this->actor); - if (((IK_GET_ARMOR_TYPE(&this->actor) == IK_TYPE_NABOORU) && GET_EVENTCHKINF(EVENTCHKINF_3C)) || + if (((IK_GET_ARMOR_TYPE(&this->actor) == IK_TYPE_NABOORU) && + GET_EVENTCHKINF(EVENTCHKINF_DEFEATED_NABOORU_KNUCKLE)) || (upperParams != 0 && Flags_GetSwitch(play, upperParams >> 8))) { Actor_Kill(&this->actor); } else { diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index acb7c46e39..7ce346f633 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -3,7 +3,7 @@ #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #include "assets/objects/object_in/object_in.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnIn_Init(Actor* thisx, PlayState* play); void EnIn_Destroy(Actor* thisx, PlayState* play); @@ -72,6 +72,14 @@ typedef enum EnInAnimation { /* 9 */ ENIN_ANIM_9 } EnInAnimation; +typedef enum EnInStartMode { + /* 0 */ ENIN_START_MODE_0, + /* 1 */ ENIN_START_MODE_1, + /* 2 */ ENIN_START_MODE_2, + /* 3 */ ENIN_START_MODE_3, + /* 4 */ ENIN_START_MODE_4 +} EnInStartMode; + static AnimationFrameCountInfo sAnimationInfo[] = { { &object_in_Anim_001CC0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_001CC0, 1.0f, ANIMMODE_LOOP, -10.0f }, { &object_in_Anim_013C6C, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_013C6C, 1.0f, ANIMMODE_LOOP, -10.0f }, @@ -140,8 +148,8 @@ u16 EnIn_GetTextIdAdult(PlayState* play) { if (IS_NIGHT) { return 0x204E; } - switch (GET_EVENTINF_HORSES_STATE()) { - case EVENTINF_HORSES_STATE_1: + switch (GET_EVENTINF_INGO_RACE_STATE()) { + case INGO_RACE_STATE_HORSE_RENTAL_PERIOD: if (!(player->stateFlags1 & PLAYER_STATE1_23)) { return 0x2036; } else if (GET_EVENTCHKINF(EVENTCHKINF_1B)) { @@ -153,24 +161,27 @@ u16 EnIn_GetTextIdAdult(PlayState* play) { } else { return 0x2037; } - case EVENTINF_HORSES_STATE_3: - if (GET_EVENTINF(EVENTINF_HORSES_06) || GET_EVENTINF(EVENTINF_HORSES_05)) { + case INGO_RACE_STATE_PLAYER_LOSE: + if (GET_EVENTINF(EVENTINF_INGO_RACE_SECOND_RACE) || GET_EVENTINF(EVENTINF_INGO_RACE_LOST_ONCE)) { return 0x203E; } else { return 0x203D; } - case EVENTINF_HORSES_STATE_4: + case INGO_RACE_STATE_FIRST_WIN: return 0x203A; - case EVENTINF_HORSES_STATE_5: - case EVENTINF_HORSES_STATE_6: + case INGO_RACE_STATE_TRAPPED_WIN_UNUSED: + case INGO_RACE_STATE_TRAPPED_WIN_EPONA: return 0x203C; - case EVENTINF_HORSES_STATE_7: + case INGO_RACE_STATE_REMATCH: + // Ask to race again after losing race return 0x205B; - case EVENTINF_HORSES_STATE_2: + case INGO_RACE_STATE_RACING: default: if (GET_INFTABLE(INFTABLE_9A)) { + // Pay to Ride return 0x2031; } else { + // Adult Ingo first dialog, branches to pay to ride return 0x2030; } } @@ -256,9 +267,9 @@ s16 EnIn_UpdateTalkStateOnChoice(PlayState* play, Actor* thisx) { talkState = NPC_TALK_STATE_ACTION; } else { Message_ContinueTextbox(play, this->actor.textId = 0x2039); - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_0); - CLEAR_EVENTINF(EVENTINF_HORSES_05); - CLEAR_EVENTINF(EVENTINF_HORSES_06); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_OFFER_RENTAL); + CLEAR_EVENTINF(EVENTINF_INGO_RACE_LOST_ONCE); + CLEAR_EVENTINF(EVENTINF_INGO_RACE_SECOND_RACE); this->actionFunc = func_80A7A4C8; } break; @@ -361,40 +372,40 @@ s32 func_80A7975C(EnIn* this, PlayState* play) { return 1; } -s32 func_80A79830(EnIn* this, PlayState* play) { +s32 EnIn_GetStartMode(EnIn* this, PlayState* play) { if (play->sceneId == SCENE_LON_LON_RANCH && LINK_IS_CHILD && IS_DAY && this->actor.shape.rot.z == 1 && !GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { - return 1; + return ENIN_START_MODE_1; } if (play->sceneId == SCENE_STABLE && LINK_IS_CHILD && IS_DAY && this->actor.shape.rot.z == 3 && GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { - return 1; + return ENIN_START_MODE_1; } if (play->sceneId == SCENE_STABLE && LINK_IS_CHILD && IS_NIGHT) { if ((this->actor.shape.rot.z == 2) && !GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { - return 1; + return ENIN_START_MODE_1; } if ((this->actor.shape.rot.z == 4) && GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { - return 1; + return ENIN_START_MODE_1; } } if (play->sceneId == SCENE_LON_LON_RANCH && LINK_IS_ADULT && IS_DAY) { if ((this->actor.shape.rot.z == 5) && !GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) { - return 2; + return ENIN_START_MODE_2; } if ((this->actor.shape.rot.z == 7) && GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) { - return 4; + return ENIN_START_MODE_4; } } if (play->sceneId == SCENE_LON_LON_BUILDINGS && LINK_IS_ADULT && IS_NIGHT) { if (this->actor.shape.rot.z == 6 && !GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) { - return 3; + return ENIN_START_MODE_3; } if (this->actor.shape.rot.z == 8 && GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) { - return 3; + return ENIN_START_MODE_3; } } - return 0; + return ENIN_START_MODE_0; } void EnIn_UpdateEyes(EnIn* this) { @@ -434,7 +445,7 @@ void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) { Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_8); Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_NOTHING); if (index == 0) { - AREG(6) = 0; + R_EXITED_SCENE_RIDING_HORSE = false; } gSaveContext.timerState = TIMER_STATE_OFF; } @@ -489,7 +500,7 @@ void EnIn_Init(Actor* thisx, PlayState* play) { respawnPos = respawn->pos; // hardcoded coords for lon lon entrance if (D_80A7B998 == 0 && respawnPos.x == 1107.0f && respawnPos.y == 0.0f && respawnPos.z == -3740.0f) { - gSaveContext.eventInf[EVENTINF_HORSES_INDEX] = 0; + gSaveContext.eventInf[EVENTINF_INDEX_HORSES] = 0; D_80A7B998 = 1; } this->actionFunc = EnIn_WaitForObject; @@ -506,7 +517,7 @@ void EnIn_Destroy(Actor* thisx, PlayState* play) { // This function does not actually wait since it waits for OBJECT_IN, // but the object is already loaded at this point from being set in the ActorProfile data void EnIn_WaitForObject(EnIn* this, PlayState* play) { - s32 sp3C = 0; + s32 staySpawned = false; if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot) || this->actor.params <= 0) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); @@ -515,7 +526,7 @@ void EnIn_WaitForObject(EnIn* this, PlayState* play) { Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit); if (func_80A7975C(this, play)) { - SET_EVENTINF_HORSES_0F(0); + WRITE_EVENTINF_INGO_RACE_0F(0); return; } Actor_SetScale(&this->actor, 0.01f); @@ -523,83 +534,83 @@ void EnIn_WaitForObject(EnIn* this, PlayState* play) { this->interactInfo.talkState = NPC_TALK_STATE_IDLE; this->actionFunc = func_80A7A4BC; - switch (func_80A79830(this, play)) { - case 1: + switch (EnIn_GetStartMode(this, play)) { + case ENIN_START_MODE_1: EnIn_ChangeAnim(this, ENIN_ANIM_9); this->actionFunc = func_80A7A4BC; break; - case 3: + case ENIN_START_MODE_3: EnIn_ChangeAnim(this, ENIN_ANIM_7); this->actionFunc = func_80A7A4BC; if (!GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) { this->actor.params = 5; } break; - case 4: + case ENIN_START_MODE_4: EnIn_ChangeAnim(this, ENIN_ANIM_8); this->eyeIndex = 3; this->actionFunc = func_80A7A4BC; break; - case 0: + case ENIN_START_MODE_0: Actor_Kill(&this->actor); break; - default: - switch (GET_EVENTINF_HORSES_STATE()) { - case EVENTINF_HORSES_STATE_0: - case EVENTINF_HORSES_STATE_2: - case EVENTINF_HORSES_STATE_3: - case EVENTINF_HORSES_STATE_4: - case EVENTINF_HORSES_STATE_7: + default: // ENIN_START_MODE_2 + switch (GET_EVENTINF_INGO_RACE_STATE()) { + case INGO_RACE_STATE_OFFER_RENTAL: + case INGO_RACE_STATE_RACING: + case INGO_RACE_STATE_PLAYER_LOSE: + case INGO_RACE_STATE_FIRST_WIN: + case INGO_RACE_STATE_REMATCH: if (this->actor.params == 2) { - sp3C = 1; + staySpawned = true; } break; - case EVENTINF_HORSES_STATE_1: + case INGO_RACE_STATE_HORSE_RENTAL_PERIOD: if (this->actor.params == 3) { - sp3C = 1; + staySpawned = true; } break; - case EVENTINF_HORSES_STATE_5: - case EVENTINF_HORSES_STATE_6: + case INGO_RACE_STATE_TRAPPED_WIN_UNUSED: + case INGO_RACE_STATE_TRAPPED_WIN_EPONA: if (this->actor.params == 4) { - sp3C = 1; + staySpawned = true; } break; } - if (sp3C != 1) { + if (staySpawned != true) { Actor_Kill(&this->actor); return; } - switch (GET_EVENTINF_HORSES_STATE()) { - case EVENTINF_HORSES_STATE_0: - case EVENTINF_HORSES_STATE_2: + switch (GET_EVENTINF_INGO_RACE_STATE()) { + case INGO_RACE_STATE_OFFER_RENTAL: + case INGO_RACE_STATE_RACING: EnIn_ChangeAnim(this, ENIN_ANIM_2); this->actionFunc = func_80A7A4C8; - gSaveContext.eventInf[EVENTINF_HORSES_INDEX] = 0; + gSaveContext.eventInf[EVENTINF_INDEX_HORSES] = 0; break; - case EVENTINF_HORSES_STATE_1: + case INGO_RACE_STATE_HORSE_RENTAL_PERIOD: this->actor.attentionRangeType = ATTENTION_RANGE_3; EnIn_ChangeAnim(this, ENIN_ANIM_2); this->actionFunc = func_80A7A568; Interface_SetTimer(60); break; - case EVENTINF_HORSES_STATE_3: + case INGO_RACE_STATE_PLAYER_LOSE: EnIn_ChangeAnim(this, ENIN_ANIM_4); this->actionFunc = func_80A7A770; break; - case EVENTINF_HORSES_STATE_4: + case INGO_RACE_STATE_FIRST_WIN: EnIn_ChangeAnim(this, ENIN_ANIM_6); this->unk_1EC = 8; this->actionFunc = func_80A7A940; break; - case EVENTINF_HORSES_STATE_5: - case EVENTINF_HORSES_STATE_6: + case INGO_RACE_STATE_TRAPPED_WIN_UNUSED: + case INGO_RACE_STATE_TRAPPED_WIN_EPONA: this->actor.attentionRangeType = ATTENTION_RANGE_3; EnIn_ChangeAnim(this, ENIN_ANIM_6); this->unk_1EC = 8; this->actionFunc = func_80A7AA40; break; - case EVENTINF_HORSES_STATE_7: + case INGO_RACE_STATE_REMATCH: EnIn_ChangeAnim(this, ENIN_ANIM_2); this->actionFunc = func_80A7A848; break; @@ -640,8 +651,8 @@ void func_80A7A4BC(EnIn* this, PlayState* play) { void func_80A7A4C8(EnIn* this, PlayState* play) { if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) { func_80A79BAC(this, play, 1, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)); - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_1); - SET_EVENTINF_HORSES_0F(1); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_HORSE_RENTAL_PERIOD); + WRITE_EVENTINF_INGO_RACE_0F(1); CLEAR_INFTABLE(INFTABLE_A2); Environment_ForcePlaySequence(NA_BGM_HORSE); play->msgCtx.stateTimer = 0; @@ -672,8 +683,8 @@ void func_80A7A568(EnIn* this, PlayState* play) { this->interactInfo.talkState = NPC_TALK_STATE_IDLE; return; } - SET_EVENTINF_HORSES_HORSETYPE(((EnHorse*)GET_PLAYER(play)->rideActor)->type); - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_2); + WRITE_EVENTINF_INGO_RACE_HORSETYPE(((EnHorse*)GET_PLAYER(play)->rideActor)->type); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_RACING); phi_a2 = 2; transitionType = TRANS_TYPE_FADE_BLACK; } else { @@ -685,13 +696,13 @@ void func_80A7A568(EnIn* this, PlayState* play) { SET_INFTABLE(INFTABLE_AB); } } - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_0); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_OFFER_RENTAL); phi_a2 = 0; transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST); } func_80A79BAC(this, play, phi_a2, transitionType); play->msgCtx.stateTimer = 0; - SET_EVENTINF_HORSES_0F(1); + WRITE_EVENTINF_INGO_RACE_0F(1); play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; this->interactInfo.talkState = NPC_TALK_STATE_IDLE; } @@ -705,11 +716,10 @@ void func_80A7A770(EnIn* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; EnIn_ChangeAnim(this, ENIN_ANIM_3); this->actionFunc = func_80A7A848; - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_7); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_REMATCH); this->interactInfo.talkState = NPC_TALK_STATE_IDLE; - gSaveContext.eventInf[EVENTINF_HORSES_INDEX] = - (gSaveContext.eventInf[EVENTINF_HORSES_INDEX] & 0xFFFF) | EVENTINF_HORSES_05_MASK; - if (!GET_EVENTINF(EVENTINF_HORSES_06)) { + SET_EVENTINF_INGO_RACE_FLAG(EVENTINF_INGO_RACE_LOST_ONCE); + if (!GET_EVENTINF(EVENTINF_INGO_RACE_SECOND_RACE)) { play->msgCtx.stateTimer = 4; play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; } @@ -720,18 +730,18 @@ void func_80A7A848(EnIn* this, PlayState* play) { if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) { if ((play->msgCtx.choiceIndex == 0 && gSaveContext.save.info.playerData.rupees < 50) || play->msgCtx.choiceIndex == 1) { - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_0); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_OFFER_RENTAL); this->actionFunc = func_80A7A4C8; } else { func_80A79BAC(this, play, 2, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST)); - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_2); - SET_EVENTINF_HORSES_0F(1); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_RACING); + WRITE_EVENTINF_INGO_RACE_0F(1); play->msgCtx.stateTimer = 0; play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; } this->interactInfo.talkState = NPC_TALK_STATE_IDLE; - CLEAR_EVENTINF(EVENTINF_HORSES_05); - CLEAR_EVENTINF(EVENTINF_HORSES_06); + CLEAR_EVENTINF(EVENTINF_INGO_RACE_LOST_ONCE); + CLEAR_EVENTINF(EVENTINF_INGO_RACE_SECOND_RACE); } } @@ -749,13 +759,12 @@ void func_80A7A940(EnIn* this, PlayState* play) { if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) { this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; func_80A79BAC(this, play, 2, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST)); - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_2); - SET_EVENTINF_HORSES_0F(1); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_RACING); + WRITE_EVENTINF_INGO_RACE_0F(1); play->msgCtx.stateTimer = 0; play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; this->interactInfo.talkState = NPC_TALK_STATE_IDLE; - gSaveContext.eventInf[EVENTINF_HORSES_INDEX] = - (gSaveContext.eventInf[EVENTINF_HORSES_INDEX] & 0xFFFF) | EVENTINF_HORSES_06_MASK; + SET_EVENTINF_INGO_RACE_FLAG(EVENTINF_INGO_RACE_SECOND_RACE); } } @@ -904,8 +913,8 @@ void func_80A7B024(EnIn* this, PlayState* play) { } func_80A79BAC(this, play, 0, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST)); - SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_0); - SET_EVENTINF_HORSES_0F(1); + SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_OFFER_RENTAL); + WRITE_EVENTINF_INGO_RACE_0F(1); play->msgCtx.stateTimer = 4; play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; this->interactInfo.talkState = NPC_TALK_STATE_IDLE; @@ -925,7 +934,7 @@ void EnIn_Update(Actor* thisx, PlayState* play) { if (this->actionFunc != func_80A7A304) { SkelAnime_Update(&this->skelAnime); if (this->skelAnime.animation == &object_in_Anim_001BE0 && - GET_EVENTINF_HORSES_STATE() != EVENTINF_HORSES_STATE_6) { + GET_EVENTINF_INGO_RACE_STATE() != INGO_RACE_STATE_TRAPPED_WIN_EPONA) { func_80A79690(&this->skelAnime, this, play); } Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2); diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 991c9de3ca..5fcc053a69 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -94,9 +94,9 @@ static u16 sInitInsectFlags[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 20, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 20, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 600, ICHAIN_STOP), }; void EnInsect_InitFlags(EnInsect* this) { @@ -203,7 +203,7 @@ void EnInsect_Init(Actor* thisx, PlayState* play2) { if (this->insectFlags & INSECT_FLAG_IS_SHORT_LIVED) { this->lifeTimer = Rand_S16Offset(200, 40); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } if (type == INSECT_TYPE_FIRST_DROPPED || type == INSECT_TYPE_EXTRA_DROPPED) { diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index e0e0dc1d50..b0f3dc5473 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -293,16 +293,16 @@ static InitChainEntry sInitChains[][5] = { { ICHAIN_F32_DIV1000(gravity, -1200, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }, { ICHAIN_F32_DIV1000(gravity, -2500, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }, }; @@ -312,7 +312,7 @@ void EnIshi_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChains[type]); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } if (this->actor.shape.rot.y == 0) { this->actor.shape.rot.y = this->actor.world.rot.y = Rand_ZeroFloat(0x10000); @@ -382,7 +382,7 @@ void EnIshi_Wait(EnIshi* this, PlayState* play) { void EnIshi_SetupLiftedUp(EnIshi* this) { this->actionFunc = EnIshi_LiftedUp; this->actor.room = -1; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void EnIshi_LiftedUp(EnIshi* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 999e97cd24..a03c20c9ea 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -8,7 +8,7 @@ #include "assets/objects/object_jj/object_jj.h" #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum EnJjEyeState { /* 0 */ JABUJABU_EYE_OPEN, @@ -68,9 +68,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 87, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 3300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 3300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_STOP), }; void EnJj_SetupAction(EnJj* this, EnJjActionFunc actionFunc) { @@ -96,7 +96,7 @@ void EnJj_Init(Actor* thisx, PlayState* play2) { this->extraBlinkCounter = 0; this->extraBlinkTotal = 0; - if (GET_EVENTCHKINF(EVENTCHKINF_3A)) { // Fish given + if (GET_EVENTCHKINF(EVENTCHKINF_OPENED_JABU_JABU)) { EnJj_SetupAction(this, EnJj_WaitToOpenMouth); } else { EnJj_SetupAction(this, EnJj_WaitForFish); @@ -214,11 +214,11 @@ void EnJj_BeginCutscene(EnJj* this, PlayState* play) { this->cutsceneCountdownTimer--; } else { EnJj_SetupAction(this, EnJj_RemoveDust); - play->csCtx.script = D_80A88164; + play->csCtx.script = gJabuInhalingCs; gSaveContext.cutsceneTrigger = 1; DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId); Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); - SET_EVENTCHKINF(EVENTCHKINF_3A); + SET_EVENTCHKINF(EVENTCHKINF_OPENED_JABU_JABU); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } } diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c index 14331f81d8..0cf56d63e6 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c @@ -2,25 +2,25 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_80A88164[] = { - CS_BEGIN_CUTSCENE(26, 1629), +static CutsceneData gJabuInhalingCs[] = { + CS_HEADER(26, 1629), CS_PLAYER_CUE_LIST(4), CS_PLAYER_CUE(PLAYER_CUEID_5, 0, 240, 0x0000, 0x4000, 0x0000, -1732, 52, -44, -1732, 52, -44, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_3, 240, 255, 0x0000, 0x4000, 0x0000, -1732, 52, -44, -1732, 52, -44, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_6, 255, 285, 0x0000, 0x4000, 0x0000, -1732, 52, -44, -1732, 52, -44, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_32, 285, 300, 0x0000, 0xC000, 0x0000, -1732, 52, -44, -1537, 109, -44, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_ACTOR_CUE_LIST(68, 4), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_7, 4), CS_ACTOR_CUE(0x0001, 0, 234, 0x0000, 0x4000, 0x0000, -1665, 52, -44, -1665, 52, -44, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_ACTOR_CUE(0x0002, 234, 241, 0x41F8, 0x0000, 0x0000, -1665, 52, -44, -1603, 130, -47, CS_FLOAT(0x410DB6DB, 8.857142f), CS_FLOAT(0x41324925, 11.142858f), CS_FLOAT(0xC10DB6DB, -8.857142f)), CS_ACTOR_CUE(0x0002, 241, 280, 0x4031, 0x0000, 0x0000, -1603, 130, -47, -549, 130, -52, CS_FLOAT(0x41D83483, 27.02564f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xC1D83483, -27.02564f)), CS_ACTOR_CUE(0x0003, 280, 300, 0x0000, 0x0000, 0x0000, -549, 130, -52, -549, 130, -52, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(67, 5), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_2_4, 5), CS_ACTOR_CUE(0x0001, 0, 93, 0x0000, 0x0000, 0x0000, 0, 51, 124, 0, 51, 124, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0003, 93, 121, 0x0000, 0x0000, 0x0000, 0, 51, 124, 0, 51, 124, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0001, 121, 146, 0x0000, 0x0000, 0x0000, 0, 51, 124, 0, 51, 124, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 146, 241, 0x0000, 0x0000, 0x0000, 0, 51, 124, 0, 51, 124, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0001, 241, 441, 0x0000, 0x0000, 0x0000, 0, 51, 124, 0, 51, 124, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(69, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_2_5, 3), CS_ACTOR_CUE(0x0001, 0, 90, 0x0000, 0x0000, 0x0000, 0, -33, 9, 0, -33, 9, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 90, 330, 0x0000, 0x0000, 0x0000, 0, -33, 9, 0, -62, 22, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBDF77777, -0.12083333f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0003, 330, 380, 0x0000, 0x0000, 0x0000, 0, -62, 22, 0, -62, 22, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -151,8 +151,8 @@ static CutsceneData D_80A88164[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1721, 82, -42, 0x0000), CS_TRANSITION(CS_TRANS_BLACK_FILL_IN, 335, 342), CS_DESTINATION(CS_DEST_JABU_JABU, 345, 395), - CS_ACTOR_CUE_LIST(62, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 1), CS_ACTOR_CUE(0x0001, 305, 494, 0x0000, 0x0000, 0x0000, -1399, 452, -53, -1399, 452, -53, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 0a496cfc39..8a6c5c39ef 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -8,9 +8,9 @@ #include "terminal.h" #include "assets/objects/object_ka/object_ka.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ - ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) static ColliderCylinderInit sCylinderInit = { { diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index a1a0369a4a..d3dce9d5aa 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -10,7 +10,7 @@ #include "assets/objects/object_kanban/object_kanban.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define PART_UPPER_LEFT (1 << 0) #define PART_LEFT_UPPER (1 << 1) diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index f17108e82e..cdba59e661 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -178,7 +178,7 @@ void EnKarebaba_SetupDying(EnKarebaba* this) { this->actor.world.rot.y = this->actor.shape.rot.y + 0x8000; this->actor.speed = 3.0f; Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_JR_DEAD); - this->actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnKarebaba_Dying; } @@ -191,7 +191,7 @@ void EnKarebaba_SetupDeadItemDrop(EnKarebaba* this, PlayState* play) { this->actor.shape.shadowScale = 3.0f; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_MISC); this->actor.params = 200; - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnKarebaba_DeadItemDrop; } @@ -399,7 +399,7 @@ void EnKarebaba_Regrow(EnKarebaba* this, PlayState* play) { this->actor.world.pos.y = this->actor.home.pos.y + (14.0f * scaleFactor); if (this->actor.params == 20) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); EnKarebaba_SetupIdle(this); diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 0eca2870da..b9013cbbe1 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -12,7 +12,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define ENKO_TYPE PARAMS_GET_S(this->actor.params, 0, 8) #define ENKO_PATH PARAMS_GET_S(this->actor.params, 8, 8) @@ -991,7 +991,7 @@ void func_80A9877C(EnKo* this, PlayState* play) { ENKO_TYPE == ENKO_TYPE_CHILD_FADO && play->sceneId == SCENE_LOST_WOODS) { this->actor.textId = INV_CONTENT(ITEM_TRADE_ADULT) > ITEM_ODD_POTION ? 0x10B9 : 0x10DF; - if (func_8002F368(play) == EXCH_ITEM_ODD_POTION) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_ODD_POTION) { #if OOT_VERSION < NTSC_1_1 this->actor.textId = GET_INFTABLE(INFTABLE_B6) ? 0x10B8 : 0x10B7; #else @@ -1172,7 +1172,7 @@ void EnKo_Destroy(Actor* thisx, PlayState* play) { void func_80A99048(EnKo* this, PlayState* play) { if (EnKo_IsOsAnimeLoaded(this, play) && EnKo_AreObjectsLoaded(this, play)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->legsObjectSlot; gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[this->actor.objectSlot].segment); SkelAnime_InitFlex(play, &this->skelAnime, sSkeleton[sModelInfo[ENKO_TYPE].legsId].flexSkeletonHeader, NULL, diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 5f865d2387..0d938f45c6 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -12,7 +12,7 @@ #include "assets/objects/object_kusa/object_kusa.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnKusa_Init(Actor* thisx, PlayState* play); void EnKusa_Destroy(Actor* thisx, PlayState* play2); @@ -88,8 +88,8 @@ static s16 sFragmentScales[] = { 108, 102, 96, 84, 66, 55, 42, 38 }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -3200, ICHAIN_CONTINUE), - ICHAIN_F32_DIV1000(minVelocityY, -17000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 120, ICHAIN_STOP), + ICHAIN_F32_DIV1000(minVelocityY, -17000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 120, ICHAIN_STOP), }; void EnKusa_SetupAction(EnKusa* this, EnKusaActionFunc actionFunc) { @@ -234,7 +234,7 @@ void EnKusa_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } EnKusa_InitCollider(thisx, play); @@ -286,13 +286,13 @@ void EnKusa_WaitForObject(EnKusa* this, PlayState* play) { this->actor.draw = EnKusa_Draw; this->actor.objectSlot = this->requiredObjectSlot; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } void EnKusa_SetupMain(EnKusa* this) { EnKusa_SetupAction(this, EnKusa_Main); - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void EnKusa_Main(EnKusa* this, PlayState* play) { @@ -340,7 +340,7 @@ void EnKusa_Main(EnKusa* this, PlayState* play) { void EnKusa_SetupLiftedUp(EnKusa* this) { EnKusa_SetupAction(this, EnKusa_LiftedUp); this->actor.room = -1; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void EnKusa_LiftedUp(EnKusa* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 18ea64aa3e..a4aaf4e1ca 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -74,7 +74,7 @@ u16 EnKz_GetTextIdChild(PlayState* play, EnKz* this) { if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) { return 0x402B; - } else if (GET_EVENTCHKINF(EVENTCHKINF_33)) { + } else if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) { return 0x401C; } else { player->exchangeItemId = EXCH_ITEM_BOTTLE_RUTOS_LETTER; @@ -291,8 +291,8 @@ void func_80A9CB18(EnKz* this, PlayState* play) { if (EnKz_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, 340.0f, EnKz_GetTextId, EnKz_UpdateTalkState)) { - if ((this->actor.textId == 0x401A) && !GET_EVENTCHKINF(EVENTCHKINF_33)) { - if (func_8002F368(play) == EXCH_ITEM_BOTTLE_RUTOS_LETTER) { + if ((this->actor.textId == 0x401A) && !GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_BOTTLE_RUTOS_LETTER) { this->actor.textId = 0x401B; this->sfxPlayed = false; } else { @@ -304,7 +304,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) { if (LINK_IS_ADULT) { if ((INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_PRESCRIPTION) && - (func_8002F368(play) == EXCH_ITEM_PRESCRIPTION)) { + (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_PRESCRIPTION)) { this->actor.textId = 0x4014; this->sfxPlayed = false; player->actor.textId = this->actor.textId; @@ -389,7 +389,7 @@ void EnKz_Init(Actor* thisx, PlayState* play) { this->interactInfo.talkState = NPC_TALK_STATE_IDLE; Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_0); - if (GET_EVENTCHKINF(EVENTCHKINF_33)) { + if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) { EnKz_SetMovedPos(this, play); } @@ -455,7 +455,7 @@ void EnKz_Mweep(EnKz* this, PlayState* play) { Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_1); Inventory_ReplaceItem(play, ITEM_BOTTLE_RUTOS_LETTER, ITEM_BOTTLE_EMPTY); EnKz_SetMovedPos(this, play); - SET_EVENTCHKINF(EVENTCHKINF_33); + SET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA); this->actor.speed = 0.0; this->actionFunc = EnKz_StopMweep; } @@ -494,7 +494,7 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) { this->actionFunc = EnKz_StartTimer; } else { #if OOT_VERSION < PAL_1_0 - getItemId = func_8002F368(play) == EXCH_ITEM_PRESCRIPTION ? GI_EYEBALL_FROG : GI_TUNIC_ZORA; + getItemId = Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_PRESCRIPTION ? GI_EYEBALL_FROG : GI_TUNIC_ZORA; #else getItemId = this->isTrading == true ? GI_EYEBALL_FROG : GI_TUNIC_ZORA; #endif diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index ab27f30954..c2b6ca1d6c 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -7,7 +7,7 @@ #include "z_en_lightbox.h" #include "assets/objects/object_lightbox/object_lightbox.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnLightbox_Init(Actor* thisx, PlayState* play); void EnLightbox_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index f8c42427d0..d0c16c3a72 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -7,9 +7,9 @@ #include "z_en_ma1.h" #include "assets/objects/object_ma1/object_ma1.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnMa1_Init(Actor* thisx, PlayState* play); void EnMa1_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 7131f697b5..a4a4a17049 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -1,9 +1,9 @@ #include "z_en_ma2.h" #include "assets/objects/object_ma2/object_ma2.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnMa2_Init(Actor* thisx, PlayState* play); void EnMa2_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 6b7297223a..69dc0d907a 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -8,7 +8,9 @@ #include "assets/objects/object_ma2/object_ma2.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnMa3_Init(Actor* thisx, PlayState* play); void EnMa3_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 653ea2934c..b5a520d2a4 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -12,7 +12,7 @@ #endif #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnMag_Init(Actor* thisx, PlayState* play); void EnMag_Destroy(Actor* thisx, PlayState* play); @@ -642,7 +642,8 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) { #endif } -#if OOT_NTSC + // TODO: implement for iQue +#if OOT_NTSC && !PLATFORM_IQUE if (gSaveContext.language == LANGUAGE_JPN) { this->unk_E30C++; gDPPipeSync(gfx++); @@ -690,11 +691,11 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) { gDPLoadTextureBlock(gfx++, gTitleCopyright1998Tex, G_IM_FMT_IA, G_IM_SIZ_8b, 128, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); -#elif OOT_VERSION < GC_US +#elif PLATFORM_GC && OOT_VERSION < GC_US gDPLoadTextureBlock(gfx++, gTitleCopyright19982002Tex, G_IM_FMT_IA, G_IM_SIZ_8b, 160, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); -#elif OOT_NTSC +#elif PLATFORM_GC && OOT_NTSC if (gSaveContext.language == LANGUAGE_JPN) { gDPLoadTextureBlock(gfx++, gTitleCopyright19982002Tex, G_IM_FMT_IA, G_IM_SIZ_8b, 160, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, @@ -704,10 +705,12 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) { G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } -#else +#elif PLATFORM_GC && OOT_PAL gDPLoadTextureBlock(gfx++, gTitleCopyright19982003Tex, G_IM_FMT_IA, G_IM_SIZ_8b, 160, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); +#elif PLATFORM_IQUE + // TODO: implement for iQue #endif #if PLATFORM_N64 diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index ac745b9dbf..1e97b32486 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -15,7 +15,7 @@ * - "Spear Patrol" (variable 0xPP00 PP=pathId): uses a spear, patrols following a path, charges */ -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum EnMbType { /* -1 */ ENMB_TYPE_SPEAR_GUARD = -1, @@ -293,9 +293,9 @@ void EnMb_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.02f); this->bodyCollider.dim.height = 170; this->bodyCollider.dim.radius = 45; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 800.0f; - this->actor.uncullZoneDownward = 1800.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 800.0f; + this->actor.cullingVolumeDownward = 1800.0f; this->playerDetectionRange = 710.0f; this->attackCollider.elem.atDmgInfo.dmgFlags = DMG_UNBLOCKABLE; diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 82453526c2..d8838f74ec 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -8,18 +8,20 @@ #include "assets/objects/object_md/object_md.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnMd_Init(Actor* thisx, PlayState* play); void EnMd_Destroy(Actor* thisx, PlayState* play); void EnMd_Update(Actor* thisx, PlayState* play); void EnMd_Draw(Actor* thisx, PlayState* play); -void func_80AAB874(EnMd* this, PlayState* play); -void func_80AAB8F8(EnMd* this, PlayState* play); -void func_80AAB948(EnMd* this, PlayState* play); -void func_80AABC10(EnMd* this, PlayState* play); -void func_80AABD0C(EnMd* this, PlayState* play); +void EnMd_Idle(EnMd* this, PlayState* play); +void EnMd_Watch(EnMd* this, PlayState* play); +void EnMd_BlockPath(EnMd* this, PlayState* play); +void EnMd_ListenToOcarina(EnMd* this, PlayState* play); +void EnMd_Walk(EnMd* this, PlayState* play); ActorProfile En_Md_Profile = { /**/ ACTOR_EN_MD, @@ -55,41 +57,56 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; -typedef enum EnMdAnimation { - /* 0 */ ENMD_ANIM_0, - /* 1 */ ENMD_ANIM_1, - /* 2 */ ENMD_ANIM_2, - /* 3 */ ENMD_ANIM_3, - /* 4 */ ENMD_ANIM_4, - /* 5 */ ENMD_ANIM_5, - /* 6 */ ENMD_ANIM_6, - /* 7 */ ENMD_ANIM_7, - /* 8 */ ENMD_ANIM_8, - /* 9 */ ENMD_ANIM_9, - /* 10 */ ENMD_ANIM_10, - /* 11 */ ENMD_ANIM_11, - /* 12 */ ENMD_ANIM_12, - /* 13 */ ENMD_ANIM_13 -} EnMdAnimation; +typedef enum EnMdAnimSequence { + /* 0x0 */ ENMD_ANIM_SEQ_NONE, + /* 0x1 */ ENMD_ANIM_SEQ_IDLE_TO_HALT, // hands on hips -> halt gesture + /* 0x2 */ ENMD_ANIM_SEQ_HALT_TO_CURIOUS, // halt gesture -> tilted head + /* 0x3 */ ENMD_ANIM_SEQ_WALK_AWAY, // stop halt gesture -> start walking -> walking + /* 0x4 */ ENMD_ANIM_SEQ_TWITCH_IDLE_UNUSED, // start walking -> hands on hips; never set + /* 0x5 */ ENMD_ANIM_SEQ_HALT_TO_IDLE, // halt gesture -> hands on hips + /* 0x6 */ ENMD_ANIM_SEQ_SURPRISE_TO_ANNOYED, // slightly raise arms from hips -> look away + /* 0x7 */ ENMD_ANIM_SEQ_SURPRISE_TO_IDLE, // lower slightly raised arms to hips -> hands on hips + /* 0x8 */ ENMD_ANIM_SEQ_CURIOUS_TO_ANNOYED, // tilted head and *slam* -> looking away + /* 0x9 */ ENMD_ANIM_SEQ_ANNOYED_TO_HALT, // looking away -> halt gesture + /* 0xA */ ENMD_ANIM_SEQ_IDLE_TO_ANNOYED, // hands on hips -> looking away + /* 0xB */ ENMD_ANIM_SEQ_STOP_WALKING // stop walking -> hands on hips +} EnMdAnimSequence; + +typedef enum EnMdAnimIndex { + /* 0 */ ENMD_ANIM_INDEX_IDLE_DEFAULT, // hands on hips; default idle + /* 1 */ ENMD_ANIM_INDEX_IDLE_UNUSED, // hands on hips; never set + /* 2 */ ENMD_ANIM_INDEX_IDLE_TO_HALT, // hands on hips -> halt gesture + /* 3 */ ENMD_ANIM_INDEX_HALT, // halt gesture + /* 4 */ ENMD_ANIM_INDEX_HALT_TO_CURIOUS, // halt gesture -> tilted head + /* 5 */ ENMD_ANIM_INDEX_CURIOUS, // tilted head + /* 6 */ ENMD_ANIM_INDEX_ANNOYED, // looking away + /* 7 */ ENMD_ANIM_INDEX_IDLE_TO_WALK, // hands on hips -> walking + /* 8 */ ENMD_ANIM_INDEX_WALK, // walking + /* 9 */ ENMD_ANIM_INDEX_IDLE_TO_SURPISE, // hands on hips -> slightly raised arms + /* 10 */ ENMD_ANIM_INDEX_IDLE, // hands on hips + /* 11 */ ENMD_ANIM_INDEX_CURIOUS_TO_ANNOYED, // tilted head -> looking away + /* 12 */ ENMD_ANIM_INDEX_ANNOYED_TO_HALT, // looking away -> halt gesture + /* 13 */ ENMD_ANIM_INDEX_IDLE_TO_ANNOYED // hands on hips -> looking away +} EnMdAnimIndex; static AnimationInfo sAnimationInfo[] = { - { &gMidoHandsOnHipsIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { &gMidoHandsOnHipsIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, - { &gMidoRaiseHand1Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gMidoIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { &gMidoIdleToHaltAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { &gMidoHaltAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, - { &gMidoPutHandDownAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, - { &gMidoAnnoyedPointedHeadIdle1Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, - { &gMidoAnnoyedPointedHeadIdle2Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, - { &gMidoAnim_92B0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, - { &gMidoWalkingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, - { &gMidoHandsOnHipsTransitionAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, - { &gMidoHandsOnHipsIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, - { &gMidoSlamAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, - { &gMidoRaiseHand2Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, - { &gMidoAngryHeadTurnAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoHaltToCuriousAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoCuriousAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoAnnoyedAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoIdleToWalkAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoWalkAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoIdleToSurpriseAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, + { &gMidoCuriousToAnnoyedAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoAnnoyedToHaltAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoIdleToAnnoyedAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, }; -void func_80AAA250(EnMd* this) { +void EnMd_ReverseAnimation(EnMd* this) { f32 startFrame; startFrame = this->skelAnime.startFrame; @@ -99,289 +116,290 @@ void func_80AAA250(EnMd* this) { this->skelAnime.playSpeed = -1.0f; } -void func_80AAA274(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_IdleToHalt(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_2); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_HALT); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_3); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_HALT); + this->animSequenceEntry++; } break; } } -void func_80AAA308(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_HaltToCurious(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_4); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_HALT_TO_CURIOUS); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_5); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_CURIOUS); + this->animSequenceEntry++; } break; } } -void func_80AAA39C(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_WalkAway(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_2); - func_80AAA250(this); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_HALT); + EnMd_ReverseAnimation(this); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_7); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_WALK); + this->animSequenceEntry++; } else { break; } FALLTHROUGH; case 2: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_8); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_WALK); + this->animSequenceEntry++; } break; } } -void func_80AAA474(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_TwitchIdle_Unused(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_7); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_WALK); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_10); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE); + this->animSequenceEntry++; } break; } } -void func_80AAA508(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_HaltToIdle(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_2); - func_80AAA250(this); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_HALT); + EnMd_ReverseAnimation(this); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_10); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE); + this->animSequenceEntry++; } break; } } -void func_80AAA5A4(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_SurpriseToAnnoyed(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_9); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_SURPISE); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_6); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_ANNOYED); + this->animSequenceEntry++; } break; } } -void func_80AAA638(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_SurpriseToIdle(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_9); - func_80AAA250(this); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_SURPISE); + EnMd_ReverseAnimation(this); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_10); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE); + this->animSequenceEntry++; } break; } } -void func_80AAA6D4(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_CuriousToAnnoyed(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_11); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_CURIOUS_TO_ANNOYED); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_6); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_ANNOYED); + this->animSequenceEntry++; } break; } } -void func_80AAA768(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_AnnoyedToHalt(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_12); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_ANNOYED_TO_HALT); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_3); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_HALT); + this->animSequenceEntry++; } break; } } -void func_80AAA7FC(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_IdleToAnnoyed(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_13); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_ANNOYED); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_6); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_ANNOYED); + this->animSequenceEntry++; } break; } } -void func_80AAA890(EnMd* this) { - switch (this->unk_20A) { +void EnMd_UpdateAnimSequence_StopWalking(EnMd* this) { + switch (this->animSequenceEntry) { case 0: - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_7); - func_80AAA250(this); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_TO_WALK); + EnMd_ReverseAnimation(this); + this->animSequenceEntry++; FALLTHROUGH; case 1: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_10); - this->unk_20A++; + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE); + this->animSequenceEntry++; } break; } } -void func_80AAA92C(EnMd* this, u8 arg1) { - this->unk_20B = arg1; - this->unk_20A = 0; +void EnMd_SetAnimSequence(EnMd* this, u8 state) { + this->animSequence = state; + this->animSequenceEntry = 0; } -void func_80AAA93C(EnMd* this) { - switch (this->unk_20B) { - case 1: - func_80AAA274(this); +void EnMd_UpdateAnimSequence(EnMd* this) { + switch (this->animSequence) { + case ENMD_ANIM_SEQ_IDLE_TO_HALT: + EnMd_UpdateAnimSequence_IdleToHalt(this); break; - case 2: - func_80AAA308(this); + case ENMD_ANIM_SEQ_HALT_TO_CURIOUS: + EnMd_UpdateAnimSequence_HaltToCurious(this); break; - case 3: - func_80AAA39C(this); + case ENMD_ANIM_SEQ_WALK_AWAY: + EnMd_UpdateAnimSequence_WalkAway(this); break; - case 4: - func_80AAA474(this); + case ENMD_ANIM_SEQ_TWITCH_IDLE_UNUSED: + // unreachable + EnMd_UpdateAnimSequence_TwitchIdle_Unused(this); break; - case 5: - func_80AAA508(this); + case ENMD_ANIM_SEQ_HALT_TO_IDLE: + EnMd_UpdateAnimSequence_HaltToIdle(this); break; - case 6: - func_80AAA5A4(this); + case ENMD_ANIM_SEQ_SURPRISE_TO_ANNOYED: + EnMd_UpdateAnimSequence_SurpriseToAnnoyed(this); break; - case 7: - func_80AAA638(this); + case ENMD_ANIM_SEQ_SURPRISE_TO_IDLE: + EnMd_UpdateAnimSequence_SurpriseToIdle(this); break; - case 8: - func_80AAA6D4(this); + case ENMD_ANIM_SEQ_CURIOUS_TO_ANNOYED: + EnMd_UpdateAnimSequence_CuriousToAnnoyed(this); break; - case 9: - func_80AAA768(this); + case ENMD_ANIM_SEQ_ANNOYED_TO_HALT: + EnMd_UpdateAnimSequence_AnnoyedToHalt(this); break; - case 10: - func_80AAA7FC(this); + case ENMD_ANIM_SEQ_IDLE_TO_ANNOYED: + EnMd_UpdateAnimSequence_IdleToAnnoyed(this); break; - case 11: - func_80AAA890(this); + case ENMD_ANIM_SEQ_STOP_WALKING: + EnMd_UpdateAnimSequence_StopWalking(this); } } -void func_80AAAA24(EnMd* this) { +void EnMd_UpdateAnimSequence_WithTalking(EnMd* this) { if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) { switch (this->actor.textId) { case 0x102F: - if ((this->unk_208 == 0) && (this->unk_20B != 1)) { - func_80AAA92C(this, 1); + if ((this->messageEntry == 0) && (this->animSequence != ENMD_ANIM_SEQ_IDLE_TO_HALT)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_IDLE_TO_HALT); } - if ((this->unk_208 == 2) && (this->unk_20B != 2)) { - func_80AAA92C(this, 2); + if ((this->messageEntry == 2) && (this->animSequence != ENMD_ANIM_SEQ_HALT_TO_CURIOUS)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_HALT_TO_CURIOUS); } - if ((this->unk_208 == 5) && (this->unk_20B != 8)) { - func_80AAA92C(this, 8); + if ((this->messageEntry == 5) && (this->animSequence != ENMD_ANIM_SEQ_CURIOUS_TO_ANNOYED)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_CURIOUS_TO_ANNOYED); } - if ((this->unk_208 == 11) && (this->unk_20B != 9)) { - func_80AAA92C(this, 9); + if ((this->messageEntry == 11) && (this->animSequence != ENMD_ANIM_SEQ_ANNOYED_TO_HALT)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_ANNOYED_TO_HALT); } break; case 0x1033: - if ((this->unk_208 == 0) && (this->unk_20B != 1)) { - func_80AAA92C(this, 1); + if ((this->messageEntry == 0) && (this->animSequence != ENMD_ANIM_SEQ_IDLE_TO_HALT)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_IDLE_TO_HALT); } - if ((this->unk_208 == 1) && (this->unk_20B != 2)) { - func_80AAA92C(this, 2); + if ((this->messageEntry == 1) && (this->animSequence != ENMD_ANIM_SEQ_HALT_TO_CURIOUS)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_HALT_TO_CURIOUS); } - if ((this->unk_208 == 5) && (this->unk_20B != 10)) { - func_80AAA92C(this, 10); + if ((this->messageEntry == 5) && (this->animSequence != ENMD_ANIM_SEQ_IDLE_TO_ANNOYED)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_IDLE_TO_ANNOYED); } - if ((this->unk_208 == 7) && (this->unk_20B != 9)) { - func_80AAA92C(this, 9); + if ((this->messageEntry == 7) && (this->animSequence != ENMD_ANIM_SEQ_ANNOYED_TO_HALT)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_ANNOYED_TO_HALT); } break; case 0x1030: case 0x1034: case 0x1045: - if ((this->unk_208 == 0) && (this->unk_20B != 1)) { - func_80AAA92C(this, 1); + if ((this->messageEntry == 0) && (this->animSequence != ENMD_ANIM_SEQ_IDLE_TO_HALT)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_IDLE_TO_HALT); } break; case 0x1046: - if ((this->unk_208 == 0) && (this->unk_20B != 6)) { - func_80AAA92C(this, 6); + if ((this->messageEntry == 0) && (this->animSequence != ENMD_ANIM_SEQ_SURPRISE_TO_ANNOYED)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_SURPRISE_TO_ANNOYED); } break; } - } else if (this->skelAnime.animation != &gMidoHandsOnHipsIdleAnim) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_10); - func_80AAA92C(this, 0); + } else if (this->skelAnime.animation != &gMidoIdleAnim) { + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE); + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_NONE); } - func_80AAA93C(this); + EnMd_UpdateAnimSequence(this); } -s16 func_80AAAC78(EnMd* this, PlayState* play) { - s16 dialogState = Message_GetState(&play->msgCtx); +s16 EnMd_TrackMessageState(EnMd* this, PlayState* play) { + s16 messageState = Message_GetState(&play->msgCtx); - if ((this->unk_209 == TEXT_STATE_AWAITING_NEXT) || (this->unk_209 == TEXT_STATE_EVENT) || - (this->unk_209 == TEXT_STATE_CLOSING) || (this->unk_209 == TEXT_STATE_DONE_HAS_NEXT)) { - if (this->unk_209 != dialogState) { - this->unk_208++; + if ((this->messageState == TEXT_STATE_AWAITING_NEXT) || (this->messageState == TEXT_STATE_EVENT) || + (this->messageState == TEXT_STATE_CLOSING) || (this->messageState == TEXT_STATE_DONE_HAS_NEXT)) { + if (this->messageState != messageState) { + this->messageEntry++; } } - this->unk_209 = dialogState; - return dialogState; + this->messageState = messageState; + return messageState; } u16 EnMd_GetTextIdKokiriForest(PlayState* play, EnMd* this) { @@ -391,8 +409,8 @@ u16 EnMd_GetTextIdKokiriForest(PlayState* play, EnMd* this) { return textId; } - this->unk_208 = 0; - this->unk_209 = TEXT_STATE_NONE; + this->messageEntry = 0; + this->messageState = TEXT_STATE_NONE; if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) { return 0x1045; @@ -415,8 +433,8 @@ u16 EnMd_GetTextIdKokiriForest(PlayState* play, EnMd* this) { } u16 EnMd_GetTextIdMidosHouse(PlayState* play, EnMd* this) { - this->unk_208 = 0; - this->unk_209 = TEXT_STATE_NONE; + this->messageEntry = 0; + this->messageState = TEXT_STATE_NONE; if (GET_EVENTCHKINF(EVENTCHKINF_40)) { return 0x1028; @@ -426,8 +444,8 @@ u16 EnMd_GetTextIdMidosHouse(PlayState* play, EnMd* this) { } u16 EnMd_GetTextIdLostWoods(PlayState* play, EnMd* this) { - this->unk_208 = 0; - this->unk_209 = TEXT_STATE_NONE; + this->messageEntry = 0; + this->messageState = TEXT_STATE_NONE; if (GET_EVENTCHKINF(EVENTCHKINF_48)) { if (GET_INFTABLE(INFTABLE_19)) { @@ -464,7 +482,7 @@ u16 EnMd_GetTextId(PlayState* play, Actor* thisx) { s16 EnMd_UpdateTalkState(PlayState* play, Actor* thisx) { EnMd* this = (EnMd*)thisx; - switch (func_80AAAC78(this, play)) { + switch (EnMd_TrackMessageState(this, play)) { case TEXT_STATE_NONE: case TEXT_STATE_DONE_HAS_NEXT: case TEXT_STATE_DONE_FADING: @@ -480,7 +498,7 @@ s16 EnMd_UpdateTalkState(PlayState* play, Actor* thisx) { SET_EVENTCHKINF(EVENTCHKINF_0F); break; case 0x102F: - SET_EVENTCHKINF(EVENTCHKINF_02); + SET_EVENTCHKINF(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS); SET_INFTABLE(INFTABLE_0C); break; case 0x1060: @@ -528,19 +546,19 @@ u8 EnMd_ShouldSpawn(EnMd* this, PlayState* play) { void EnMd_UpdateEyes(EnMd* this) { if (DECR(this->blinkTimer) == 0) { - this->eyeIdx++; - if (this->eyeIdx > 2) { + this->eyeTexIndex++; + if (this->eyeTexIndex > 2) { this->blinkTimer = Rand_S16Offset(30, 30); - this->eyeIdx = 0; + this->eyeTexIndex = 0; } } } -void func_80AAB158(EnMd* this, PlayState* play) { +void EnMd_UpdateTalking(EnMd* this, PlayState* play) { Player* player = GET_PLAYER(play); s16 absYawDiff; s16 trackingMode; - s16 temp2; + s16 canUpdateTalking; s16 yawDiff; if (this->actor.xzDistToPlayer < 170.0f) { @@ -549,23 +567,23 @@ void func_80AAB158(EnMd* this, PlayState* play) { trackingMode = absYawDiff <= Npc_GetTrackingPresetMaxPlayerYaw(2) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE; - temp2 = 1; + canUpdateTalking = true; } else { trackingMode = NPC_TRACKING_NONE; - temp2 = 0; + canUpdateTalking = false; } if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) { trackingMode = NPC_TRACKING_FULL_BODY; } - if (this->actionFunc == func_80AABD0C) { + if (this->actionFunc == EnMd_Walk) { trackingMode = NPC_TRACKING_NONE; - temp2 = 0; + canUpdateTalking = false; } - if (this->actionFunc == func_80AAB8F8) { + if (this->actionFunc == EnMd_Watch) { trackingMode = NPC_TRACKING_FULL_BODY; - temp2 = 1; + canUpdateTalking = true; } if ((play->csCtx.state != CS_STATE_IDLE) || IS_DEBUG_CAM_ENABLED) { @@ -578,8 +596,8 @@ void func_80AAB158(EnMd* this, PlayState* play) { } Npc_TrackPoint(&this->actor, &this->interactInfo, 2, trackingMode); - if (this->actionFunc != func_80AABC10) { - if (temp2) { + if (this->actionFunc != EnMd_ListenToOcarina) { + if (canUpdateTalking) { Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->collider.dim.radius + 30.0f, EnMd_GetTextId, EnMd_UpdateTalkState); } @@ -592,11 +610,11 @@ u8 EnMd_FollowPath(EnMd* this, PlayState* play) { f32 pathDiffX; f32 pathDiffZ; - if (PARAMS_GET_NOSHIFT(this->actor.params, 8, 8) == 0xFF00) { + if (ENMD_GET_PATH_INDEX_NOSHIFT(this) == (ENMD_PATH_NONE << 8)) { return 0; } - path = &play->pathList[PARAMS_GET_S(this->actor.params, 8, 8)]; + path = &play->pathList[ENMD_GET_PATH_INDEX(this)]; pointPos = SEGMENTED_TO_VIRTUAL(path->points); pointPos += this->waypoint; @@ -619,11 +637,11 @@ u8 EnMd_SetMovedPos(EnMd* this, PlayState* play) { Path* path; Vec3s* lastPointPos; - if (PARAMS_GET_NOSHIFT(this->actor.params, 8, 8) == 0xFF00) { + if (ENMD_GET_PATH_INDEX_NOSHIFT(this) == (ENMD_PATH_NONE << 8)) { return 0; } - path = &play->pathList[PARAMS_GET_S(this->actor.params, 8, 8)]; + path = &play->pathList[ENMD_GET_PATH_INDEX(this)]; lastPointPos = SEGMENTED_TO_VIRTUAL(path->points); lastPointPos += path->count - 1; @@ -634,15 +652,15 @@ u8 EnMd_SetMovedPos(EnMd* this, PlayState* play) { return 1; } -void func_80AAB5A4(EnMd* this, PlayState* play) { - f32 temp; +void EnMd_UpdateAlphaByDistance(EnMd* this, PlayState* play) { + f32 radius; if (play->sceneId != SCENE_MIDOS_HOUSE) { - temp = (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && !GET_EVENTCHKINF(EVENTCHKINF_1C) && - (play->sceneId == SCENE_KOKIRI_FOREST)) - ? 100.0f - : 400.0f; - this->alpha = func_80034DD4(&this->actor, play, this->alpha, temp); + radius = (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && !GET_EVENTCHKINF(EVENTCHKINF_1C) && + (play->sceneId == SCENE_KOKIRI_FOREST)) + ? 100.0f + : 400.0f; + this->alpha = Actor_UpdateAlphaByDistance(&this->actor, play, this->alpha, radius); this->actor.shape.shadowAlpha = this->alpha; } else { this->alpha = 255; @@ -665,7 +683,7 @@ void EnMd_Init(Actor* thisx, PlayState* play) { return; } - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_0); + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENMD_ANIM_INDEX_IDLE_DEFAULT); Actor_SetScale(&this->actor, 0.01f); this->actor.attentionRangeType = ATTENTION_RANGE_6; this->alpha = 255; @@ -677,7 +695,7 @@ void EnMd_Init(Actor* thisx, PlayState* play) { CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) || ((play->sceneId == SCENE_LOST_WOODS) && !GET_EVENTCHKINF(EVENTCHKINF_0A))) { this->actor.home.pos = this->actor.world.pos; - this->actionFunc = func_80AAB948; + this->actionFunc = EnMd_BlockPath; return; } @@ -685,7 +703,7 @@ void EnMd_Init(Actor* thisx, PlayState* play) { EnMd_SetMovedPos(this, play); } - this->actionFunc = func_80AAB874; + this->actionFunc = EnMd_Idle; } void EnMd_Destroy(Actor* thisx, PlayState* play) { @@ -693,30 +711,31 @@ void EnMd_Destroy(Actor* thisx, PlayState* play) { Collider_DestroyCylinder(play, &this->collider); } -void func_80AAB874(EnMd* this, PlayState* play) { - if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { +void EnMd_Idle(EnMd* this, PlayState* play) { + if (this->skelAnime.animation == &gMidoIdleAnim) { Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, ENMD_LIMB_MAX); - } else if ((this->interactInfo.talkState == NPC_TALK_STATE_IDLE) && (this->unk_20B != 7)) { - func_80AAA92C(this, 7); + } else if ((this->interactInfo.talkState == NPC_TALK_STATE_IDLE) && + (this->animSequence != ENMD_ANIM_SEQ_SURPRISE_TO_IDLE)) { + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_SURPRISE_TO_IDLE); } - func_80AAAA24(this); + EnMd_UpdateAnimSequence_WithTalking(this); } -void func_80AAB8F8(EnMd* this, PlayState* play) { - if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { +void EnMd_Watch(EnMd* this, PlayState* play) { + if (this->skelAnime.animation == &gMidoIdleAnim) { Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, ENMD_LIMB_MAX); } - func_80AAA93C(this); + EnMd_UpdateAnimSequence(this); } -void func_80AAB948(EnMd* this, PlayState* play) { +void EnMd_BlockPath(EnMd* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 temp; Actor* actorToBlock = &GET_PLAYER(play)->actor; s16 yaw; - func_80AAAA24(this); + EnMd_UpdateAnimSequence_WithTalking(this); if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) { this->actor.world.rot.y = this->actor.yawTowardsPlayer; @@ -747,16 +766,16 @@ void func_80AAB948(EnMd* this, PlayState* play) { SET_EVENTCHKINF(EVENTCHKINF_0A); } - func_80AAA92C(this, 3); - func_80AAA93C(this); + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_WALK_AWAY); + EnMd_UpdateAnimSequence(this); this->waypoint = 1; this->interactInfo.talkState = NPC_TALK_STATE_IDLE; - this->actionFunc = func_80AABD0C; + this->actionFunc = EnMd_Walk; this->actor.speed = 1.5f; return; } - if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { + if (this->skelAnime.animation == &gMidoIdleAnim) { Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, ENMD_LIMB_MAX); } @@ -765,7 +784,7 @@ void func_80AAB948(EnMd* this, PlayState* play) { player->stateFlags2 |= PLAYER_STATE2_25; player->unk_6A8 = &this->actor; Message_StartOcarina(play, OCARINA_ACTION_CHECK_SARIA); - this->actionFunc = func_80AABC10; + this->actionFunc = EnMd_ListenToOcarina; return; } @@ -775,11 +794,11 @@ void func_80AAB948(EnMd* this, PlayState* play) { } } -void func_80AABC10(EnMd* this, PlayState* play) { +void EnMd_ListenToOcarina(EnMd* this, PlayState* play) { Player* player = GET_PLAYER(play); if (play->msgCtx.ocarinaMode >= OCARINA_MODE_04) { - this->actionFunc = func_80AAB948; + this->actionFunc = EnMd_BlockPath; play->msgCtx.ocarinaMode = OCARINA_MODE_04; } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) { Audio_PlaySfxGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -787,16 +806,16 @@ void func_80AABC10(EnMd* this, PlayState* play) { this->actor.textId = 0x1067; Actor_OfferTalk(&this->actor, play, this->collider.dim.radius + 30.0f); - this->actionFunc = func_80AAB948; + this->actionFunc = EnMd_BlockPath; play->msgCtx.ocarinaMode = OCARINA_MODE_04; } else { player->stateFlags2 |= PLAYER_STATE2_23; } } -void func_80AABD0C(EnMd* this, PlayState* play) { +void EnMd_Walk(EnMd* this, PlayState* play) { Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, ENMD_LIMB_MAX); - func_80AAA93C(this); + EnMd_UpdateAnimSequence(this); if (!(EnMd_FollowPath(this, play)) || (this->waypoint != 0)) { this->actor.shape.rot = this->actor.world.rot; @@ -811,12 +830,12 @@ void func_80AABD0C(EnMd* this, PlayState* play) { return; } - func_80AAA92C(this, 11); + EnMd_SetAnimSequence(this, ENMD_ANIM_SEQ_STOP_WALKING); this->skelAnime.playSpeed = 0.0f; this->actor.speed = 0.0f; this->actor.home.pos = this->actor.world.pos; - this->actionFunc = func_80AAB8F8; + this->actionFunc = EnMd_Watch; } void EnMd_Update(Actor* thisx, PlayState* play) { @@ -827,9 +846,9 @@ void EnMd_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); SkelAnime_Update(&this->skelAnime); EnMd_UpdateEyes(this); - func_80AAB5A4(this, play); + EnMd_UpdateAlphaByDistance(this, play); Actor_MoveXZGravity(&this->actor); - func_80AAB158(this, play); + EnMd_UpdateTalking(this, play); Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2); this->actionFunc(this, play); } @@ -880,10 +899,10 @@ void EnMd_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_en_md.c", 1280); if (this->alpha == 255) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIdx])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIndex])); func_80034BA0(play, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); } else if (this->alpha != 0) { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIdx])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIndex])); func_80034CC4(play, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); } diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.h b/src/overlays/actors/ovl_En_Md/z_en_md.h index a30ebe047a..6a78a24904 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.h +++ b/src/overlays/actors/ovl_En_Md/z_en_md.h @@ -29,18 +29,23 @@ typedef enum EnMdLimb { typedef void (*EnMdActionFunc)(struct EnMd*, PlayState*); +#define ENMD_GET_PATH_INDEX(this) PARAMS_GET_S(this->actor.params, 8, 8) +#define ENMD_GET_PATH_INDEX_NOSHIFT(this) PARAMS_GET_NOSHIFT(this->actor.params, 8, 8) + +#define ENMD_PATH_NONE 0xFF + typedef struct EnMd { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; /* 0x0190 */ EnMdActionFunc actionFunc; /* 0x0194 */ ColliderCylinder collider; /* 0x01E0 */ NpcInteractInfo interactInfo; - /* 0x0208 */ u8 unk_208; - /* 0x0209 */ u8 unk_209; - /* 0x020A */ u8 unk_20A; - /* 0x020B */ u8 unk_20B; + /* 0x0208 */ u8 messageEntry; // tracks message state changes, like with `BOX_BREAK` or `TEXTID` + /* 0x0209 */ u8 messageState; // last known result of `Message_GetState` + /* 0x020A */ u8 animSequenceEntry; // each one changes animation info and waits + /* 0x020B */ u8 animSequence; /* 0x020C */ s16 blinkTimer; - /* 0x020E */ s16 eyeIdx; + /* 0x020E */ s16 eyeTexIndex; /* 0x0210 */ s16 alpha; /* 0x0212 */ s16 waypoint; /* 0x0214 */ s16 fidgetTableY[ENMD_LIMB_MAX]; diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index ab748fe164..df7708a699 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -7,7 +7,7 @@ #include "z_en_mk.h" #include "assets/objects/object_mk/object_mk.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMk_Init(Actor* thisx, PlayState* play); void EnMk_Destroy(Actor* thisx, PlayState* play); @@ -216,7 +216,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) { s32 playerExchangeItem; if (Actor_TalkOfferAccepted(&this->actor, play)) { - playerExchangeItem = func_8002F368(play); + playerExchangeItem = Actor_GetPlayerExchangeItemId(play); if (this->actor.textId != 0x4018) { player->actor.textId = this->actor.textId; diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 1053bfb0af..b081f8304c 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -8,7 +8,7 @@ #include "assets/objects/object_mm/object_mm.h" #include "assets/objects/object_link_child/object_link_child.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum RunningManAnimIndex { /* 0 */ RM_ANIM_RUN, @@ -130,7 +130,7 @@ static EnMmPathInfo sPathInfo[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; void EnMm_ChangeAnim(EnMm* this, s32 index, s32* currentIndex) { diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index f4876f70ed..3082b5c35d 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -8,7 +8,7 @@ #include "terminal.h" #include "assets/objects/object_mm/object_mm.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum RunningManAnimIndex { /* 0 */ RM2_ANIM_RUN, @@ -75,7 +75,7 @@ static AnimationSpeedInfo sAnimationInfo[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; void EnMm2_ChangeAnim(EnMm2* this, s32 index, s32* currentIndex) { @@ -100,7 +100,7 @@ void EnMm2_ChangeAnim(EnMm2* this, s32 index, s32* currentIndex) { } void func_80AAEF70(EnMm2* this, PlayState* play) { - if (!GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) { + if (!GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) { this->actor.textId = 0x6086; } else if (GET_INFTABLE(INFTABLE_17F)) { if (GET_EVENTINF(EVENTINF_MARATHON_ACTIVE)) { diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 01c3788df9..dbe5e1b15c 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -64,9 +64,9 @@ void EnMu_Interact(EnMu* this, PlayState* play) { s32 randomIndex; s32 i; - textFlags = gSaveContext.eventInf[EVENTINF_20_21_22_23_24_INDEX] & + textFlags = gSaveContext.eventInf[EVENTINF_INDEX_20_21_22_23_24] & (EVENTINF_20_MASK | EVENTINF_21_MASK | EVENTINF_22_MASK | EVENTINF_23_MASK | EVENTINF_24_MASK); - gSaveContext.eventInf[EVENTINF_20_21_22_23_24_INDEX] &= + gSaveContext.eventInf[EVENTINF_INDEX_20_21_22_23_24] &= ~(EVENTINF_20_MASK | EVENTINF_21_MASK | EVENTINF_22_MASK | EVENTINF_23_MASK | EVENTINF_24_MASK); randomIndex = (play->state.frames + (s32)(Rand_ZeroOne() * 5.0f)) % 5; @@ -95,7 +95,7 @@ void EnMu_Interact(EnMu* this, PlayState* play) { textFlags |= bitmask[randomIndex]; this->defaultTextId = textIdOffset[randomIndex] | 0x7000; textFlags &= EVENTINF_20_MASK | EVENTINF_21_MASK | EVENTINF_22_MASK | EVENTINF_23_MASK | EVENTINF_24_MASK | 0xE0; - gSaveContext.eventInf[EVENTINF_20_21_22_23_24_INDEX] |= textFlags; + gSaveContext.eventInf[EVENTINF_INDEX_20_21_22_23_24] |= textFlags; } u16 EnMu_GetTextId(PlayState* play, Actor* thisx) { diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 6c30a3ec0d..983af06780 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -9,7 +9,7 @@ #include "assets/objects/object_nb/object_nb.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum EnNbAction { /* 0x00 */ NB_CHAMBER_INIT, @@ -349,7 +349,7 @@ void EnNb_SetupChamberCsImpl(EnNb* this, PlayState* play) { if ((gSaveContext.chamberCutsceneNum == CHAMBER_CS_SPIRIT) && !IS_CUTSCENE_LAYER) { player = GET_PLAYER(play); this->action = NB_CHAMBER_UNDERGROUND; - play->csCtx.script = D_80AB431C; + play->csCtx.script = gSpiritMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_SPIRIT); player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c index 13614e7c31..3c3a68311c 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c @@ -2,11 +2,11 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_80AB431C[] = { - CS_BEGIN_CUTSCENE(27, 3011), +static CutsceneData gSpiritMedallionCs[] = { + CS_HEADER(27, 3011), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(31, 5), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_6_0, 5), CS_ACTOR_CUE(0x0001, 0, 501, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 501, 502, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 502, 573, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -16,13 +16,13 @@ static CutsceneData D_80AB431C[] = { CS_PLAYER_CUE(PLAYER_CUEID_13, 0, 240, 0x0000, 0x1555, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 240, 461, 0x0000, 0x1555, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_19, 461, 1616, 0x0000, 0x9555, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_ACTOR_CUE_LIST(49, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_7_0, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -16, -121, 0, -16, -121, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_LIGHT_SETTING_LIST(1), CS_LIGHT_SETTING(0x0003, 0, 3000, 0x0000, 0x00000000, 0xFFFFFF9E, 0x00000000, 0x0000002F, 0xFFFFFF9E, 0x00000000, 0x0000002F, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(39, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_5, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, 0, -2, 0, 0, -2, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(40, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_4, 3), CS_ACTOR_CUE(0x0001, 0, 145, 0x0000, 0x0000, 0x0000, -97, 6, -167, -97, 6, -167, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 145, 431, 0x0000, 0x0000, 0x0000, -97, 6, -167, -97, 6, -167, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0003, 431, 1399, 0x0000, 0x0000, 0x0000, -97, 6, -167, -97, 6, -167, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -31,16 +31,16 @@ static CutsceneData D_80AB431C[] = { CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 765, 795), CS_TEXT_LIST(10), CS_TEXT_NONE(0, 345), - CS_TEXT(0x6035, 345, 353, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x6035, 345, 353, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(353, 374), - CS_TEXT(0x6039, 374, 399, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x6039, 374, 399, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(399, 400), - CS_TEXT(0x603A, 400, 424, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x603A, 400, 424, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(424, 760), - CS_TEXT(0x003F, 760, 765, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x003F, 760, 765, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(765, 825), - CS_TEXT(0x6036, 825, 835, 0x0000, 0x0000, 0x0000), - CS_ACTOR_CUE_LIST(62, 1), + CS_TEXT(0x6036, 825, 835, CS_TEXT_NORMAL, 0x0000, 0x0000), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 1), CS_ACTOR_CUE(0x0004, 0, 3000, 0x0000, 0x0000, 0x0000, 50, 80, 56, 50, 80, 56, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_DESTINATION(CS_DEST_DESERT_COLOSSUS_FROM_CHAMBER_OF_SAGES, 865, 907), CS_START_SEQ_LIST(1), @@ -165,6 +165,6 @@ static CutsceneData D_80AB431C[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x013D), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x013F), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x002E), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 96c00b42e6..144c76b2cb 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -10,7 +10,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnNiw_Init(Actor* thisx, PlayState* play); void EnNiw_Destroy(Actor* thisx, PlayState* play); @@ -66,8 +66,8 @@ static Vec3f sKakarikoPosList[] = { }; static s16 sKakarikoFlagList[] = { - INFTABLE_199_MASK, INFTABLE_19A_MASK, INFTABLE_19B_MASK, INFTABLE_19C_MASK, - INFTABLE_19D_MASK, INFTABLE_19E_MASK, INFTABLE_19F_MASK, + INFTABLE_MASK(INFTABLE_199), INFTABLE_MASK(INFTABLE_19A), INFTABLE_MASK(INFTABLE_19B), INFTABLE_MASK(INFTABLE_19C), + INFTABLE_MASK(INFTABLE_19D), INFTABLE_MASK(INFTABLE_19E), INFTABLE_MASK(INFTABLE_19F), }; static u8 sLowerRiverSpawned = false; @@ -162,7 +162,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { fabsf(this->actor.world.pos.z - sKakarikoPosList[i].z) < 40.0f) { this->unk_2AA = i; PRINTF(VT_FGCOL(YELLOW) " 通常鶏index %d\n" VT_RST, this->unk_2AA); - if (gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX] & + if (gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F] & sKakarikoFlagList[i]) { this->actor.world.pos.x = 300.0f; this->actor.world.pos.y = 100.0f; diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index dab07959e4..6af946ddeb 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -8,7 +8,7 @@ #include "assets/objects/object_gr/object_gr.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnNiwGirl_Init(Actor* thisx, PlayState* play); void EnNiwGirl_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 02887234c5..0415f95bb9 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -5,7 +5,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnNiwLady_Init(Actor* thisx, PlayState* play); void EnNiwLady_Destroy(Actor* thisx, PlayState* play); @@ -43,8 +43,8 @@ static s16 sMissingCuccoTextIds[] = { }; static s16 D_80ABB3B4[] = { - INFTABLE_199_MASK, INFTABLE_19A_MASK, INFTABLE_19B_MASK, INFTABLE_19C_MASK, - INFTABLE_19D_MASK, INFTABLE_19E_MASK, INFTABLE_19F_MASK, + INFTABLE_MASK(INFTABLE_199), INFTABLE_MASK(INFTABLE_19A), INFTABLE_MASK(INFTABLE_19B), INFTABLE_MASK(INFTABLE_19C), + INFTABLE_MASK(INFTABLE_19D), INFTABLE_MASK(INFTABLE_19E), INFTABLE_MASK(INFTABLE_19F), }; static ColliderCylinderInit sCylinderInit = { @@ -88,7 +88,7 @@ void EnNiwLady_Init(Actor* thisx, PlayState* play) { PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ねぇちゃんうっふん ☆☆☆☆☆ %d\n" VT_RST, this->unk_278); PRINTF("\n\n"); this->actionFunc = func_80AB9F24; - thisx->uncullZoneForward = 600.0f; + thisx->cullingVolumeDistance = 600.0f; } void EnNiwLady_Destroy(Actor* thisx, PlayState* play) { @@ -210,7 +210,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { if ((fabsf(currentCucco->actor.world.pos.x - 330.0f) < 90.0f) && (fabsf(currentCucco->actor.world.pos.z - 1610.0f) < 190.0f)) { if (this->unk_26C == 0) { - gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX] |= + gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F] |= D_80ABB3B4[currentCucco->unk_2AA]; if (BREG(1) != 0) { // "GET inside the chicken fence!" @@ -219,7 +219,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { } this->cuccosInPen++; } else if (this->unk_26C == 0) { - gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX] &= + gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F] &= ~D_80ABB3B4[currentCucco->unk_2AA]; } } @@ -276,12 +276,13 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { this->unk_262 = TEXT_STATE_EVENT; this->unk_26A = this->cuccosInPen; PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 柵内BIT変更前 ☆☆ %x\n" VT_RST, - gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX]); - gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX] &= - (u16) ~(INFTABLE_199_MASK | INFTABLE_19A_MASK | INFTABLE_19B_MASK | INFTABLE_19C_MASK | - INFTABLE_19D_MASK | INFTABLE_19E_MASK | INFTABLE_19F_MASK); + gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F]); + gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F] &= + (u16) ~(INFTABLE_MASK(INFTABLE_199) | INFTABLE_MASK(INFTABLE_19A) | INFTABLE_MASK(INFTABLE_19B) | + INFTABLE_MASK(INFTABLE_19C) | INFTABLE_MASK(INFTABLE_19D) | INFTABLE_MASK(INFTABLE_19E) | + INFTABLE_MASK(INFTABLE_19F)); PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 柵内BIT変更後 ☆☆ %x\n" VT_RST, - gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX]); + gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F]); PRINTF("\n\n"); this->actionFunc = func_80ABA654; return; @@ -374,7 +375,7 @@ void func_80ABA878(EnNiwLady* this, PlayState* play) { this->unk_26E = 11; } if (Actor_TalkOfferAccepted(&this->actor, play)) { - s8 playerExchangeItemId = func_8002F368(play); + s8 playerExchangeItemId = Actor_GetPlayerExchangeItemId(play); if ((playerExchangeItemId == EXCH_ITEM_POCKET_CUCCO) && GET_EVENTCHKINF(EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO)) { Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 016501b5fa..114971a1de 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -12,7 +12,7 @@ #include "assets/objects/object_dns/object_dns.h" #include "assets/objects/object_dnk/object_dnk.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnNutsball_Init(Actor* thisx, PlayState* play); void EnNutsball_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 00ba57f4ad..a990438adb 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -7,7 +7,7 @@ #include "z_en_nwc.h" #include "assets/objects/object_nwc/object_nwc.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnNwc_Init(Actor* thisx, PlayState* play); void EnNwc_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 5738063865..c3f579095c 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -10,7 +10,7 @@ #include "z64frame_advance.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnOkarinaEffect_Init(Actor* thisx, PlayState* play); void EnOkarinaEffect_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 3632ae5599..94c01448b9 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -10,7 +10,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnOkarinaTag_Init(Actor* thisx, PlayState* play); void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play); @@ -35,8 +35,8 @@ ActorProfile En_Okarina_Tag_Profile = { /**/ NULL, }; -extern CutsceneData D_80ABF9D0[]; -extern CutsceneData D_80ABFB40[]; +extern CutsceneData gWindmillSpinningFasterCs[]; +extern CutsceneData gDoorOfTimeOpeningCs[]; void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) { } @@ -204,7 +204,7 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) { if ((this->ocarinaSong != 6) || (gSaveContext.save.info.scarecrowSpawnSongSet)) { if ((this->switchFlag >= 0) && Flags_GetSwitch(play, this->switchFlag)) { this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - } else if (((this->type != 4) || !GET_EVENTCHKINF(EVENTCHKINF_4B)) && + } else if (((this->type != 4) || !GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) && ((this->type != 6) || !GET_EVENTCHKINF(EVENTCHKINF_1D)) && (this->actor.xzDistToPlayer < (90.0f + this->interactRange)) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 80.0f)) { @@ -258,19 +258,19 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) { SET_EVENTCHKINF(EVENTCHKINF_39); break; case 2: - play->csCtx.script = D_80ABF9D0; + play->csCtx.script = gWindmillSpinningFasterCs; gSaveContext.cutsceneTrigger = 1; // Increase pitch by 3 semitones i.e. 2^(3/12), scale tempo by same ratio // Applies to the windmill bgm once the song of storms fanfare is complete Audio_SetMainBgmTempoFreqAfterFanfare(1.18921f, 90); break; case 4: - play->csCtx.script = D_80ABFB40; + play->csCtx.script = gDoorOfTimeOpeningCs; gSaveContext.cutsceneTrigger = 1; break; case 6: - play->csCtx.script = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_003C80) - : SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_005020); + play->csCtx.script = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(gGraveyardTombOpeningAdultCs) + : SEGMENTED_TO_VIRTUAL(gGraveyardTombOpeningChildCs); gSaveContext.cutsceneTrigger = 1; SET_EVENTCHKINF(EVENTCHKINF_1D); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c index fe0ecb8ecf..f0c0b4d3b3 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c @@ -2,8 +2,8 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_80ABF9D0[] = { - CS_BEGIN_CUTSCENE(4, 360), +CutsceneData gWindmillSpinningFasterCs[] = { + CS_HEADER(4, 360), CS_DESTINATION(CS_DEST_KAKARIKO_VILLAGE_DRAIN_WELL, 200, 201), CS_CAM_EYE_SPLINE(0, 331), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3100, 201, -100, 0x3235), @@ -25,11 +25,11 @@ CutsceneData D_80ABF9D0[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 3118, 142, 96, 0x2C20), CS_MISC_LIST(1), CS_MISC(CS_MISC_SET_FLAG_FAST_WINDMILL, 30, 31, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000002, 0xFFFFFFFE, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_END(), + CS_END_OF_SCRIPT(), }; -CutsceneData D_80ABFB40[] = { - CS_BEGIN_CUTSCENE(18, 3000), +CutsceneData gDoorOfTimeOpeningCs[] = { + CS_HEADER(18, 3000), CS_UNK_DATA_LIST(0x00000021, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0x00000000, 0x00000000), CS_PLAYER_CUE_LIST(3), @@ -38,9 +38,9 @@ CutsceneData D_80ABFB40[] = { CS_PLAYER_CUE(PLAYER_CUEID_5, 201, 662, 0x0000, 0x8000, 0x0000, 0, -40, 1400, 0, -40, 1400, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_MISC_LIST(1), CS_MISC(CS_MISC_TRIFORCE_FLASH, 510, 611, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(48, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_5, 1), CS_ACTOR_CUE(0x0003, 160, 289, 0x0000, 0x0000, 0x0000, 0, 20, 1400, 0, 60, 1400, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x3E9EC27B, 0.31007752f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(48, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_5, 3), CS_ACTOR_CUE(0x0004, 340, 420, 0x0000, 0x0000, 0x0000, 0, 120, 1335, 0, 40, 1335, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBF800000, -1.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 420, 465, 0x0000, 0x0000, 0x0000, 0, 40, 1335, 0, 16, 1335, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBF088889, -0.53333336f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 465, 519, 0x0000, 0x0000, 0x0000, 0, 16, 1335, 0, 16, 1335, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -132,6 +132,6 @@ CutsceneData D_80ABFB40[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xC9A5), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xA5A2), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xA5BB), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 5329f4904b..caeb39279d 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -147,7 +147,7 @@ void EnOkuta_Init(Actor* thisx, PlayState* play) { } else { ActorShape_Init(&thisx->shape, 1100.0f, ActorShadow_DrawCircle, 18.0f); thisx->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, thisx, &sProjectileColliderInit); Actor_ChangeCategory(play, &play->actorCtx, thisx, ACTORCAT_PROP); diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 11ac675e34..22d8bb572f 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -14,7 +14,7 @@ #include "assets/objects/object_masterzoora/object_masterzoora.h" #include "assets/objects/object_masterkokirihead/object_masterkokirihead.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #if !PLATFORM_GC #define CURSOR_COLOR_R 0 @@ -877,18 +877,18 @@ void EnOssan_TryPaybackMask(EnOssan* this, PlayState* play) { Rupees_ChangeBy(-price); if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD) { - SET_EVENTCHKINF(EVENTCHKINF_8F); + SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_BUNNY_HOOD); Message_ContinueTextbox(play, 0x70A9); this->happyMaskShopState = OSSAN_HAPPY_STATE_ALL_MASKS_SOLD; return; } if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK) { - SET_EVENTCHKINF(EVENTCHKINF_8C); + SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_KEATON_MASK); } else if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK) { - SET_EVENTCHKINF(EVENTCHKINF_8E); + SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SPOOKY_MASK); } else if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK) { - SET_EVENTCHKINF(EVENTCHKINF_8D); + SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SKULL_MASK); } Message_ContinueTextbox(play, 0x70A7); @@ -2059,7 +2059,7 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) { if (this->actor.params == OSSAN_TYPE_MASK) { if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT) { if (GET_ITEMGETINF(ITEMGETINF_3B)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_8F)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_BUNNY_HOOD)) { // Pay back Bunny Hood this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD; return 0x70C6; @@ -2068,7 +2068,7 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) { } } if (GET_ITEMGETINF(ITEMGETINF_3A)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_8E)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SPOOKY_MASK)) { // Pay back Spooky Mask this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK; return 0x70C5; @@ -2077,7 +2077,7 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) { } } if (GET_ITEMGETINF(ITEMGETINF_39)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_8D)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SKULL_MASK)) { // Pay back Skull Mask this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK; return 0x70C4; @@ -2086,7 +2086,7 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) { } } if (GET_ITEMGETINF(ITEMGETINF_38)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_8C)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_KEATON_MASK)) { // Pay back Keaton Mask this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK; return 0x70A5; @@ -2120,7 +2120,7 @@ void EnOssan_InitActionFunc(EnOssan* this, PlayState* play) { ShopItem* items; if (EnOssan_AreShopkeeperObjectsLoaded(this, play)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->objectSlot1; Actor_SetObjectDependency(play, &this->actor); diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 78b170c63d..c5ed802b70 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -10,7 +10,7 @@ #include "assets/scenes/overworld/spot16/spot16_scene.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnOwl_Init(Actor* thisx, PlayState* play); void EnOwl_Destroy(Actor* thisx, PlayState* play); @@ -99,9 +99,9 @@ static ColliderCylinderInit sOwlCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 25, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2400, ICHAIN_STOP), }; void EnOwl_Init(Actor* thisx, PlayState* play) { @@ -146,7 +146,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { switch (owlType) { case OWL_DEFAULT: this->actionFunc = EnOwl_WaitDefault; - this->actor.uncullZoneForward = 4000.0f; + this->actor.cullingVolumeDistance = 4000.0f; this->unk_40A = 0; break; case OWL_OUTSIDE_KOKIRI: @@ -833,7 +833,7 @@ void func_80ACBAB8(EnOwl* this, PlayState* play) { } void func_80ACBC0C(EnOwl* this, PlayState* play) { - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; if (this->actor.xzDistToPlayer > 6000.0f && !(this->actionFlags & 0x80)) { Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 9651575806..215442f52e 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -8,7 +8,7 @@ #include "assets/objects/object_tite/object_tite.h" #include "assets/objects/object_ik/object_ik.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnPart_Init(Actor* thisx, PlayState* play); void EnPart_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 8761c568d0..6265f2c5f3 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -3,7 +3,9 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) #define GROUND_HOVER_HEIGHT 75.0f #define MAX_LARVA 3 @@ -211,15 +213,15 @@ void EnPeehat_Init(Actor* thisx, PlayState* play) { this->actor.naviEnemyId = NAVI_ENEMY_PEAHAT; this->xzDistToRise = 740.0f; this->xzDistMax = 1200.0f; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 800.0f; - this->actor.uncullZoneDownward = 1800.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 800.0f; + this->actor.cullingVolumeDownward = 1800.0f; switch (this->actor.params) { case PEAHAT_TYPE_GROUNDED: EnPeehat_Ground_SetStateGround(this); break; case PEAHAT_TYPE_FLYING: - this->actor.uncullZoneForward = 4200.0f; + this->actor.cullingVolumeDistance = 4200.0f; this->xzDistToRise = 2800.0f; this->xzDistMax = 1400.0f; EnPeehat_Flying_SetStateGround(this); @@ -983,7 +985,7 @@ void EnPeehat_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->colQuad.base); } // if PEAHAT_TYPE_GROUNDED - if (thisx->params < 0 && (thisx->flags & ACTOR_FLAG_6)) { + if (thisx->params < 0 && (thisx->flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { for (i = 1; i >= 0; i--) { poly = NULL; posB = &this->bladeTip[i]; diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index d6c5348862..fefa80aecc 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -7,7 +7,7 @@ #include "z_en_po_desert.h" #include "assets/objects/object_po_field/object_po_field.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_REACT_TO_LENS | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_REACT_TO_LENS | ACTOR_FLAG_IGNORE_QUAKE) void EnPoDesert_Init(Actor* thisx, PlayState* play); void EnPoDesert_Destroy(Actor* thisx, PlayState* play); @@ -53,7 +53,7 @@ static ColliderCylinderInit sColliderInit = { static InitChainEntry sInitChain[] = { ICHAIN_S8(naviEnemyId, NAVI_ENEMY_POE_WASTELAND, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 3200, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 8c694c46fd..b4de777c72 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -8,8 +8,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_field/object_po_field.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE) void EnPoField_Init(Actor* thisx, PlayState* play); void EnPoField_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index e79cec70c7..e515efabed 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -8,9 +8,9 @@ #include "overlays/actors/ovl_En_Honotrap/z_en_honotrap.h" #include "assets/objects/object_tk/object_tk.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_IGNORE_QUAKE | \ - ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED) void EnPoRelay_Init(Actor* thisx, PlayState* play); void EnPoRelay_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 71ab72ebb4..3af363a28f 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -8,9 +8,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_sisters/object_po_sisters.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | \ - ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) void EnPoSisters_Init(Actor* thisx, PlayState* play); void EnPoSisters_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index ceebba950c..2168c89e6b 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -8,7 +8,8 @@ #include "assets/objects/object_poh/object_poh.h" #include "assets/objects/object_po_composer/object_po_composer.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE) void EnPoh_Init(Actor* thisx, PlayState* play); void EnPoh_Destroy(Actor* thisx, PlayState* play); @@ -372,7 +373,7 @@ void EnPoh_SetupDeath(EnPoh* this, PlayState* play) { this->actor.draw = EnPoh_DrawSoul; this->actor.shape.shadowDraw = NULL; Actor_SetScale(&this->actor, 0.01f); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.gravity = -1.0f; this->actor.shape.yOffset = 1500.0f; this->actor.world.pos.y -= 15.0f; @@ -924,7 +925,7 @@ void EnPoh_Update(Actor* thisx, PlayState* play) { this->colliderCyl.dim.height = 55; this->colliderCyl.dim.yShift = 15; } - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnPoh_SetupInitialAction(this); } } diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index d9441d5506..495046f95d 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -7,7 +7,7 @@ #include "z_en_pu_box.h" #include "assets/objects/object_pu_box/object_pu_box.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnPubox_Init(Actor* thisx, PlayState* play); void EnPubox_Destroy(Actor* thisx, PlayState* play); @@ -48,8 +48,8 @@ void EnPubox_Init(Actor* thisx, PlayState* play) { this->unk_164 = 1; thisx->colChkInfo.cylRadius = 20; thisx->colChkInfo.cylHeight = 50; - thisx->uncullZoneDownward = 1200.0f; - thisx->uncullZoneScale = 720.0f; + thisx->cullingVolumeDownward = 1200.0f; + thisx->cullingVolumeScale = 720.0f; ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 6.0f); this->dyna.interactFlags = 0; this->dyna.transformFlags = 0; diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 89c9e5ff6b..ee6734ea64 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -1,7 +1,9 @@ #include "z_en_rd.h" #include "assets/objects/object_rd/object_rd.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnRd_Init(Actor* thisx, PlayState* play); void EnRd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index d37ffa8c02..685928db80 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -10,7 +10,9 @@ #include "terminal.h" #include "assets/objects/object_reeba/object_reeba.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void EnReeba_Init(Actor* thisx, PlayState* play); void EnReeba_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 8aa760ecaf..a3861adec4 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -6,7 +6,7 @@ #include "z_en_river_sound.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnRiverSound_Init(Actor* thisx, PlayState* play); void EnRiverSound_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 8271dc4a6c..6d79ef6288 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -8,7 +8,7 @@ #include "terminal.h" #include "assets/objects/object_rl/object_rl.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnRl_Init(Actor* thisx, PlayState* play); void EnRl_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 0708af32ef..ff67d09329 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -9,8 +9,9 @@ #include "terminal.h" #include "versions.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) #define RR_MESSAGE_SHIELD (1 << 0) #define RR_MESSAGE_TUNIC (1 << 1) diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 2ea4e87dd3..3586ed73d7 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -10,7 +10,7 @@ #include "versions.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void EnRu1_Init(Actor* thisx, PlayState* play); void EnRu1_Destroy(Actor* thisx, PlayState* play); @@ -862,7 +862,7 @@ void func_80AEC780(EnRu1* this, PlayState* play) { (!(player->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21))) && (player->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { - play->csCtx.script = D_80AF0880; + play->csCtx.script = gRutoFirstMeetingCs; gSaveContext.cutsceneTrigger = 1; player->speedXZ = 0.0f; this->action = 8; @@ -1552,7 +1552,7 @@ s32 func_80AEE394(EnRu1* this, PlayState* play) { if (dynaPolyActor != NULL && dynaPolyActor->actor.id == ACTOR_BG_BDAN_OBJECTS && dynaPolyActor->actor.params == 0 && !Player_InCsMode(play) && play->msgCtx.msgLength == 0) { func_80AEE02C(this); - play->csCtx.script = D_80AF10A4; + play->csCtx.script = gRutoObtainingSapphireCs; gSaveContext.cutsceneTrigger = 1; this->action = 36; this->drawConfig = 0; @@ -1625,7 +1625,7 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) { func_80AED600(this); this->action = 34; this->unk_26C = 0.0f; - play->csCtx.script = D_80AF1728; + play->csCtx.script = gRutoFoundSapphireCs; gSaveContext.cutsceneTrigger = 1; } this->roomNum3 = curRoomNum; @@ -2155,7 +2155,7 @@ void func_80AEFCE8(EnRu1* this, PlayState* play) { void func_80AEFD38(EnRu1* this, PlayState* play) { if (GET_EVENTCHKINF(EVENTCHKINF_37) && LINK_IS_CHILD) { func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->action = 44; this->drawConfig = 1; } else { diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c index 6e8c8f4d31..bce6bf6cac 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c @@ -2,8 +2,8 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_80AF0880[] = { - CS_BEGIN_CUTSCENE(15, 1306), +static CutsceneData gRutoFirstMeetingCs[] = { + CS_HEADER(15, 1306), CS_PLAYER_CUE_LIST(10), CS_PLAYER_CUE(PLAYER_CUEID_39, 0, 50, 0x0000, 0x6C16, 0x0000, 12, -340, -2810, 12, -340, -2810, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_3, 50, 70, 0x0000, 0x6C16, 0x0000, 12, -340, -2810, 12, -340, -2810, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), @@ -15,7 +15,7 @@ static CutsceneData D_80AF0880[] = { CS_PLAYER_CUE(PLAYER_CUEID_3, 259, 276, 0x0000, 0x6C16, 0x0000, 100, -340, -2991, 100, -340, -2991, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_2, 276, 297, 0x0000, 0x6C16, 0x0000, 100, -340, -2991, 182, -340, -3132, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 297, 843, 0x0000, 0x6C16, 0x0000, 182, -340, -3132, 182, -340, -3132, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_ACTOR_CUE_LIST(63, 4), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_3_5, 4), CS_ACTOR_CUE(0x0002, 0, 178, 0x0000, 0xEC16, 0x0000, 127, -340, -3041, 127, -340, -3041, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_ACTOR_CUE(0x0003, 178, 245, 0x0000, 0x6C16, 0x0000, 127, -340, -3041, 127, -340, -3041, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_ACTOR_CUE(0x0004, 245, 260, 0x0000, 0x6C16, 0x0000, 127, -340, -3041, 127, -340, -3041, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), @@ -24,9 +24,9 @@ static CutsceneData D_80AF0880[] = { CS_MISC(CS_MISC_STOP_CUTSCENE, 315, 345, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000), CS_TEXT_LIST(4), CS_TEXT_NONE(0, 157), - CS_TEXT(0x404B, 157, 175, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x404B, 157, 175, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_TEXT_NONE(175, 252), - CS_TEXT(0x401E, 252, 300, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x401E, 252, 300, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_CAM_EYE_SPLINE(0, 247), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4235998B, 45.399944f), 55, -290, -2749, 0x20BA), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4235998B, 45.399944f), 55, -290, -2749, 0x44B8), @@ -107,39 +107,39 @@ static CutsceneData D_80AF0880[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x423B3327, 46.799953f), 305, -272, -3274, 0x5B80), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_APPEAR, 74, 75, 0x0000, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x0000004E, 0xFFFFFFF1, 0x00000000, 0x0000004E), - CS_END(), + CS_END_OF_SCRIPT(), }; static u32 D_80AF10A0 = 0; -static CutsceneData D_80AF10A4[] = { - CS_BEGIN_CUTSCENE(14, 1299), +static CutsceneData gRutoObtainingSapphireCs[] = { + CS_HEADER(14, 1299), CS_PLAYER_CUE_LIST(3), CS_PLAYER_CUE(PLAYER_CUEID_5, 0, 272, 0x0000, 0xC000, 0x0000, -1085, -1025, -3347, -1085, -1025, -3347, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_3, 272, 292, 0x0000, 0xC000, 0x0000, -1085, -1025, -3347, -1085, -1025, -3347, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 292, 777, 0x0000, 0xC000, 0x0000, -1085, -1025, -3347, -1085, -1025, -3347, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 330, 627, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(66, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_3_7, 3), CS_ACTOR_CUE(0x0001, 0, 40, 0x0000, 0x4000, 0x0000, -1352, -969, -3341, -1352, -969, -3341, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_ACTOR_CUE(0x0002, 40, 213, 0x0000, 0x4000, 0x0000, -1352, -969, -3341, -1360, -969, -3343, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_ACTOR_CUE(0x0003, 213, 1000, 0x0000, 0x4000, 0x0000, -1360, -969, -3343, -1360, -969, -3343, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_ACTOR_CUE_LIST(48, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_5, 1), CS_ACTOR_CUE(0x0002, 0, 90, 0x0000, 0x0000, 0x0000, -1360, -963, -3343, -1360, -963, -3343, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(48, 2), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_5, 2), CS_ACTOR_CUE(0x0002, 90, 211, 0x0000, 0x0000, 0x0000, -1352, -922, -3341, -1352, -922, -3341, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0006, 211, 311, 0x0000, 0x0000, 0x0000, -1352, -922, -3341, -1352, -922, -3341, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(62, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 3), CS_ACTOR_CUE(0x0004, 0, 210, 0x0000, 0x0000, 0x0000, -1065, -972, -3305, -1065, -978, -3305, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBCEA0EA1, -0.028571429f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 210, 220, 0x8000, 0x0000, 0x0000, -1065, -978, -3305, -1065, -973, -3344, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x3F000000, 0.5f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 220, 410, 0x0000, 0x0000, 0x0000, -1065, -973, -3344, -1065, -976, -3344, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBC8158ED, -0.015789473f), CS_FLOAT(0x0, 0.0f)), CS_TEXT_LIST(6), CS_TEXT_NONE(0, 162), - CS_TEXT(0x4050, 162, 211, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x4050, 162, 211, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_TEXT_NONE(211, 232), - CS_TEXT(0x4051, 232, 241, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x4051, 232, 241, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_TEXT_NONE(241, 247), - CS_TEXT(0x4052, 247, 299, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x4052, 247, 299, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_ITEM_GET, 112, 113, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x000000B1, 0x00000000, 0xFFFFFFC7, 0x000000B1), CS_CAM_EYE_SPLINE(0, 1176), @@ -196,16 +196,16 @@ static CutsceneData D_80AF10A4[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x41F273D3, 30.306555f), -1426, -857, -3190, 0x00D7), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x41F273D3, 30.306555f), -1426, -857, -3190, 0x00E8), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x41F273D3, 30.306555f), -1426, -857, -3190, 0x00EA), - CS_END(), + CS_END_OF_SCRIPT(), }; static u32 D_80AF1724 = 0; -static CutsceneData D_80AF1728[] = { - CS_BEGIN_CUTSCENE(7, 1160), +static CutsceneData gRutoFoundSapphireCs[] = { + CS_HEADER(7, 1160), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 75, 627, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(48, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_5, 1), CS_ACTOR_CUE(0x0002, 0, 90, 0x0000, 0x0000, 0x0000, -1360, -963, -3343, -1360, -963, -3343, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_CAM_EYE_SPLINE(0, 1091), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42226662, 40.599983f), -1381, -958, -3331, 0x8BC0), @@ -233,7 +233,7 @@ static CutsceneData D_80AF1728[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x424B3339, 50.800022f), -35, 56, -93, 0x0000), CS_TEXT_LIST(2), CS_TEXT_NONE(0, 35), - CS_TEXT(0x404F, 35, 70, 0x0000, 0xFFFF, 0xFFFF), - CS_END(), + CS_TEXT(0x404F, 35, 70, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 4e15ee767a..eff82bc1ec 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -9,39 +9,68 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnRu2_Init(Actor* thisx, PlayState* play); void EnRu2_Destroy(Actor* thisx, PlayState* play); void EnRu2_Update(Actor* thisx, PlayState* play); void EnRu2_Draw(Actor* thisx, PlayState* play); -void func_80AF2CB4(EnRu2* this, PlayState* play); -void func_80AF2CD4(EnRu2* this, PlayState* play); -void func_80AF2CF4(EnRu2* this, PlayState* play); -void func_80AF2D2C(EnRu2* this, PlayState* play); -void func_80AF2D6C(EnRu2* this, PlayState* play); -void func_80AF2DAC(EnRu2* this, PlayState* play); -void func_80AF2DEC(EnRu2* this, PlayState* play); -void func_80AF3144(EnRu2* this, PlayState* play); -void func_80AF3174(EnRu2* this, PlayState* play); -void func_80AF31C8(EnRu2* this, PlayState* play); -void func_80AF3604(EnRu2* this, PlayState* play); -void func_80AF3624(EnRu2* this, PlayState* play); -void func_80AF366C(EnRu2* this, PlayState* play); -void func_80AF36AC(EnRu2* this, PlayState* play); -void func_80AF3BC8(EnRu2* this, PlayState* play); -void func_80AF3C04(EnRu2* this, PlayState* play); -void func_80AF3C64(EnRu2* this, PlayState* play); -void func_80AF3CB8(EnRu2* this, PlayState* play); -void func_80AF3D0C(EnRu2* this, PlayState* play); -void func_80AF3D60(EnRu2* this, PlayState* play); - -void func_80AF3F14(EnRu2* this, PlayState* play); -void func_80AF3F20(EnRu2* this, PlayState* play); -void func_80AF321C(EnRu2* this, PlayState* play); - -void func_80AF2AB4(EnRu2* this, PlayState* play); +void EnRu2_SetupWaterMedallionCutscene(EnRu2* this, PlayState* play); +void EnRu2_AwaitBlueWarp(EnRu2* this, PlayState* play); +void EnRu2_RiseThroughBlueWarp(EnRu2* this, PlayState* play); +void EnRu2_SageOfWaterDialog(EnRu2* this, PlayState* play); +void EnRu2_RaiseArms(EnRu2* this, PlayState* play); +void EnRu2_AwaitWaterMedallion(EnRu2* this, PlayState* play); +void EnRu2_FinishWaterMedallionCutscene(EnRu2* this, PlayState* play); +void EnRu2_WaterTrialInvisible(EnRu2* this, PlayState* play); +void EnRu2_WaterTrialFade(EnRu2* this, PlayState* play); +void EnRu2_AwaitSpawnLightBall(EnRu2* this, PlayState* play); +void EnRu2_CreditsInvisible(EnRu2* this, PlayState* play); +void EnRu2_CreditsFadeIn(EnRu2* this, PlayState* play); +void EnRu2_CreditsVisible(EnRu2* this, PlayState* play); +void EnRu2_CreditsTurnHeadDownLeft(EnRu2* this, PlayState* play); +void EnRu2_WaterTempleEncounterRangeCheck(EnRu2* this, PlayState* play); +void EnRu2_WaterTempleEncounterUnconditional(EnRu2* this, PlayState* play); +void EnRu2_WaterTempleEncounterBegin(EnRu2* this, PlayState* play); +void EnRu2_WaterTempleEncounterDialog(EnRu2* this, PlayState* play); +void EnRu2_WaterTempleEncounterEnd(EnRu2* this, PlayState* play); +void EnRu2_WaterTempleSwimmingUp(EnRu2* this, PlayState* play); + +void EnRu2_DrawNothing(EnRu2* this, PlayState* play); +void EnRu2_DrawOpa(EnRu2* this, PlayState* play); +void EnRu2_DrawXlu(EnRu2* this, PlayState* play); + +void EnRu2_CheckWaterMedallionCutscene(EnRu2* this, PlayState* play); + +typedef enum { + /* 00 */ ENRU2_SETUP_WATER_MEDALLION_CS, + /* 01 */ ENRU2_AWAIT_BLUE_WARP, + /* 02 */ ENRU2_RISE_THROUGH_BLUE_WARP, + /* 03 */ ENRU2_SAGE_OF_WATER_DIALOG, + /* 04 */ ENRU2_RAISE_ARMS, + /* 05 */ ENRU2_AWAIT_SPAWN_WATER_MEDALLION, + /* 06 */ ENRU2_FINISH_WATER_MEDALLION_CS, + /* 07 */ ENRU2_WATER_TRIAL_INVISIBLE, + /* 08 */ ENRU2_WATER_TRIAL_FADE, + /* 09 */ ENRU2_AWAIT_SPAWN_LIGHT_BALL, + /* 10 */ ENRU2_CREDITS_INVISIBLE, + /* 11 */ ENRU2_CREDITS_FADE_IN, + /* 12 */ ENRU2_CREDITS_VISIBLE, + /* 13 */ ENRU2_CREDITS_TURN_HEAD_DOWN_LEFT, + /* 14 */ ENRU2_WATER_TEMPLE_ENCOUNTER_RANGE_CHECK, + /* 15 */ ENRU2_WATER_TEMPLE_ENCOUNTER_UNCONDITIONAL, // unused + /* 16 */ ENRU2_WATER_TEMPLE_ENCOUNTER_BEGINNING, + /* 17 */ ENRU2_WATER_TEMPLE_ENCOUNTER_DIALOG, + /* 18 */ ENRU2_WATER_TEMPLE_ENCOUNTER_END, + /* 19 */ ENRU2_WATER_TEMPLE_SWIMMING_UP +} EnRu2Action; + +typedef enum { + /* 00 */ ENRU2_DRAW_NOTHING, + /* 01 */ ENRU2_DRAW_OPA, + /* 02 */ ENRU2_DRAW_XLU +} EnRu2DrawConfig; static ColliderCylinderInitType1 sCylinderInit = { { @@ -68,15 +97,32 @@ static UNK_TYPE D_80AF4118 = 0; #include "z_en_ru2_cutscene_data.inc.c" static EnRu2ActionFunc sActionFuncs[] = { - func_80AF2CB4, func_80AF2CD4, func_80AF2CF4, func_80AF2D2C, func_80AF2D6C, func_80AF2DAC, func_80AF2DEC, - func_80AF3144, func_80AF3174, func_80AF31C8, func_80AF3604, func_80AF3624, func_80AF366C, func_80AF36AC, - func_80AF3BC8, func_80AF3C04, func_80AF3C64, func_80AF3CB8, func_80AF3D0C, func_80AF3D60, + EnRu2_SetupWaterMedallionCutscene, + EnRu2_AwaitBlueWarp, + EnRu2_RiseThroughBlueWarp, + EnRu2_SageOfWaterDialog, + EnRu2_RaiseArms, + EnRu2_AwaitWaterMedallion, + EnRu2_FinishWaterMedallionCutscene, + EnRu2_WaterTrialInvisible, + EnRu2_WaterTrialFade, + EnRu2_AwaitSpawnLightBall, + EnRu2_CreditsInvisible, + EnRu2_CreditsFadeIn, + EnRu2_CreditsVisible, + EnRu2_CreditsTurnHeadDownLeft, + EnRu2_WaterTempleEncounterRangeCheck, + EnRu2_WaterTempleEncounterUnconditional, + EnRu2_WaterTempleEncounterBegin, + EnRu2_WaterTempleEncounterDialog, + EnRu2_WaterTempleEncounterEnd, + EnRu2_WaterTempleSwimmingUp, }; static EnRu2DrawFunc sDrawFuncs[] = { - func_80AF3F14, - func_80AF3F20, - func_80AF321C, + EnRu2_DrawNothing, + EnRu2_DrawOpa, + EnRu2_DrawXlu, }; ActorProfile En_Ru2_Profile = { @@ -91,14 +137,14 @@ ActorProfile En_Ru2_Profile = { /**/ EnRu2_Draw, }; -void func_80AF2550(Actor* thisx, PlayState* play) { +void EnRu2_InitCollider(Actor* thisx, PlayState* play) { EnRu2* this = (EnRu2*)thisx; Collider_InitCylinder(play, &this->collider); Collider_SetCylinderType1(play, &this->collider, &this->actor, &sCylinderInit); } -void func_80AF259C(EnRu2* this, PlayState* play) { +void EnRu2_UpdateCollider(EnRu2* this, PlayState* play) { s32 pad[5]; Collider_UpdateCylinder(&this->actor, &this->collider); @@ -111,41 +157,41 @@ void EnRu2_Destroy(Actor* thisx, PlayState* play) { Collider_DestroyCylinder(play, &this->collider); } -void func_80AF2608(EnRu2* this) { +void EnRu2_UpdateEyes(EnRu2* this) { s32 pad[3]; - s16* unk_2A6 = &this->unk_2A6; - s16* unk_2A4 = &this->unk_2A4; + s16* blinkTimer = &this->blinkTimer; + s16* eyeIndex = &this->eyeIndex; - if (DECR(*unk_2A6) == 0) { - *unk_2A6 = Rand_S16Offset(0x3C, 0x3C); + if (DECR(*blinkTimer) == 0) { + *blinkTimer = Rand_S16Offset(60, 60); } - *unk_2A4 = *unk_2A6; - if (*unk_2A4 >= 3) { - *unk_2A4 = 0; + *eyeIndex = *blinkTimer; + if (*eyeIndex >= 3) { + *eyeIndex = 0; } } -s32 func_80AF2690(EnRu2* this) { - s32 params_shift = PARAMS_GET_U(this->actor.params, 8, 8); +s32 EnRu2_GetSwitchFlag(EnRu2* this) { + s32 switchFlag = ENRU2_GET_SWITCH_FLAG(this); - return params_shift; + return switchFlag; } -s32 func_80AF26A0(EnRu2* this) { - s32 params = PARAMS_GET_U(this->actor.params, 0, 8); +s32 EnRu2_GetType(EnRu2* this) { + s32 type = ENRU2_GET_TYPE(this); - return params; + return type; } #if DEBUG_FEATURES void func_80AF26AC(EnRu2* this) { - this->action = 7; - this->drawConfig = 0; + this->action = ENRU2_WATER_TRIAL_INVISIBLE; + this->drawConfig = ENRU2_DRAW_NOTHING; this->alpha = 0; - this->unk_2B8 = 0; + this->isLightBall = false; this->actor.shape.shadowAlpha = 0; - this->unk_2B0 = 0.0f; + this->fadeTimer = 0.0f; } void func_80AF26D0(EnRu2* this, PlayState* play) { @@ -168,7 +214,7 @@ void func_80AF26D0(EnRu2* this, PlayState* play) { } #endif -void func_80AF2744(EnRu2* this, PlayState* play) { +void EnRu2_UpdateBgCheckInfo(EnRu2* this, PlayState* play) { Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_2); } @@ -186,7 +232,7 @@ CsCmdActorCue* EnRu2_GetCue(PlayState* play, s32 cueChannel) { return NULL; } -s32 func_80AF27D0(EnRu2* this, PlayState* play, u16 cueId, s32 cueChannel) { +s32 EnRu2_CheckCueMatchingId(EnRu2* this, PlayState* play, u16 cueId, s32 cueChannel) { CsCmdActorCue* cue = EnRu2_GetCue(play, cueChannel); if ((cue != NULL) && (cue->id == cueId)) { @@ -195,7 +241,7 @@ s32 func_80AF27D0(EnRu2* this, PlayState* play, u16 cueId, s32 cueChannel) { return false; } -s32 func_80AF281C(EnRu2* this, PlayState* play, u16 cueId, s32 cueChannel) { +s32 EnRu2_CheckCueNotMatchingId(EnRu2* this, PlayState* play, u16 cueId, s32 cueChannel) { CsCmdActorCue* cue = EnRu2_GetCue(play, cueChannel); if ((cue != NULL) && (cue->id != cueId)) { @@ -204,7 +250,10 @@ s32 func_80AF281C(EnRu2* this, PlayState* play, u16 cueId, s32 cueChannel) { return false; } -void func_80AF2868(EnRu2* this, PlayState* play, u32 cueChannel) { +/** + * Checks cutscene data and, if applicable, configures Ruto's position accordingly. + */ +void EnRu2_InitPositionFromCue(EnRu2* this, PlayState* play, u32 cueChannel) { CsCmdActorCue* cue = EnRu2_GetCue(play, cueChannel); Actor* thisx = &this->actor; @@ -217,35 +266,50 @@ void func_80AF2868(EnRu2* this, PlayState* play, u32 cueChannel) { } } -void func_80AF28E8(EnRu2* this, AnimationHeader* animation, u8 arg2, f32 morphFrames, s32 arg4) { +/** + * Changes the animation for Ruto's actor. The direction argument decides whether to play the animation + * forwards (if 0) or backwards (otherwise). + */ +void EnRu2_AnimationChange(EnRu2* this, AnimationHeader* animation, u8 mode, f32 morphFrames, s32 direction) { f32 frameCount = Animation_GetLastFrame(animation); f32 playbackSpeed; - f32 unk0; - f32 fc; + f32 startFrame; + f32 endFrame; - if (arg4 == 0) { - unk0 = 0.0f; - fc = frameCount; + if (direction == 0) { + startFrame = 0.0f; + endFrame = frameCount; playbackSpeed = 1.0f; } else { - unk0 = frameCount; - fc = 0.0f; + startFrame = frameCount; + endFrame = 0.0f; playbackSpeed = -1.0f; } - Animation_Change(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, morphFrames); + Animation_Change(&this->skelAnime, animation, playbackSpeed, startFrame, endFrame, mode, morphFrames); } -void func_80AF2978(EnRu2* this, PlayState* play) { +/** + * Gradually increases Ruto's model's Y-offset as she rises up through the blue warp in the Chamber of Sages. + */ +void EnRu2_Rise(EnRu2* this, PlayState* play) { this->actor.shape.yOffset += 250.0f / 3.0f; } -void func_80AF2994(EnRu2* this, PlayState* play) { - func_80AF28E8(this, &gAdultRutoIdleAnim, 0, 0.0f, 0); +/** + * Sets up Ruto's actor in the Chamber of Sages. + * Note: All sages actors are present in the Chamber of Sages, regardless of which dungeon was just completed. + * This function runs unconditionally, even if it is not relevant for Ruto. + */ +void EnRu2_InitChamberOfSages(EnRu2* this, PlayState* play) { + EnRu2_AnimationChange(this, &gAdultRutoIdleAnim, 0, 0.0f, 0); this->actor.shape.yOffset = -10000.0f; } -void func_80AF29DC(EnRu2* this, PlayState* play) { +/** + * Spawns the blue warp for Ruto to rise up through in the Chamber of Sages. + */ +void EnRu2_SpawnBlueWarp(EnRu2* this, PlayState* play) { Actor* thisx = &this->actor; f32 posX = thisx->world.pos.x; f32 posY = thisx->world.pos.y; @@ -254,34 +318,43 @@ void func_80AF29DC(EnRu2* this, PlayState* play) { Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, WARP_SAGES); } -void func_80AF2A38(EnRu2* this, PlayState* play) { +/** + * Spawns the Water Medallion. + */ +void EnRu2_SpawnWaterMedallion(EnRu2* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 posX = player->actor.world.pos.x; f32 posY = player->actor.world.pos.y + 50.0f; f32 posZ = player->actor.world.pos.z; Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 10); + // Give the water medallion. This is redundant as it was already given in `EnRu2_CheckWaterMedallionCutscene` Item_Give(play, ITEM_MEDALLION_WATER); } -void func_80AF2AB4(EnRu2* this, PlayState* play) { +/** + * Sets up the Water Medallion Cutscene if coming from Water Temple. + * All sage actors are present in the Chamber of Sages regardless of which dungeon was just completed. + * This function will loop endlessly if the current sage cutscene is not for the Water Medallion. + */ +void EnRu2_CheckWaterMedallionCutscene(EnRu2* this, PlayState* play) { s32 pad[2]; Player* player; - s16 temp; + s16 yaw; if ((gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) && !IS_CUTSCENE_LAYER) { player = GET_PLAYER(play); - this->action = 1; - play->csCtx.script = D_80AF411C; + this->action = ENRU2_AWAIT_BLUE_WARP; + play->csCtx.script = gWaterMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_WATER); - temp = this->actor.world.rot.y + 0x8000; - player->actor.shape.rot.y = temp; - player->actor.world.rot.y = temp; + yaw = this->actor.world.rot.y + 0x8000; + player->actor.shape.rot.y = yaw; + player->actor.world.rot.y = yaw; } } -void func_80AF2B44(EnRu2* this, PlayState* play) { +void EnRu2_CheckIfBlueWarpShouldSpawn(EnRu2* this, PlayState* play) { CutsceneContext* csCtx = &play->csCtx; CsCmdActorCue* cue; @@ -289,21 +362,27 @@ void func_80AF2B44(EnRu2* this, PlayState* play) { cue = csCtx->actorCues[3]; if ((cue != NULL) && (cue->id == 2)) { - this->action = 2; - this->drawConfig = 1; - func_80AF29DC(this, play); + this->action = ENRU2_RISE_THROUGH_BLUE_WARP; + this->drawConfig = ENRU2_DRAW_OPA; + EnRu2_SpawnBlueWarp(this, play); } } } -void func_80AF2B94(EnRu2* this) { +/** + * Halts Ruto's rise up through the blue warp in the Chamber of Sages once finished. + */ +void EnRu2_EndRise(EnRu2* this) { if (this->actor.shape.yOffset >= 0.0f) { - this->action = 3; + this->action = ENRU2_SAGE_OF_WATER_DIALOG; this->actor.shape.yOffset = 0.0f; } } -void func_80AF2BC0(EnRu2* this, PlayState* play) { +/** + * Sets up the animation for Ruto to raise her arms to give Link the Water Medallion. + */ +void EnRu2_CheckStartRaisingArms(EnRu2* this, PlayState* play) { AnimationHeader* animation = &gAdultRutoRaisingArmsUpAnim; CsCmdActorCue* cue; @@ -313,175 +392,198 @@ void func_80AF2BC0(EnRu2* this, PlayState* play) { if ((cue != NULL) && (cue->id == 3)) { Animation_Change(&this->skelAnime, animation, 1.0f, 0.0f, Animation_GetLastFrame(animation), ANIMMODE_ONCE, 0.0f); - this->action = 4; + this->action = ENRU2_RAISE_ARMS; } } } -void func_80AF2C54(EnRu2* this, s32 arg1) { - if (arg1 != 0) { - this->action = 5; +/** + * At the end of Ruto's arms-raising animation, cues the next action: spawning the + * Water Medallion. + */ +void EnRu2_HoldArmsUp(EnRu2* this, s32 doneRaising) { + if (doneRaising != 0) { + this->action = ENRU2_AWAIT_SPAWN_WATER_MEDALLION; } } -void func_80AF2C68(EnRu2* this, PlayState* play) { +/** + * Checks to see if the Water Medallion should spawn. + */ +void EnRu2_CheckIfWaterMedallionShouldSpawn(EnRu2* this, PlayState* play) { CsCmdActorCue* cue; if (play->csCtx.state != CS_STATE_IDLE) { cue = play->csCtx.actorCues[6]; if ((cue != NULL) && (cue->id == 2)) { - this->action = 6; - func_80AF2A38(this, play); + this->action = ENRU2_FINISH_WATER_MEDALLION_CS; + EnRu2_SpawnWaterMedallion(this, play); } } } -void func_80AF2CB4(EnRu2* this, PlayState* play) { - func_80AF2AB4(this, play); +void EnRu2_SetupWaterMedallionCutscene(EnRu2* this, PlayState* play) { + EnRu2_CheckWaterMedallionCutscene(this, play); } -void func_80AF2CD4(EnRu2* this, PlayState* play) { - func_80AF2B44(this, play); +void EnRu2_AwaitBlueWarp(EnRu2* this, PlayState* play) { + EnRu2_CheckIfBlueWarpShouldSpawn(this, play); } -void func_80AF2CF4(EnRu2* this, PlayState* play) { - func_80AF2978(this, play); +void EnRu2_RiseThroughBlueWarp(EnRu2* this, PlayState* play) { + EnRu2_Rise(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF2B94(this); + EnRu2_UpdateEyes(this); + EnRu2_EndRise(this); } -void func_80AF2D2C(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_SageOfWaterDialog(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF2BC0(this, play); + EnRu2_UpdateEyes(this); + EnRu2_CheckStartRaisingArms(this, play); } -void func_80AF2D6C(EnRu2* this, PlayState* play) { - s32 something; +void EnRu2_RaiseArms(EnRu2* this, PlayState* play) { + s32 animDone; - func_80AF2744(this, play); - something = EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF2C54(this, something); + EnRu2_UpdateBgCheckInfo(this, play); + animDone = EnRu2_UpdateSkelAnime(this); + EnRu2_UpdateEyes(this); + EnRu2_HoldArmsUp(this, animDone); } -void func_80AF2DAC(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_AwaitWaterMedallion(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF2C68(this, play); + EnRu2_UpdateEyes(this); + EnRu2_CheckIfWaterMedallionShouldSpawn(this, play); } -void func_80AF2DEC(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_FinishWaterMedallionCutscene(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); + EnRu2_UpdateEyes(this); } -void func_80AF2E1C(EnRu2* this, PlayState* play) { - func_80AF28E8(this, &gAdultRutoCrossingArmsAnim, 2, 0.0f, 0); - this->action = 7; +/** + * Sets up Ruto in her arms-crossing pose. Used in the Water Trial in Ganon's Castle and in the + * Chamber of Sages during the "Sealing Ganon" cutscene. + */ +void EnRu2_InitWaterTrial(EnRu2* this, PlayState* play) { + EnRu2_AnimationChange(this, &gAdultRutoCrossingArmsAnim, 2, 0.0f, 0); + this->action = ENRU2_WATER_TRIAL_INVISIBLE; this->actor.shape.shadowAlpha = 0; } -void func_80AF2E64(void) { +void EnRu2_PlayWhiteOutSound(void) { Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T); } -void func_80AF2E84(EnRu2* this, PlayState* play) { +/** + * Spawns the ball of light that replaces Ruto's actor in the Water Trial. + */ +void EnRu2_SpawnLightBall(EnRu2* this, PlayState* play) { Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_6K, this->actor.world.pos.x, kREG(19) + 24.0f + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 8); } -void func_80AF2F04(EnRu2* this, PlayState* play) { - if (func_80AF27D0(this, play, 4, 3)) { - this->action = 8; - this->drawConfig = 2; +/** + * Checks to see if it's time for Ruto to fade in while crossing her arms. + */ +void EnRu2_CheckFadeIn(EnRu2* this, PlayState* play) { + if (EnRu2_CheckCueMatchingId(this, play, 4, 3)) { + this->action = ENRU2_WATER_TRIAL_FADE; + this->drawConfig = ENRU2_DRAW_XLU; this->alpha = 0; this->actor.shape.shadowAlpha = 0; - this->unk_2B0 = 0.0f; - func_80AF2E64(); + this->fadeTimer = 0.0f; + EnRu2_PlayWhiteOutSound(); } } -void func_80AF2F58(EnRu2* this, PlayState* play) { - f32* unk_2B0 = &this->unk_2B0; +/** + * Fades Ruto's actor in or out. Both happen during the Water Trial. + */ +void EnRu2_Fade(EnRu2* this, PlayState* play) { + f32* fadeTimer = &this->fadeTimer; s32 alpha; - if (func_80AF27D0(this, play, 4, 3)) { - *unk_2B0 += 1.0f; - if (*unk_2B0 >= kREG(5) + 10.0f) { - this->action = 9; - this->drawConfig = 1; - *unk_2B0 = kREG(5) + 10.0f; + if (EnRu2_CheckCueMatchingId(this, play, 4, 3)) { + *fadeTimer += 1.0f; + if (*fadeTimer >= kREG(5) + 10.0f) { + this->action = ENRU2_AWAIT_SPAWN_LIGHT_BALL; + this->drawConfig = ENRU2_DRAW_OPA; + *fadeTimer = kREG(5) + 10.0f; this->alpha = 255; this->actor.shape.shadowAlpha = 0xFF; return; } } else { - *unk_2B0 -= 1.0f; - if (*unk_2B0 <= 0.0f) { - this->action = 7; - this->drawConfig = 0; - *unk_2B0 = 0.0f; + *fadeTimer -= 1.0f; + if (*fadeTimer <= 0.0f) { + this->action = ENRU2_WATER_TRIAL_INVISIBLE; + this->drawConfig = ENRU2_DRAW_NOTHING; + *fadeTimer = 0.0f; this->alpha = 0; this->actor.shape.shadowAlpha = 0; return; } } - alpha = (*unk_2B0 / (kREG(5) + 10.0f)) * 255.0f; + alpha = (*fadeTimer / (kREG(5) + 10.0f)) * 255.0f; this->alpha = alpha; this->actor.shape.shadowAlpha = alpha; } -void func_80AF30AC(EnRu2* this, PlayState* play) { - if (func_80AF281C(this, play, 4, 3)) { - this->action = 8; - this->drawConfig = 2; - this->unk_2B0 = kREG(5) + 10.0f; +/** + * Checks to see if it's time for Ruto to fade out while her arms are crossed. + */ +void EnRu2_CheckFadeOut(EnRu2* this, PlayState* play) { + if (EnRu2_CheckCueNotMatchingId(this, play, 4, 3)) { + this->action = ENRU2_WATER_TRIAL_FADE; + this->drawConfig = ENRU2_DRAW_XLU; + this->fadeTimer = kREG(5) + 10.0f; this->alpha = 255; - if (this->unk_2B8 == 0) { - func_80AF2E84(this, play); - this->unk_2B8 = 1; + if (!this->isLightBall) { + EnRu2_SpawnLightBall(this, play); + this->isLightBall = true; } this->actor.shape.shadowAlpha = 0xFF; } } -void func_80AF3144(EnRu2* this, PlayState* play) { - func_80AF2F04(this, play); +void EnRu2_WaterTrialInvisible(EnRu2* this, PlayState* play) { + EnRu2_CheckFadeIn(this, play); #if DEBUG_FEATURES func_80AF26D0(this, play); #endif } -void func_80AF3174(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_WaterTrialFade(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF2F58(this, play); + EnRu2_UpdateEyes(this); + EnRu2_Fade(this, play); #if DEBUG_FEATURES func_80AF26D0(this, play); #endif } -void func_80AF31C8(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_AwaitSpawnLightBall(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF30AC(this, play); + EnRu2_UpdateEyes(this); + EnRu2_CheckFadeOut(this, play); #if DEBUG_FEATURES func_80AF26D0(this, play); #endif } -void func_80AF321C(EnRu2* this, PlayState* play) { +void EnRu2_DrawXlu(EnRu2* this, PlayState* play) { s32 pad[2]; - s16 temp = this->unk_2A4; - void* tex = sEyeTextures[temp]; + s16 eyeIndex = this->eyeIndex; + void* tex = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; OPEN_DISPS(play->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); @@ -499,56 +601,74 @@ void func_80AF321C(EnRu2* this, PlayState* play) { CLOSE_DISPS(play->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); } -void func_80AF3394(EnRu2* this, PlayState* play) { - func_80AF28E8(this, &gAdultRutoIdleHandsOnHipsAnim, 0, 0.0f, 0); - this->action = 10; - this->drawConfig = 0; +/** + * Sets up Ruto's hands-on-hips pose during the credits sequence. + */ +void EnRu2_InitCredits(EnRu2* this, PlayState* play) { + EnRu2_AnimationChange(this, &gAdultRutoIdleHandsOnHipsAnim, 0, 0.0f, 0); + this->action = ENRU2_CREDITS_INVISIBLE; + this->drawConfig = ENRU2_DRAW_NOTHING; this->actor.shape.shadowAlpha = 0; } -void func_80AF33E0(EnRu2* this) { - f32* unk_2B0 = &this->unk_2B0; - f32 temp_f0; - s32 temp_f18; +/** + * Fades in Ruto's actor during the credits sequence. + */ +void EnRu2_FadeInCredits(EnRu2* this) { + f32* fadeTimer = &this->fadeTimer; + f32 fadeDuration; + s32 alpha; - *unk_2B0 += 1.0f; + *fadeTimer += 1.0f; - temp_f0 = kREG(17) + 10.0f; - if (temp_f0 <= *unk_2B0) { + fadeDuration = kREG(17) + 10.0f; + if (fadeDuration <= *fadeTimer) { this->alpha = 255; this->actor.shape.shadowAlpha = 0xFF; } else { - temp_f18 = (*unk_2B0 / temp_f0) * 255.0f; - this->alpha = temp_f18; - this->actor.shape.shadowAlpha = temp_f18; + alpha = (*fadeTimer / fadeDuration) * 255.0f; + this->alpha = alpha; + this->actor.shape.shadowAlpha = alpha; } } -void func_80AF346C(EnRu2* this, PlayState* play) { - func_80AF2868(this, play, 3); - this->action = 11; - this->drawConfig = 2; +void EnRu2_InitCreditsPosition(EnRu2* this, PlayState* play) { + EnRu2_InitPositionFromCue(this, play, 3); + this->action = ENRU2_CREDITS_FADE_IN; + this->drawConfig = ENRU2_DRAW_XLU; } -void func_80AF34A4(EnRu2* this) { - if (this->unk_2B0 >= kREG(17) + 10.0f) { - this->action = 12; - this->drawConfig = 1; +/** + * Checks for the end of Ruto's fade-in during the credits sequence. + */ +void EnRu2_CheckVisibleInCredits(EnRu2* this) { + if (this->fadeTimer >= kREG(17) + 10.0f) { + this->action = ENRU2_CREDITS_VISIBLE; + this->drawConfig = ENRU2_DRAW_OPA; } } -void func_80AF34F0(EnRu2* this) { - func_80AF28E8(this, &gAdultRutoHeadTurnDownLeftAnim, 2, 0.0f, 0); - this->action = 13; +/** + * Starts Ruto's animation to look down towards Nabooru during the credits sequence. + */ +void EnRu2_SetupTurnHeadDownLeftAnimation(EnRu2* this) { + EnRu2_AnimationChange(this, &gAdultRutoHeadTurnDownLeftAnim, 2, 0.0f, 0); + this->action = ENRU2_CREDITS_TURN_HEAD_DOWN_LEFT; } -void func_80AF3530(EnRu2* this, s32 arg1) { - if (arg1 != 0) { - func_80AF28E8(this, &gAdultRutoLookingDownLeftAnim, 0, 0.0f, 0); +/** + * Holds Ruto's pose looking down towards Nabooru during the credits sequence. + */ +void EnRu2_HoldLookingDownLeftPose(EnRu2* this, s32 isDoneTurning) { + if (isDoneTurning != 0) { + EnRu2_AnimationChange(this, &gAdultRutoLookingDownLeftAnim, 0, 0.0f, 0); } } -void func_80AF3564(EnRu2* this, PlayState* play) { +/** + * Advances Ruto's actions in two different places. + */ +void EnRu2_NextCreditsAction(EnRu2* this, PlayState* play) { CsCmdActorCue* cue = EnRu2_GetCue(play, 3); s32 nextCueId; s32 currentCueId; @@ -560,10 +680,10 @@ void func_80AF3564(EnRu2* this, PlayState* play) { if (nextCueId != currentCueId) { switch (nextCueId) { case 7: - func_80AF346C(this, play); + EnRu2_InitCreditsPosition(this, play); break; case 8: - func_80AF34F0(this); + EnRu2_SetupTurnHeadDownLeftAnimation(this); break; default: // "There is no such action!" @@ -575,65 +695,71 @@ void func_80AF3564(EnRu2* this, PlayState* play) { } } -void func_80AF3604(EnRu2* this, PlayState* play) { - func_80AF3564(this, play); +void EnRu2_CreditsInvisible(EnRu2* this, PlayState* play) { + EnRu2_NextCreditsAction(this, play); } -void func_80AF3624(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_CreditsFadeIn(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF33E0(this); - func_80AF34A4(this); + EnRu2_UpdateEyes(this); + EnRu2_FadeInCredits(this); + EnRu2_CheckVisibleInCredits(this); } -void func_80AF366C(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_CreditsVisible(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF3564(this, play); + EnRu2_UpdateEyes(this); + EnRu2_NextCreditsAction(this, play); } -void func_80AF36AC(EnRu2* this, PlayState* play) { - s32 something; +void EnRu2_CreditsTurnHeadDownLeft(EnRu2* this, PlayState* play) { + s32 animDone; - func_80AF2744(this, play); - something = EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); - func_80AF3530(this, something); + EnRu2_UpdateBgCheckInfo(this, play); + animDone = EnRu2_UpdateSkelAnime(this); + EnRu2_UpdateEyes(this); + EnRu2_HoldLookingDownLeftPose(this, animDone); } -void func_80AF36EC(EnRu2* this, PlayState* play) { - Flags_SetSwitch(play, func_80AF2690(this)); +void EnRu2_SetEncounterSwitchFlag(EnRu2* this, PlayState* play) { + Flags_SetSwitch(play, EnRu2_GetSwitchFlag(this)); } -s32 func_80AF3718(EnRu2* this, PlayState* play) { - return Flags_GetSwitch(play, func_80AF2690(this)); +s32 EnRu2_GetEncounterSwitchFlag(EnRu2* this, PlayState* play) { + return Flags_GetSwitch(play, EnRu2_GetSwitchFlag(this)); } -void func_80AF3744(EnRu2* this, PlayState* play) { - if (func_80AF3718(this, play)) { +/** + * Initializes Ruto's actor in the Water Temple, or destroys it if the encounter already happened. + */ +void EnRu2_InitWaterTempleEncounter(EnRu2* this, PlayState* play) { + if (EnRu2_GetEncounterSwitchFlag(this, play)) { Actor_Kill(&this->actor); } else { - func_80AF28E8(this, &gAdultRutoIdleAnim, 0, 0.0f, 0); - this->action = 14; - this->drawConfig = 1; + EnRu2_AnimationChange(this, &gAdultRutoIdleAnim, 0, 0.0f, 0); + this->action = ENRU2_WATER_TEMPLE_ENCOUNTER_RANGE_CHECK; + this->drawConfig = ENRU2_DRAW_OPA; } } -void func_80AF37AC(void) { +void EnRu2_PlayFanfare(void) { Audio_PlayFanfare(NA_BGM_APPEAR); } -void func_80AF37CC(EnRu2* this) { +/** + * Accelerates Ruto's actor upwards as she swims. + */ +void EnRu2_SwimUpProgress(EnRu2* this) { f32 funcFloat; - this->unk_2C0++; - funcFloat = Environment_LerpWeightAccelDecel((kREG(2) + 0x96) & 0xFFFF, 0, this->unk_2C0, 8, 0); + this->swimmingUpFrame++; + funcFloat = Environment_LerpWeightAccelDecel((kREG(2) + 0x96) & 0xFFFF, 0, this->swimmingUpFrame, 8, 0); this->actor.world.pos.y = this->actor.home.pos.y + (300.0f * funcFloat); } -s32 func_80AF383C(EnRu2* this, PlayState* play) { +s32 EnRu2_IsPlayerInRangeForEncounter(EnRu2* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 thisPosX = this->actor.world.pos.x; f32 playerPosX = player->actor.world.pos.x; @@ -644,32 +770,42 @@ s32 func_80AF383C(EnRu2* this, PlayState* play) { return 0; } -void func_80AF3878(EnRu2* this, PlayState* play) { - if (func_80AF383C(this, play) && !Play_InCsMode(play)) { - this->action = 16; +/** + * Checks if Link is close enough to Ruto and conditionally triggers the encounter cutscene in the Water Temple. + */ +void EnRu2_CheckRangeToStartEncounter(EnRu2* this, PlayState* play) { + if (EnRu2_IsPlayerInRangeForEncounter(this, play) && !Play_InCsMode(play)) { + this->action = ENRU2_WATER_TEMPLE_ENCOUNTER_BEGINNING; OnePointCutscene_Init(play, 3130, -99, &this->actor, CAM_ID_MAIN); } } -void func_80AF38D0(EnRu2* this, PlayState* play) { - this->action = 16; +/** + * Triggers the encounter cutscene in the Water Temple, unconditionally. Appears to be unused. + */ +void EnRu2_StartEncounter(EnRu2* this, PlayState* play) { + this->action = ENRU2_WATER_TEMPLE_ENCOUNTER_BEGINNING; OnePointCutscene_Init(play, 3130, -99, &this->actor, CAM_ID_MAIN); } -void func_80AF390C(EnRu2* this, PlayState* play) { - f32* unk_2C4 = &this->unk_2C4; +/** + * Handles the starting moments of Ruto's encounter with Link at the Water Temple. Responds to a running timer to + * initiate, on cue, both the fanfare and Ruto's dialogue. + */ +void EnRu2_EncounterBeginningHandler(EnRu2* this, PlayState* play) { + f32* encounterTimer = &this->encounterTimer; - *unk_2C4 += 1.0f; - if (*unk_2C4 == kREG(6) + 40.0f) { - func_80AF37AC(); - } else if (*unk_2C4 > kREG(4) + 50.0f) { + *encounterTimer += 1.0f; + if (*encounterTimer == kREG(6) + 40.0f) { + EnRu2_PlayFanfare(); + } else if (*encounterTimer > kREG(4) + 50.0f) { this->actor.textId = 0x403E; Message_StartTextbox(play, this->actor.textId, NULL); - this->action = 17; + this->action = ENRU2_WATER_TEMPLE_ENCOUNTER_DIALOG; } } -void func_80AF39DC(EnRu2* this, PlayState* play) { +void EnRu2_DialogCameraHandler(EnRu2* this, PlayState* play) { s32 pad; MessageContext* msgCtx; s32 pad2; @@ -681,11 +817,11 @@ void func_80AF39DC(EnRu2* this, PlayState* play) { dialogState = Message_GetState(msgCtx); if (dialogState == TEXT_STATE_DONE_FADING) { - if (this->unk_2C3 != TEXT_STATE_DONE_FADING) { + if (this->lastDialogState != TEXT_STATE_DONE_FADING) { // "I'm Komatsu!" (cinema scene dev) PRINTF("おれが小松だ！ \n"); - this->unk_2C2++; - if (this->unk_2C2 % 6 == 3) { + this->textboxCount++; + if (this->textboxCount % 6 == 3) { player = GET_PLAYER(play); // "uorya-!" (screeming sound) PRINTF("うおりゃー！ \n"); @@ -697,74 +833,74 @@ void func_80AF39DC(EnRu2* this, PlayState* play) { } } - this->unk_2C3 = dialogState; + this->lastDialogState = dialogState; if (Message_GetState(msgCtx) == TEXT_STATE_CLOSING) { - this->action = 18; + this->action = ENRU2_WATER_TEMPLE_ENCOUNTER_END; Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); } } -void func_80AF3ADC(EnRu2* this, PlayState* play) { - this->unk_2C4 += 1.0f; - if (this->unk_2C4 > kREG(5) + 100.0f) { - func_80AF28E8(this, &gAdultRutoSwimmingUpAnim, 0, -12.0f, 0); - this->action = 19; - func_80AF36EC(this, play); +void EnRu2_StartSwimmingUp(EnRu2* this, PlayState* play) { + this->encounterTimer += 1.0f; + if (this->encounterTimer > kREG(5) + 100.0f) { + EnRu2_AnimationChange(this, &gAdultRutoSwimmingUpAnim, 0, -12.0f, 0); + this->action = ENRU2_WATER_TEMPLE_SWIMMING_UP; + EnRu2_SetEncounterSwitchFlag(this, play); } } -void func_80AF3B74(EnRu2* this, PlayState* play) { - if (this->unk_2C0 > ((((u16)(kREG(3) + 0x28)) + ((u16)(kREG(2) + 0x96))) & 0xFFFF)) { +void EnRu2_EndSwimmingUp(EnRu2* this, PlayState* play) { + if (this->swimmingUpFrame > ((((u16)(kREG(3) + 0x28)) + ((u16)(kREG(2) + 0x96))) & 0xFFFF)) { Actor_Kill(&this->actor); } } -void func_80AF3BC8(EnRu2* this, PlayState* play) { - func_80AF3878(this, play); +void EnRu2_WaterTempleEncounterRangeCheck(EnRu2* this, PlayState* play) { + EnRu2_CheckRangeToStartEncounter(this, play); Actor_SetFocus(&this->actor, 50.0f); - func_80AF259C(this, play); + EnRu2_UpdateCollider(this, play); } -void func_80AF3C04(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); - func_80AF259C(this, play); +void EnRu2_WaterTempleEncounterUnconditional(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); + EnRu2_UpdateCollider(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); + EnRu2_UpdateEyes(this); Actor_SetFocus(&this->actor, 50.0f); - func_80AF38D0(this, play); + EnRu2_StartEncounter(this, play); } -void func_80AF3C64(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_WaterTempleEncounterBegin(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); + EnRu2_UpdateEyes(this); Actor_SetFocus(&this->actor, 50.0f); - func_80AF390C(this, play); + EnRu2_EncounterBeginningHandler(this, play); } -void func_80AF3CB8(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_WaterTempleEncounterDialog(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); + EnRu2_UpdateEyes(this); Actor_SetFocus(&this->actor, 50.0f); - func_80AF39DC(this, play); + EnRu2_DialogCameraHandler(this, play); } -void func_80AF3D0C(EnRu2* this, PlayState* play) { - func_80AF2744(this, play); +void EnRu2_WaterTempleEncounterEnd(EnRu2* this, PlayState* play) { + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); + EnRu2_UpdateEyes(this); Actor_SetFocus(&this->actor, 50.0f); - func_80AF3ADC(this, play); + EnRu2_StartSwimmingUp(this, play); } -void func_80AF3D60(EnRu2* this, PlayState* play) { - func_80AF37CC(this); - func_80AF2744(this, play); +void EnRu2_WaterTempleSwimmingUp(EnRu2* this, PlayState* play) { + EnRu2_SwimUpProgress(this); + EnRu2_UpdateBgCheckInfo(this, play); EnRu2_UpdateSkelAnime(this); - func_80AF2608(this); + EnRu2_UpdateEyes(this); Actor_SetFocus(&this->actor, 50.0f); - func_80AF3B74(this, play); + EnRu2_EndSwimmingUp(this, play); } void EnRu2_Update(Actor* thisx, PlayState* play) { @@ -782,35 +918,35 @@ void EnRu2_Init(Actor* thisx, PlayState* play) { EnRu2* this = (EnRu2*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); - func_80AF2550(thisx, play); + EnRu2_InitCollider(thisx, play); SkelAnime_InitFlex(play, &this->skelAnime, &gAdultRutoSkel, NULL, this->jointTable, this->morphTable, 23); - switch (func_80AF26A0(this)) { + switch (EnRu2_GetType(this)) { case 2: - func_80AF2E1C(this, play); + EnRu2_InitWaterTrial(this, play); break; case 3: - func_80AF3394(this, play); + EnRu2_InitCredits(this, play); break; case 4: - func_80AF3744(this, play); + EnRu2_InitWaterTempleEncounter(this, play); break; default: - func_80AF2994(this, play); + EnRu2_InitChamberOfSages(this, play); break; } - this->unk_2C2 = 0; - this->unk_2C3 = TEXT_STATE_DONE_FADING; + this->textboxCount = 0; + this->lastDialogState = TEXT_STATE_DONE_FADING; } -void func_80AF3F14(EnRu2* this, PlayState* play) { +void EnRu2_DrawNothing(EnRu2* this, PlayState* play) { } -void func_80AF3F20(EnRu2* this, PlayState* play) { +void EnRu2_DrawOpa(EnRu2* this, PlayState* play) { s32 pad[2]; - s16 temp = this->unk_2A4; - void* tex = sEyeTextures[temp]; + s16 eyeIndex = this->eyeIndex; + void* tex = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; OPEN_DISPS(play->state.gfxCtx, "../z_en_ru2.c", 642); diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index 530f0c4a57..12333051b6 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -4,6 +4,9 @@ #include "ultra64.h" #include "global.h" +#define ENRU2_GET_SWITCH_FLAG(thisx) PARAMS_GET_U(thisx->actor.params, 8, 8) +#define ENRU2_GET_TYPE(thisx) PARAMS_GET_U(thisx->actor.params, 0, 8) + struct EnRu2; typedef void (*EnRu2ActionFunc)(struct EnRu2*, PlayState*); @@ -14,18 +17,18 @@ typedef struct EnRu2 { /* 0x014C */ SkelAnime skelAnime; /* 0x0190 */ Vec3s jointTable[23]; /* 0x021A */ Vec3s morphTable[23]; - /* 0x02A4 */ s16 unk_2A4; - /* 0x02A6 */ s16 unk_2A6; + /* 0x02A4 */ s16 eyeIndex; + /* 0x02A6 */ s16 blinkTimer; /* 0x02A8 */ s32 action; /* 0x02AC */ s32 drawConfig; - /* 0x02B0 */ f32 unk_2B0; + /* 0x02B0 */ f32 fadeTimer; /* 0x02B4 */ u32 alpha; - /* 0x02B8 */ s32 unk_2B8; + /* 0x02B8 */ s32 isLightBall; /* 0x02BC */ s32 cueId; - /* 0x02C0 */ u16 unk_2C0; - /* 0x02C2 */ u8 unk_2C2; - /* 0x02C3 */ u8 unk_2C3; - /* 0x02C4 */ f32 unk_2C4; + /* 0x02C0 */ u16 swimmingUpFrame; + /* 0x02C2 */ u8 textboxCount; // increments on advancement through dialogue in Water Temple + /* 0x02C3 */ u8 lastDialogState; + /* 0x02C4 */ f32 encounterTimer; /* 0x02C8 */ ColliderCylinder collider; } EnRu2; // size = 0x0314 diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c index 5a46e41014..4efe6fb390 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c @@ -2,11 +2,11 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_80AF411C[] = { - CS_BEGIN_CUTSCENE(35, 3338), +static CutsceneData gWaterMedallionCs[] = { + CS_HEADER(35, 3338), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(31, 5), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_6_0, 5), CS_ACTOR_CUE(0x0001, 0, 829, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 829, 830, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 830, 898, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -18,7 +18,7 @@ static CutsceneData D_80AF411C[] = { CS_PLAYER_CUE(PLAYER_CUEID_3, 520, 550, 0x0000, 0x4000, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 550, 801, 0x0000, 0x4000, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_PLAYER_CUE(PLAYER_CUEID_19, 801, 1956, 0x0000, 0xC000, 0x0000, 0, 6, 0, 0, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(49, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_7_0, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -16, -121, 0, -16, -121, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_LIGHT_SETTING_LIST(5), CS_LIGHT_SETTING(0x0004, 0, 384, 0x0000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000), @@ -26,9 +26,9 @@ static CutsceneData D_80AF411C[] = { CS_LIGHT_SETTING(0x0004, 454, 554, 0x0000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000), CS_LIGHT_SETTING(0x0005, 554, 624, 0x0000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000), CS_LIGHT_SETTING(0x0004, 624, 3001, 0x0000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(39, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_5, 1), CS_ACTOR_CUE(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, 0, -2, 0, 0, -2, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(42, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_3_2, 3), CS_ACTOR_CUE(0x0001, 0, 146, 0x0000, 0x0000, 0x0000, 195, 6, 0, 195, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0002, 146, 754, 0x0000, 0x0000, 0x0000, 195, 6, 0, 195, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0003, 754, 2628, 0x0000, 0x0000, 0x0000, 195, 6, 0, 195, 6, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), @@ -197,28 +197,28 @@ static CutsceneData D_80AF411C[] = { CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x0000), CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x0000), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4289332C, 68.599945f), 0, 42, 16, 0x0164), - CS_ACTOR_CUE_LIST(62, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_8_0, 1), CS_ACTOR_CUE(0x0004, 0, 3000, 0xC10F, 0x0000, 0x0000, 77, 80, -2, 0, 80, 0, CS_FLOAT(0xBCD242E7, -0.025666667f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x3CD242E7, 0.025666667f)), CS_TEXT_LIST(14), CS_TEXT_NONE(0, 394), - CS_TEXT(0x4041, 394, 444, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x4041, 394, 444, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(444, 464), - CS_TEXT(0x4046, 464, 543, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x4046, 464, 543, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(543, 564), - CS_TEXT(0x4049, 564, 613, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x4049, 564, 613, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(613, 634), - CS_TEXT(0x4047, 634, 684, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x4047, 634, 684, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(684, 704), - CS_TEXT(0x404A, 704, 750, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x404A, 704, 750, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(750, 1085), - CS_TEXT(0x003D, 1085, 1090, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x003D, 1085, 1090, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_TEXT_NONE(1090, 1150), - CS_TEXT(0x4042, 1150, 1160, 0x0000, 0x0000, 0x0000), + CS_TEXT(0x4042, 1150, 1160, CS_TEXT_NORMAL, 0x0000, 0x0000), CS_DESTINATION(CS_DEST_LAKE_HYLIA_WATER_RESTORED, 1190, 1213), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_MEDALLION_GET, 900, 901, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x00000034, 0x00000000, 0xFFFFFFC7, 0x00000034), CS_FADE_OUT_SEQ_LIST(1), CS_FADE_OUT_SEQ(CS_FADE_OUT_BGM_MAIN, 800, 850, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC6, 0x00000030, 0x00000000, 0xFFFFFFC6, 0x00000030), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 72eba29b61..b2543c317e 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -4,7 +4,9 @@ #include "assets/scenes/overworld/spot04/spot04_scene.h" #include "assets/scenes/overworld/spot05/spot05_scene.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnSa_Init(Actor* thisx, PlayState* play); void EnSa_Destroy(Actor* thisx, PlayState* play); @@ -155,7 +157,7 @@ u16 EnSa_GetTextId(PlayState* play, Actor* thisx) { return 0x1047; } } - if (GET_EVENTCHKINF(EVENTCHKINF_02)) { + if (GET_EVENTCHKINF(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS)) { this->unk_208 = 0; this->unk_209 = TEXT_STATE_NONE; if (GET_INFTABLE(INFTABLE_03)) { @@ -503,7 +505,7 @@ void EnSa_Init(Actor* thisx, PlayState* play) { case 4: this->unk_210 = 0; this->actor.gravity = -1.0f; - play->csCtx.script = SEGMENTED_TO_VIRTUAL(gSpot04Cs_10E20); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gKokiriForestSariaGreetingCs); gSaveContext.cutsceneTrigger = 1; EnSa_ChangeAnim(this, ENSA_ANIM1_4); this->actionFunc = func_80AF68E4; @@ -625,7 +627,7 @@ void func_80AF683C(EnSa* this, PlayState* play) { Player* player = GET_PLAYER(play); if (!(player->actor.world.pos.z >= -2220.0f) && !Play_InCsMode(play)) { - play->csCtx.script = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMeadowSariasSongCs); gSaveContext.cutsceneTrigger = 1; this->actionFunc = func_80AF68E4; } @@ -738,7 +740,7 @@ void EnSa_Update(Actor* thisx, PlayState* play) { } if (this->actionFunc != func_80AF68E4) { - this->alpha = func_80034DD4(&this->actor, play, this->alpha, 400.0f); + this->alpha = Actor_UpdateAlphaByDistance(&this->actor, play, this->alpha, 400.0f); } else { this->alpha = 255; } diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 4452c86610..62bd38cc11 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -6,7 +6,7 @@ #include "z_en_sda.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSda_Init(Actor* thisx, PlayState* play); void EnSda_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 20a655101a..1a1093f229 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -7,7 +7,7 @@ #include "z_en_siofuki.h" #include "assets/objects/object_siofuki/object_siofuki.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSiofuki_Init(Actor* thisx, PlayState* play); void EnSiofuki_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index da5b8bd4bc..1a61fcfb9d 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "assets/objects/object_skb/object_skb.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum StalchildBehavior { SKB_BEHAVIOR_BURIED, diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index a05e400777..ec41b1e22d 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -2,7 +2,9 @@ #include "overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h" #include "assets/objects/object_skj/object_skj.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnSkj_Init(Actor* thisx, PlayState* play2); void EnSkj_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 3d9c998742..09b9df91c1 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -1,7 +1,9 @@ #include "z_en_ssh.h" #include "assets/objects/object_ssh/object_ssh.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define SSH_STATE_STUNNED (1 << 0) #define SSH_STATE_GROUND_START (1 << 2) diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index d1dd84467d..d7b6a20e50 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -7,7 +7,9 @@ #include "z_en_st.h" #include "assets/objects/object_st/object_st.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSt_Init(Actor* thisx, PlayState* play); void EnSt_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 1d42d4c43c..ac10651812 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -9,7 +9,7 @@ #include "assets/objects/object_ahg/object_ahg.h" #include "assets/objects/object_boj/object_boj.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnSth_Init(Actor* thisx, PlayState* play); void EnSth_Destroy(Actor* thisx, PlayState* play); @@ -74,19 +74,18 @@ static EnSthActionFunc sRewardObtainedWaitActions[6] = { }; static u16 sEventFlags[6] = { - 0, EVENTCHKINF_DA_MASK, EVENTCHKINF_DB_MASK, EVENTCHKINF_DC_MASK, EVENTCHKINF_DD_MASK, EVENTCHKINF_DE_MASK, + 0, + EVENTCHKINF_MASK(EVENTCHKINF_SKULLTULA_REWARD_10), + EVENTCHKINF_MASK(EVENTCHKINF_SKULLTULA_REWARD_20), + EVENTCHKINF_MASK(EVENTCHKINF_SKULLTULA_REWARD_30), + EVENTCHKINF_MASK(EVENTCHKINF_SKULLTULA_REWARD_40), + EVENTCHKINF_MASK(EVENTCHKINF_SKULLTULA_REWARD_50), }; static s16 sGetItemIds[6] = { GI_RUPEE_GOLD, GI_WALLET_ADULT, GI_STONE_OF_AGONY, GI_WALLET_GIANT, GI_BOMBCHUS_10, GI_HEART_PIECE, }; -static Vec3f D_80B0B49C = { 700.0f, 400.0f, 0.0f }; - -static Color_RGB8 sTunicColors[6] = { - { 190, 110, 0 }, { 0, 180, 110 }, { 0, 255, 80 }, { 255, 160, 60 }, { 190, 230, 250 }, { 240, 230, 120 }, -}; - void EnSth_SetupAction(EnSth* this, EnSthActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -114,7 +113,7 @@ void EnSth_Init(Actor* thisx, PlayState* play) { } objectId = sObjectIds[params]; - if (objectId != 1) { + if (objectId != OBJECT_GAMEPLAY_KEEP) { objectSlot = Object_GetSlot(&play->objectCtx, objectId); } else { objectSlot = 0; @@ -154,9 +153,9 @@ void EnSth_SetupAfterObjectLoaded(EnSth* this, PlayState* play) { 16); Animation_PlayLoop(&this->skelAnime, sAnimations[this->actor.params]); - this->eventFlag = sEventFlags[this->actor.params]; params = &this->actor.params; - if (gSaveContext.save.info.eventChkInf[EVENTCHKINF_DA_DB_DC_DD_DE_INDEX] & this->eventFlag) { + this->eventFlag = sEventFlags[*params]; + if (gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_SKULLTULA_REWARD] & this->eventFlag) { EnSth_SetupAction(this, sRewardObtainedWaitActions[*params]); } else { EnSth_SetupAction(this, EnSth_RewardUnobtainedWait); @@ -256,7 +255,7 @@ void EnSth_GiveReward(EnSth* this, PlayState* play) { if (Actor_HasParent(&this->actor, play)) { this->actor.parent = NULL; EnSth_SetupAction(this, EnSth_RewardObtainedTalk); - gSaveContext.save.info.eventChkInf[EVENTCHKINF_DA_DB_DC_DD_DE_INDEX] |= this->eventFlag; + gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_SKULLTULA_REWARD] |= this->eventFlag; } else { EnSth_GivePlayerItem(this, play); } @@ -358,6 +357,7 @@ s32 EnSth_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p } void EnSth_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + static Vec3f D_80B0B49C = { 700.0f, 400.0f, 0.0f }; EnSth* this = (EnSth*)thisx; if (limbIndex == 15) { @@ -383,6 +383,9 @@ Gfx* EnSth_AllocColorDList(GraphicsContext* play, u8 envR, u8 envG, u8 envB, u8 } void EnSth_Draw(Actor* thisx, PlayState* play) { + static Color_RGB8 sShirtColors[6] = { + { 190, 110, 0 }, { 0, 180, 110 }, { 0, 255, 80 }, { 255, 160, 60 }, { 190, 230, 250 }, { 240, 230, 120 }, + }; EnSth* this = (EnSth*)thisx; Color_RGB8* envColor1; @@ -392,8 +395,8 @@ void EnSth_Draw(Actor* thisx, PlayState* play) { Gfx_SetupDL_37Opa(play->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, - EnSth_AllocColorDList(play->state.gfxCtx, sTunicColors[this->actor.params].r, - sTunicColors[this->actor.params].g, sTunicColors[this->actor.params].b, 255)); + EnSth_AllocColorDList(play->state.gfxCtx, sShirtColors[this->actor.params].r, + sShirtColors[this->actor.params].g, sShirtColors[this->actor.params].b, 255)); if (this->actor.params == 0) { gSPSegment(POLY_OPA_DISP++, 0x09, EnSth_AllocColorDList(play->state.gfxCtx, 190, 110, 0, 255)); diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 57ff345d61..dc73048393 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -7,7 +7,7 @@ #include "z_en_stream.h" #include "assets/objects/object_stream/object_stream.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnStream_Init(Actor* thisx, PlayState* play); void EnStream_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 7f18de1528..b9b6b47c94 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1,7 +1,7 @@ #include "z_en_sw.h" #include "assets/objects/object_st/object_st.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnSw_Init(Actor* thisx, PlayState* play); void EnSw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 9a7301f537..b20f817529 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -4,7 +4,7 @@ #include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" #include "overlays/actors/ovl_En_G_Switch/z_en_g_switch.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum EnSyatekItemRound { SYATEKI_ROUND_GREEN_APPEAR, diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index e768c2cc14..5575182fe6 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -3,7 +3,9 @@ #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" #include "assets/objects/object_ossan/object_ossan.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_LOCK_ON_DISABLED) typedef enum EnSyatekiManGameResult { /* 0 */ SYATEKI_RESULT_NONE, diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 566a866f9a..67d21f2311 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -8,7 +8,7 @@ #include "assets/objects/object_niw/object_niw.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnSyatekiNiw_Init(Actor* thisx, PlayState* play); void EnSyatekiNiw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index c94f1acef9..bea60cf889 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -219,7 +219,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { Actor_Kill(&this->actor); } else { if (IS_DAY) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->superCuccoTimers[0] = this->superCuccoTimers[1] = this->superCuccoTimers[2] = 7; this->superCuccos[0] = (EnNiw*)Actor_Spawn( &play->actorCtx, play, ACTOR_EN_NIW, this->actor.world.pos.x + 5.0f, @@ -368,7 +368,7 @@ void EnTa_IdleAsleepInCastle(EnTa* this, PlayState* play) { Player* player = GET_PLAYER(play); if (Actor_TalkOfferAccepted(&this->actor, play)) { - s32 exchangeItemId = func_8002F368(play); + s32 exchangeItemId = Actor_GetPlayerExchangeItemId(play); switch (exchangeItemId) { case EXCH_ITEM_CHICKEN: @@ -403,7 +403,7 @@ void EnTa_IdleAsleepInKakariko(EnTa* this, PlayState* play) { Player* player = GET_PLAYER(play); if (Actor_TalkOfferAccepted(&this->actor, play)) { - s32 exchangeItemId = func_8002F368(play); + s32 exchangeItemId = Actor_GetPlayerExchangeItemId(play); switch (exchangeItemId) { case EXCH_ITEM_POCKET_CUCCO: @@ -501,7 +501,7 @@ void EnTa_RunAwayStart(EnTa* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_VO_TA_CRY_1); EnTa_SetupAction(this, EnTa_RunAwayRunSouth, EnTa_AnimRepeatCurrent); this->timer = 65; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 87e2b836ea..bcc60b5f1a 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -9,8 +9,9 @@ #include "versions.h" #include "assets/objects/object_ts/object_ts.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnTakaraMan_Init(Actor* thisx, PlayState* play); void EnTakaraMan_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index b3a7fc6ccf..13002ddc54 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -7,7 +7,7 @@ #include "z_en_test.h" #include "assets/objects/object_sk2/object_sk2.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnTest_Init(Actor* thisx, PlayState* play); void EnTest_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 2471e1e371..b253b7ea0b 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -10,7 +10,7 @@ #include "terminal.h" #include "assets/objects/object_tite/object_tite.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) // EnTite_Idle #define vIdleTimer actionVar1 @@ -364,7 +364,7 @@ void EnTite_Attack(EnTite* this, PlayState* play) { func_800355B8(play, &this->backLeftFootPos); } } - if (!(this->collider.base.atFlags & AT_HIT) && (this->actor.flags & ACTOR_FLAG_6)) { + if (!(this->collider.base.atFlags & AT_HIT) && (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); } else { Player* player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index bef80ab310..53243d29a8 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -8,7 +8,9 @@ #include "assets/objects/object_torch2/object_torch2.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum EnTorch2ActionStates { /* 0 */ ENTORCH2_WAIT, diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 4b27209fca..5b31c32f84 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -258,7 +258,7 @@ s32 EnToryo_GetTextId(EnToryo* this, PlayState* play) { if (textId == 0) { if (this->stateFlags & 1) { - if (GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) { + if (GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) { ret = 0x606C; } else if (GET_INFTABLE(INFTABLE_170)) { ret = 0x606B; @@ -318,7 +318,7 @@ void EnToryo_HandleTalking(EnToryo* this, PlayState* play) { if (this->messageState == 0) { if (Actor_TalkOfferAccepted(&this->actor, play)) { - this->exchangeItemId = func_8002F368(play); + this->exchangeItemId = Actor_GetPlayerExchangeItemId(play); if (this->exchangeItemId != EXCH_ITEM_NONE) { player->actor.textId = EnToryo_ReactToExchangeItem(this, play); this->actor.textId = player->actor.textId; diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index cadc1f45da..79500059b5 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -154,7 +154,7 @@ void EnTp_Init(Actor* thisx, PlayState* play2) { this->collider.elements[0].dim.modelSphere.radius = this->collider.elements[0].dim.worldSphere.radius = 8; EnTp_Head_SetupWait(this); this->actor.focus.pos = this->actor.world.pos; - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_SetScale(&this->actor, 1.5f); for (i = 0; i <= 6; i++) { @@ -171,7 +171,8 @@ void EnTp_Init(Actor* thisx, PlayState* play2) { Actor_SetScale(&next->actor, 0.3f); if (i == 2) { - next->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4; + next->actor.flags |= + ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED; next->unk_150 = 1; // Why? } diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index e2d612d61b..6cd63e00f8 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -7,7 +7,7 @@ #include "z_en_tr.h" #include "assets/objects/object_tr/object_tr.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnTr_Init(Actor* thisx, PlayState* play); void EnTr_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 420e5a1ca1..640332ecba 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -7,7 +7,7 @@ #include "z_en_trap.h" #include "assets/objects/object_trap/object_trap.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define BEGIN_MOVE_OUT 65535.0f diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index c122d39684..8db28db170 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -9,7 +9,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnTuboTrap_Init(Actor* thisx, PlayState* play); void EnTuboTrap_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index be03eb1644..fa83618611 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -7,7 +7,8 @@ #include "z_en_vali.h" #include "assets/objects/object_vali/object_vali.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE) void EnVali_Init(Actor* thisx, PlayState* play); void EnVali_Destroy(Actor* thisx, PlayState* play); @@ -197,7 +198,7 @@ void EnVali_SetupFloatIdle(EnVali* this) { this->leftArmCollider.dim.quad[1].y = this->rightArmCollider.dim.quad[0].y = this->rightArmCollider.dim.quad[1].y = this->actor.world.pos.y - 10.0f; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->bodyCollider.base.acFlags |= AC_ON; this->slingshotReactionTimer = 0; this->floatHomeHeight = this->actor.world.pos.y; @@ -274,7 +275,7 @@ void EnVali_SetupFrozen(EnVali* this) { void EnVali_SetupReturnToLurk(EnVali* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gBariLurkingAnim, 10.0f); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->actionFunc = EnVali_ReturnToLurk; } diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index 065013bb52..9861413414 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -7,7 +7,7 @@ #include "z_en_vase.h" #include "assets/objects/object_vase/object_vase.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnVase_Init(Actor* thisx, PlayState* play); void EnVase_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 1a8f8d2275..e31e9ca9a7 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Boss_Fd/z_boss_fd.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnVbBall_Init(Actor* thisx, PlayState* play); void EnVbBall_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 0b0594ed86..c7a231c0a2 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -16,7 +16,7 @@ #include "assets/objects/object_ganon/object_ganon.h" #include "assets/objects/object_opening_demo1/object_opening_demo1.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnViewer_Init(Actor* thisx, PlayState* play); void EnViewer_Destroy(Actor* thisx, PlayState* play); @@ -44,7 +44,7 @@ ActorProfile En_Viewer_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_STOP), }; static EnViewerInitData sInitData[] = { @@ -176,7 +176,7 @@ void EnViewer_InitImpl(EnViewer* this, PlayState* play) { if (!Object_IsLoaded(&play->objectCtx, skelObjectSlot) || !Object_IsLoaded(&play->objectCtx, this->animObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_6; + this->actor.flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; return; } @@ -209,9 +209,9 @@ void EnViewer_UpdateImpl(EnViewer* this, PlayState* play) { } } else if (type == ENVIEWER_TYPE_7_GANONDORF) { Actor_SetScale(&this->actor, 0.3f); - this->actor.uncullZoneForward = 10000.0f; - this->actor.uncullZoneScale = 10000.0f; - this->actor.uncullZoneDownward = 10000.0f; + this->actor.cullingVolumeDistance = 10000.0f; + this->actor.cullingVolumeScale = 10000.0f; + this->actor.cullingVolumeDownward = 10000.0f; } else if (type == ENVIEWER_TYPE_3_GANONDORF) { if (gSaveContext.sceneLayer == 4) { switch (play->csCtx.curFrame) { diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 1fe315ae2f..9847d4fa8d 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnVm_Init(Actor* thisx, PlayState* play); void EnVm_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index 81fa2cf06c..d24a1001c2 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -11,7 +11,7 @@ #include "overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnWallTubo_Init(Actor* thisx, PlayState* play); void EnWallTubo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 7346278053..abbf3ecaa0 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -8,7 +8,7 @@ #include "assets/objects/object_wallmaster/object_wallmaster.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define TIMER_SCALE ((f32)OS_CLOCK_RATE / 10000000000) @@ -151,7 +151,7 @@ void EnWallmas_TimerInit(EnWallmas* this, PlayState* play) { Player* player = GET_PLAYER(play); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->timer = 0x82; this->actor.velocity.y = 0.0f; this->actor.world.pos.y = player->actor.world.pos.y; @@ -172,7 +172,7 @@ void EnWallmas_SetupDrop(EnWallmas* this, PlayState* play) { this->actor.world.rot.y = player->actor.shape.rot.y + 0x8000; this->actor.floorHeight = player->actor.floorHeight; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnWallmas_Drop; } diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 0e2dccc170..bd5b6613b3 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -8,7 +8,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnWeatherTag_Init(Actor* thisx, PlayState* play); void EnWeatherTag_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index acb8b32bbe..36aaac2344 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "assets/objects/object_wf/object_wf.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnWf_Init(Actor* thisx, PlayState* play); void EnWf_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 3ae525205c..d755e0ed0d 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -193,7 +193,7 @@ void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) { if (this->talkMode == 4) { this->unk_15A = true; } - this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4); + this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_7); this->unk_156 = true; this->actionFunc = func_80B3A4F8; @@ -256,7 +256,7 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) { if (!this->unk_156) { Message_StartTextbox(play, this->actor.textId, NULL); Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_8); - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_80B3A3D4; } diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index f893a1b06c..c66a2232dd 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -104,11 +104,11 @@ s32 EnWood02_SpawnZoneCheck(EnWood02* this, PlayState* play, Vec3f* pos) { phi_f12 = ((this->actor.projectedW == 0.0f) ? 1000.0f : fabsf(1.0f / this->actor.projectedW)); - if ((-this->actor.uncullZoneScale < this->actor.projectedPos.z) && - (this->actor.projectedPos.z < (this->actor.uncullZoneForward + this->actor.uncullZoneScale)) && - (((fabsf(this->actor.projectedPos.x) - this->actor.uncullZoneScale) * phi_f12) < 1.0f) && - (((this->actor.projectedPos.y + this->actor.uncullZoneDownward) * phi_f12) > -1.0f) && - (((this->actor.projectedPos.y - this->actor.uncullZoneScale) * phi_f12) < 1.0f)) { + if ((-this->actor.cullingVolumeScale < this->actor.projectedPos.z) && + (this->actor.projectedPos.z < (this->actor.cullingVolumeDistance + this->actor.cullingVolumeScale)) && + (((fabsf(this->actor.projectedPos.x) - this->actor.cullingVolumeScale) * phi_f12) < 1.0f) && + (((this->actor.projectedPos.y + this->actor.cullingVolumeDownward) * phi_f12) > -1.0f) && + (((this->actor.projectedPos.y - this->actor.cullingVolumeScale) * phi_f12) < 1.0f)) { return true; } return false; @@ -200,9 +200,9 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) { case WOOD_BUSH_GREEN_LARGE: case WOOD_BUSH_BLACK_LARGE: actorScale = 1.5f; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 2000.0f; - this->actor.uncullZoneDownward = 2400.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 2000.0f; + this->actor.cullingVolumeDownward = 2400.0f; break; case WOOD_TREE_CONICAL_SPAWNER: case WOOD_TREE_OVAL_YELLOW_SPAWNER: @@ -223,15 +223,15 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) { case WOOD_TREE_KAKARIKO_ADULT: case WOOD_BUSH_GREEN_SMALL: case WOOD_BUSH_BLACK_SMALL: - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 800.0f; - this->actor.uncullZoneDownward = 1800.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 800.0f; + this->actor.cullingVolumeDownward = 1800.0f; break; case WOOD_TREE_CONICAL_SMALL: actorScale = 0.6f; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 400.0f; - this->actor.uncullZoneDownward = 1000.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 400.0f; + this->actor.cullingVolumeDownward = 1000.0f; break; case WOOD_LEAF_GREEN: case WOOD_LEAF_YELLOW: @@ -275,7 +275,7 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) { this->actor.world.pos.x += (sSpawnSin * sSpawnDistance[5]); this->actor.world.pos.z += (sSpawnCos * sSpawnDistance[5]); } else { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } // Snap to floor, or remove if over void @@ -309,7 +309,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) { // Despawn extra trees in a group if out of range if ((this->spawnType == WOOD_SPAWN_SPAWNED) && (this->actor.parent != NULL)) { - if (!(this->actor.flags & ACTOR_FLAG_6)) { + if (!(this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { u8 new_var = this->unk_14E[0]; u8 phi_v0 = 0; s32 pad; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index ccf9bf873f..b693f30709 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -17,7 +17,7 @@ #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:0" \ "ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnXc_Init(Actor* thisx, PlayState* play); void EnXc_Destroy(Actor* thisx, PlayState* play); @@ -305,7 +305,7 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) { if (!Play_InCsMode(play)) { s32 pad; - play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMinuetCs); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMeadowMinuetCs); gSaveContext.cutsceneTrigger = 1; SET_EVENTCHKINF(EVENTCHKINF_50); Item_Give(play, ITEM_SONG_MINUET); diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index 02683593c9..c628bdc565 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -104,7 +104,7 @@ void EnYabusameMark_Init(Actor* thisx, PlayState* play) { Collider_InitQuad(play, &this->collider); Collider_SetQuad(play, &this->collider, &this->actor, &sQuadInit); this->worldPos = this->actor.world.pos; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (gSaveContext.sceneLayer != 4) { Actor_Kill(&this->actor); return; diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 4f739acac8..4a6d3bc397 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -7,7 +7,7 @@ #include "z_en_yukabyun.h" #include "assets/objects/object_yukabyun/object_yukabyun.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnYukabyun_Init(Actor* thisx, PlayState* play); void EnYukabyun_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 9c50186329..70812e3f0f 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -7,7 +7,7 @@ #include "z_en_zf.h" #include "assets/objects/object_zf/object_zf.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZf_Init(Actor* thisx, PlayState* play); void EnZf_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 7a9edb9c67..8a01936fff 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -7,7 +7,7 @@ #include "z_en_zl1.h" #include "assets/objects/object_zl1/object_zl1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZl1_Init(Actor* thisx, PlayState* play); void EnZl1_Destroy(Actor* thisx, PlayState* play); @@ -23,7 +23,7 @@ void func_80B4BBC4(EnZl1* this, PlayState* play); void func_80B4BC78(EnZl1* this, PlayState* play); void func_80B4BF2C(EnZl1* this, PlayState* play); -extern CutsceneData D_80B4C5D0[]; +extern CutsceneData gTriforceCreationStartCs[]; #include "z_en_zl1_camera_data.inc.c" @@ -318,7 +318,7 @@ void func_80B4B240(EnZl1* this, PlayState* play) { if (this->skelAnime.curFrame == frameCount) { animHeaderSeg = &gChildZelda1Anim_00438; sp3C = 1; - play->csCtx.script = D_80B4C5D0; + play->csCtx.script = gTriforceCreationStartCs; gSaveContext.cutsceneTrigger = 1; this->actionFunc = func_80B4B8B4; this->unk_1E2++; diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c index d0b011d454..6c268600ec 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c @@ -2,23 +2,23 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_80B4C5D0[] = { - CS_BEGIN_CUTSCENE(28, 3000), +CutsceneData gTriforceCreationStartCs[] = { + CS_HEADER(28, 3000), CS_PLAYER_CUE_LIST(3), CS_PLAYER_CUE(PLAYER_CUEID_5, 400, 1211, 0x0000, 0xC000, 0x0000, -422, 84, 1, -422, 84, 1, CS_FLOAT(0xF6484E4, 1.1266862e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_1, 1211, 1241, 0x0000, 0xC000, 0x0000, -422, 84, 1, -483, 84, 0, CS_FLOAT(0xF6484E4, 1.1266862e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_41, 1241, 1311, 0x0000, 0xC000, 0x0000, -483, 84, 0, -483, 84, 0, CS_FLOAT(0xF6484E4, 1.1266862e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_ACTOR_CUE_LIST(18, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_2, 1), CS_ACTOR_CUE(0x0007, 1170, 1316, 0x7477, 0x0000, 0x0000, -485, 84, 0, -469, 85, -55, CS_FLOAT(0x3DE07038, 0.10958904f), CS_FLOAT(0x3BE07038, 0.006849315f), CS_FLOAT(0xBDE07038, -0.10958904f)), CS_UNK_DATA_LIST(0x00000049, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(16, 3), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_1, 3), CS_ACTOR_CUE(0x0009, 1220, 1310, 0x8000, 0x0000, 0x0000, -890, 90, 150, -890, 90, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x000A, 1310, 1449, 0x0000, 0x0000, 0x0000, -890, 90, 0, -890, 90, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_ACTOR_CUE(0x0004, 1449, 1457, 0x0000, 0x0000, 0x0000, -890, 90, 0, -890, 90, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 1460, 1461, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(29, 1), + CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_3_0, 1), CS_ACTOR_CUE(0x0002, 330, 763, 0x0000, 0x0000, 0x0000, -1250, 150, 0, -1250, 150, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 200, 231), CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 230, 271), @@ -228,21 +228,21 @@ CutsceneData D_80B4C5D0[] = { CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x392C), CS_TEXT_LIST(10), CS_TEXT_NONE(0, 50), - CS_TEXT(0x7035, 50, 190, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x7035, 50, 190, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_TEXT_NONE(190, 300), - CS_TEXT(0x7036, 300, 800, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x7036, 300, 800, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_TEXT_NONE(800, 970), - CS_TEXT(0x7037, 970, 1150, 0x0000, 0xFFFF, 0x7038), + CS_TEXT(0x7037, 970, 1150, CS_TEXT_NORMAL, 0xFFFF, 0x7038), CS_TEXT_NONE(1150, 1190), - CS_TEXT(0x7005, 1190, 1200, 0x0000, 0xFFFF, 0x700B), + CS_TEXT(0x7005, 1190, 1200, CS_TEXT_NORMAL, 0xFFFF, 0x700B), CS_TEXT_NONE(1200, 1340), - CS_TEXT(0x7009, 1340, 1420, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x7009, 1340, 1420, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_HYRULE_CS, 230, 231, 0x0000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000), CS_START_SEQ_LIST(1), CS_START_SEQ(NA_BGM_ZELDA_THEME, 870, 871, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD), CS_STOP_SEQ_LIST(1), CS_STOP_SEQ(NA_BGM_GENERAL_SFX, 110, 111, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000001), - CS_END(), + CS_END_OF_SCRIPT(), }; // clang-format on diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 5dfe62b79d..cab2a0eeb7 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -13,7 +13,7 @@ #include "assets/objects/object_zl2/object_zl2.h" #include "assets/objects/object_zl2_anime1/object_zl2_anime1.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnZl2_Init(Actor* thisx, PlayState* play); void EnZl2_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index cca405790a..68e2e374ae 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -15,7 +15,7 @@ #include "assets/objects/object_zl2/object_zl2.h" #include "assets/objects/object_zl2_anime2/object_zl2_anime2.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnZl3_Init(Actor* thisx, PlayState* play); void EnZl3_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 22f558ea5f..e3b8a51af3 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -8,7 +8,7 @@ #include "assets/objects/object_zl4/object_zl4.h" #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum EnZl4CutsceneState { /* 0 */ ZL4_CS_WAIT, diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index c3080986e1..6eb051e47a 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -418,7 +418,7 @@ u16 EnZo_GetTextId(PlayState* play, Actor* thisx) { return 0x402D; } - if (GET_EVENTCHKINF(EVENTCHKINF_33)) { + if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) { return 0x4010; } if (GET_EVENTCHKINF(EVENTCHKINF_30)) { diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index c6778bd104..bce528552b 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -10,7 +10,7 @@ #include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h" #include "overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef struct EnfHGPainting { /* 0x00 */ Vec3f pos; @@ -65,7 +65,7 @@ static EnfHGPainting sPaintings[] = { static InitChainEntry sInitChain[] = { ICHAIN_S8(naviEnemyId, NAVI_ENEMY_PHANTOM_GANON_PHASE_2, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; void EnfHG_Init(Actor* thisx, PlayState* play2) { @@ -128,13 +128,13 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) { if ((fabsf(player->actor.world.pos.x - (GND_BOSSROOM_CENTER_X + 0.0f)) < 100.0f) && (fabsf(player->actor.world.pos.z - (GND_BOSSROOM_CENTER_Z + 315.0f)) < 100.0f)) { this->cutsceneState = INTRO_START; - if (GET_EVENTCHKINF(EVENTCHKINF_72)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE)) { this->timers[0] = 57; } } break; case INTRO_START: - if (GET_EVENTCHKINF(EVENTCHKINF_72)) { + if (GET_EVENTCHKINF(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE)) { if (this->timers[0] == 55) { Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_SHUTTER, GND_BOSSROOM_CENTER_X + 0.0f, GND_BOSSROOM_CENTER_Y - 97.0f, @@ -159,7 +159,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) { this->timers[0] = 60; this->actor.world.pos.y = GND_BOSSROOM_CENTER_Y - 7.0f; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1); - SET_EVENTCHKINF(EVENTCHKINF_72); + SET_EVENTCHKINF(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE); Flags_SetSwitch(play, 0x23); FALLTHROUGH; case INTRO_FENCE: diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 6772d76810..79ea3b8bcd 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -7,7 +7,7 @@ #include "z_end_title.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EndTitle_Init(Actor* thisx, PlayState* play); void EndTitle_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 4c5e2ab731..02bbf1656d 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -35,10 +35,10 @@ #include "cic6105.h" #endif -#pragma increment_block_number "gc-eu:177 gc-eu-mq:177 gc-jp:177 gc-jp-ce:177 gc-jp-mq:177 gc-us:177 gc-us-mq:177" \ - "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" +#pragma increment_block_number "gc-eu:167 gc-eu-mq:167 gc-jp:167 gc-jp-ce:167 gc-jp-mq:167 gc-us:167 gc-us-mq:167" \ + "ntsc-1.0:121 ntsc-1.1:121 ntsc-1.2:121 pal-1.0:121 pal-1.1:121" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define WATER_SURFACE_Y(play) play->colCtx.colHeader->waterBoxes->ySurface @@ -2962,8 +2962,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { f32 temp; f32 rumbleStrength; - this->actor.uncullZoneForward = 700.0f; - this->actor.uncullZoneScale = 50.0f; + this->actor.cullingVolumeDistance = 700.0f; + this->actor.cullingVolumeScale = 50.0f; if (this->isLoach == 0) { playerSpeedMod = (player->actor.speed * 0.15f) + 0.25f; @@ -3082,8 +3082,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { case 100: Fishing_HandleAquariumDialog(this, play); - this->actor.uncullZoneForward = 500.0f; - this->actor.uncullZoneScale = 300.0f; + this->actor.cullingVolumeDistance = 500.0f; + this->actor.cullingVolumeScale = 300.0f; Lights_PointNoGlowSetInfo(&this->lightInfo, (s16)this->actor.world.pos.x, (s16)this->actor.world.pos.y + 20.0f, (s16)this->actor.world.pos.z - 50.0f, 255, @@ -3629,8 +3629,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { break; case 5: - this->actor.uncullZoneForward = 1200.0f; - this->actor.uncullZoneScale = 200.0f; + this->actor.cullingVolumeDistance = 1200.0f; + this->actor.cullingVolumeScale = 200.0f; sFishFightTime++; PRINTF("HIT FISH %dcm\n", (u8)this->fishLength); @@ -5195,7 +5195,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { if ((sOwnerTheftTimer != 0) || (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE)) { this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; } else { - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; } if ((this->actor.xzDistToPlayer < 120.0f) || (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE)) { diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index bd581b2aa1..da8ddad524 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -30,9 +30,9 @@ ActorProfile Item_B_Heart_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ItemBHeart_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 83f282da0d..5527cef6df 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -6,7 +6,7 @@ #include "z_item_etcetera.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ItemEtcetera_Init(Actor* thisx, PlayState* play); void ItemEtcetera_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 00d7eab43e..89d807318b 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -7,7 +7,7 @@ #include "z_item_ocarina.h" #include "assets/scenes/overworld/spot00/spot00_scene.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ItemOcarina_Init(Actor* thisx, PlayState* play); void ItemOcarina_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index 22c18b7713..560314ce2f 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -8,7 +8,7 @@ #include "z_item_shield.h" #include "assets/objects/object_link_child/object_link_child.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ItemShield_Init(Actor* thisx, PlayState* play); void ItemShield_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index fc298fca8b..d809a82ebe 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -7,7 +7,7 @@ #include "z_magic_dark.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void MagicDark_Init(Actor* thisx, PlayState* play); void MagicDark_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index e36a673c95..ede5f3691c 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -6,7 +6,7 @@ #include "z_magic_fire.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void MagicFire_Init(Actor* thisx, PlayState* play); void MagicFire_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 1126ae5b0a..0694e07128 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -6,7 +6,7 @@ #include "z_magic_wind.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void MagicWind_Init(Actor* thisx, PlayState* play); void MagicWind_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 4bb8ce0cf6..1915999df6 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -7,7 +7,7 @@ #include "z_mir_ray.h" #include "assets/objects/object_mir_ray/object_mir_ray.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void MirRay_Init(Actor* thisx, PlayState* play); void MirRay_Destroy(Actor* thisx, PlayState* play); @@ -106,9 +106,9 @@ static MirRayDataEntry sMirRayData[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void MirRay_SetupCollider(MirRay* this) { diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 570c645a24..1e34d1c586 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -120,9 +120,9 @@ static Gfx* sBreakDlists[] = { gCuttableShrubStalkDL, gCuttableShrubTipDL }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1600, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1600, ICHAIN_STOP), }; void ObjBean_InitCollider(Actor* thisx, PlayState* play) { @@ -537,7 +537,7 @@ void ObjBean_SetupWaitForBean(ObjBean* this) { void ObjBean_WaitForBean(ObjBean* this, PlayState* play) { if (Actor_TalkOfferAccepted(&this->dyna.actor, play)) { - if (func_8002F368(play) == EXCH_ITEM_MAGIC_BEAN) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_MAGIC_BEAN) { func_80B8FE00(this); Flags_SetSwitch(play, PARAMS_GET_U(this->dyna.actor.params, 0, 6)); } @@ -636,7 +636,7 @@ void ObjBean_WaitForWater(ObjBean* this, PlayState* play) { ObjBean_SetupGrowWaterPhase1(this); D_80B90E30 = this; OnePointCutscene_Init(play, 2210, -99, &this->dyna.actor, CAM_ID_MAIN); - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; return; } @@ -739,7 +739,7 @@ void ObjBean_GrowWaterPhase5(ObjBean* this, PlayState* play) { this->transformFunc(this); if (this->timer <= 0) { func_80B8FF50(this); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } @@ -764,7 +764,7 @@ void ObjBean_SetupFly(ObjBean* this) { this->actionFunc = ObjBean_Fly; ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_PLANT); this->dyna.actor.speed = 0.0f; - this->dyna.actor.flags |= ACTOR_FLAG_4; // Never stop updating + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; // Never stop updating } void ObjBean_Fly(ObjBean* this, PlayState* play) { @@ -776,7 +776,7 @@ void ObjBean_Fly(ObjBean* this, PlayState* play) { ObjBean_SetupPath(this, play); ObjBean_SetupWaitForStepOff(this); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; // Never stop updating (disable) + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; // Never stop updating (disable) mainCam = play->cameraPtrs[CAM_ID_MAIN]; if ((mainCam->setting == CAM_SET_BEAN_LOST_WOODS) || (mainCam->setting == CAM_SET_BEAN_GENERIC)) { diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index bf6a5ebf4f..68e1687aa8 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -54,9 +54,9 @@ static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 350, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 350, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static s16 sEffectScales[] = { diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 0198ddfc8f..6f86b829a4 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -61,9 +61,9 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 900, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 900, ICHAIN_STOP), }; void ObjComb_Break(ObjComb* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index fac468a29c..411d3e2ad9 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -32,9 +32,9 @@ ActorProfile Obj_Elevator_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 600, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; static f32 sScales[] = { 0.1f, 0.05f }; diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index ba43d40a46..3f45341e30 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -54,9 +54,9 @@ static s16 sEffectScales[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }; void ObjHamishi_InitCollision(Actor* thisx, PlayState* play) { @@ -140,7 +140,7 @@ void ObjHamishi_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } if (this->actor.shape.rot.y == 0) { this->actor.shape.rot.y = this->actor.world.rot.y = this->actor.home.rot.y = Rand_ZeroFloat(65536.0f); diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 11b671c4b4..badd99186d 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -64,9 +64,9 @@ static HanaParams sHanaParams[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 60, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 900, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 60, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ObjHana_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 75163663e9..d946077670 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -37,9 +37,9 @@ static f32 D_80B940C0[] = { 85.0f, 85.0f, 0.0f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; static CollisionHeader* sCollisionHeaders[] = { &gHookshotPostCol, &gHookshotPostCol, &gHookshotTargetCol }; @@ -116,7 +116,7 @@ void func_80B93D90(ObjHsblock* this) { } void func_80B93DB0(ObjHsblock* this) { - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 105.0f; ObjHsblock_SetupAction(this, func_80B93DF4); } @@ -137,7 +137,7 @@ void func_80B93E5C(ObjHsblock* this, PlayState* play) { this->dyna.actor.velocity.y, 0.3f)) < 0.001f) { this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y; func_80B93D90(this); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 18b90b5584..23b1728fcc 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -7,7 +7,7 @@ #include "z_obj_ice_poly.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjIcePoly_Init(Actor* thisx, PlayState* play); void ObjIcePoly_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 0e41cff338..0f26d40611 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void ObjKibako_Init(Actor* thisx, PlayState* play); void ObjKibako_Destroy(Actor* thisx, PlayState* play2); @@ -58,9 +58,9 @@ static CollisionCheckInfoInit sCCInfoInit = { 0, 12, 60, MASS_HEAVY }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 60, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 60, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void ObjKibako_SpawnCollectible(ObjKibako* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 58e578c059..035dbb9b09 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -51,9 +51,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void ObjKibako2_InitCollider(Actor* thisx, PlayState* play) { @@ -147,7 +147,7 @@ void ObjKibako2_Idle(ObjKibako2* this, PlayState* play) { func_80033684(play, &this->dyna.actor) != NULL) { ObjKibako2_Break(this, play); SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 20, NA_SE_EV_WOODBOX_BREAK); - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->dyna.actor.draw = NULL; this->actionFunc = ObjKibako2_Kill; diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 3c63e0af1f..e13352a5a3 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -9,7 +9,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "quake.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjLift_Init(Actor* thisx, PlayState* play); void ObjLift_Destroy(Actor* thisx, PlayState* play); @@ -49,9 +49,9 @@ static ObjLiftFramgentScale sFragmentScales[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -600, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -600, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; static f32 sScales[] = { 0.1f, 0.05f }; diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 6f723d292a..a2d8dbbb12 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" #include "assets/objects/object_lightswitch/object_lightswitch.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum FaceTextureIndex { /* 0x00 */ FACE_EYES_CLOSED, @@ -83,9 +83,9 @@ static Vec3f D_80B97F74 = { 0.0f, 0.0f, 0.0f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void ObjLightswitch_InitCollider(ObjLightswitch* this, PlayState* play) { @@ -184,7 +184,7 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) { this->actor.shape.rot.z = 0; this->actor.world.rot.x = this->actor.home.rot.x = this->actor.shape.rot.x; this->actor.world.rot.z = this->actor.home.rot.z = this->actor.shape.rot.z; - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_OBJ_OSHIHIKI, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, 0, this->actor.home.rot.y, 0, (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) { diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index e909134128..82e10d0f23 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -8,7 +8,7 @@ #include "global.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjMakekinsuta_Init(Actor* thisx, PlayState* play); void ObjMakekinsuta_Update(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index eeaf2bdd60..1cc2161196 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_5 +#define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play); void ObjMakeoshihiki_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 7b52356690..90e1b5dda7 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -54,9 +54,9 @@ static s16 sSpawnActorIds[] = { ACTOR_EN_KUSA, 0, ACTOR_EN_FISH, ACTOR_EN_INSECT static s16 sSpawnParams[] = { 0, 2, -1, INSECT_TYPE_PERMANENT, -1 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; s32 ObjMure_SetCullingImpl(Actor* thisx, PlayState* play) { @@ -284,7 +284,7 @@ void ObjMure_InitialAction(ObjMure* this, PlayState* play) { void ObjMure_CulledState(ObjMure* this, PlayState* play) { if (fabsf(this->actor.projectedPos.z) < sZClip[this->type]) { this->actionFunc = ObjMure_ActiveState; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure_SpawnActors(this, play); } } @@ -407,7 +407,7 @@ void ObjMure_ActiveState(ObjMure* this, PlayState* play) { ObjMure_CheckChildren(this, play); if (sZClip[this->type] + 40.0f <= fabsf(this->actor.projectedPos.z)) { this->actionFunc = ObjMure_CulledState; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure_KillActors(this, play); } else if (sTypeGroupBehaviorFunc[this->type] != NULL) { sTypeGroupBehaviorFunc[this->type](this, play); diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 7539520b3d..bcdb0558e7 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -159,9 +159,9 @@ void func_80B9A534(ObjMure2* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 2100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 2100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void ObjMure2_Init(Actor* thisx, PlayState* play) { @@ -169,7 +169,7 @@ void ObjMure2_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1200.0f; + this->actor.cullingVolumeDistance += 1200.0f; } ObjMure2_SetupWait(this); } @@ -189,7 +189,7 @@ void func_80B9A658(ObjMure2* this) { void func_80B9A668(ObjMure2* this, PlayState* play) { if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) < (sDistSquared1[PARAMS_GET_U(this->actor.params, 0, 2)] * this->unk_184)) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure2_SpawnActors(this, play); func_80B9A6E8(this); } @@ -203,7 +203,7 @@ void func_80B9A6F8(ObjMure2* this, PlayState* play) { func_80B9A534(this); if ((sDistSquared2[PARAMS_GET_U(this->actor.params, 0, 2)] * this->unk_184) <= Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure2_CleanupAndDie(this, play); func_80B9A658(this); } diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index 1ed11535ca..c9ed01e3c9 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -34,9 +34,9 @@ ActorProfile Obj_Mure3_Profile = { static s16 sRupeeCounts[] = { 5, 5, 7, 0 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void func_80B9A9D0(ObjMure3* this, PlayState* play) { @@ -172,7 +172,7 @@ void func_80B9AF64(ObjMure3* this, PlayState* play) { static ObjMure3SpawnFunc spawnFuncs[] = { func_80B9A9D0, func_80B9AA90, func_80B9ABA0 }; if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) < SQ(1150.0f)) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; spawnFuncs[PARAMS_GET_U(this->actor.params, 13, 3)](this, play); func_80B9AFEC(this); } @@ -185,7 +185,7 @@ void func_80B9AFEC(ObjMure3* this) { void func_80B9AFFC(ObjMure3* this, PlayState* play) { func_80B9ADCC(this, play); if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) >= SQ(1450.0f)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_80B9ACE4(this, play); func_80B9AF54(this); } diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index f6bb63bbb3..ed9d39e3da 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Obj_Switch/z_obj_switch.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjOshihiki_Init(Actor* thisx, PlayState* play2); void ObjOshihiki_Destroy(Actor* thisx, PlayState* play); @@ -59,9 +59,9 @@ static s16 sSceneIds[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; // The vertices and center of the bottom face diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 5648c809ca..8ed5e8558e 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -6,7 +6,7 @@ #include "z_obj_roomtimer.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjRoomtimer_Init(Actor* thisx, PlayState* play); void ObjRoomtimer_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index ef4f34f9e4..4ebd98a2fe 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define OBJSWITCH_TYPE(thisx) PARAMS_GET_U((thisx)->params, 0, 3) #define OBJSWITCH_SUBTYPE(thisx) PARAMS_GET_U((thisx)->params, 4, 3) @@ -176,9 +176,9 @@ static ColliderJntSphInit sCrystalJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; void ObjSwitch_RotateY(Vec3f* dest, Vec3f* src, s16 rotY) { diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index d68f3d3c46..7c221da0b8 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_syokudai/object_syokudai.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void ObjSyokudai_Init(Actor* thisx, PlayState* play); void ObjSyokudai_Destroy(Actor* thisx, PlayState* play); @@ -70,9 +70,9 @@ static ColliderCylinderInit sCylInitFlame = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; static s32 sLitTorchCount; diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 0235a0513c..bc231076ce 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -7,8 +7,9 @@ #include "z_obj_timeblock.h" #include "assets/objects/object_timeblock/object_timeblock.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void ObjTimeblock_Init(Actor* thisx, PlayState* play); void ObjTimeblock_Destroy(Actor* thisx, PlayState* play); @@ -53,9 +54,9 @@ static f32 sRanges[] = { 60.0, 100.0, 140.0, 180.0, 220.0, 260.0, 300.0, 300.0 } static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_2, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; static Color_RGB8 sPrimColors[] = { diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index d88f5c7142..a5911678e4 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void ObjTsubo_Init(Actor* thisx, PlayState* play); void ObjTsubo_Destroy(Actor* thisx, PlayState* play2); @@ -77,9 +77,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit[] = { 0, 12, 60, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -1200, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 150, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -1200, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 150, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 900, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ObjTsubo_SpawnCollectible(ObjTsubo* this, PlayState* play) { @@ -227,7 +227,7 @@ void ObjTsubo_WaitForObject(ObjTsubo* this, PlayState* play) { this->actor.draw = ObjTsubo_Draw; this->actor.objectSlot = this->requiredObjectSlot; ObjTsubo_SetupIdle(this); - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } @@ -279,7 +279,7 @@ void ObjTsubo_SetupLiftedUp(ObjTsubo* this) { this->actor.room = -1; //! @bug: This is an unsafe cast, although the sound effect will still play Player_PlaySfx((Player*)&this->actor, NA_SE_PL_PULL_UP_POT); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void ObjTsubo_LiftedUp(ObjTsubo* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index 7877b148a7..ac422c63e8 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -8,8 +8,9 @@ #include "assets/objects/object_timeblock/object_timeblock.h" #include "terminal.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void ObjWarp2block_Init(Actor* thisx, PlayState* play2); void ObjWarp2block_Destroy(Actor* thisx, PlayState* play); @@ -55,9 +56,9 @@ static Warp2BlockSpawnData sSpawnData[] = { static f32 sDistances[] = { 60.0f, 100.0f, 140.0f, 180.0f, 220.0f, 260.0f, 300.0f, 300.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; static Color_RGB8 sColors[] = { diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index c18ca9f44d..d3f126b1e7 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_spot02_objects/object_spot02_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ObjectKankyo_Init(Actor* thisx, PlayState* play); void ObjectKankyo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 0c229ebb12..7953afe1f8 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -7,7 +7,7 @@ #include "z_oceff_spot.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffSpot_Init(Actor* thisx, PlayState* play); void OceffSpot_Destroy(Actor* thisx, PlayState* play); @@ -32,7 +32,7 @@ ActorProfile Oceff_Spot_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_STOP), }; void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc) { @@ -81,7 +81,7 @@ void OceffSpot_End(OceffSpot* this, PlayState* play) { } else { Actor_Kill(&this->actor); if (gTimeSpeed != 400 && !play->msgCtx.disableSunsSong && - GET_EVENTINF_HORSES_STATE() != EVENTINF_HORSES_STATE_1) { + GET_EVENTINF_INGO_RACE_STATE() != INGO_RACE_STATE_HORSE_RENTAL_PERIOD) { if (play->msgCtx.ocarinaAction != OCARINA_ACTION_CHECK_NOWARP_DONE || play->msgCtx.ocarinaMode != OCARINA_MODE_08) { gSaveContext.sunsSongState = SUNSSONG_START; diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 3d95b4651e..c7c63690b7 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -6,7 +6,7 @@ #include "z_oceff_storm.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffStorm_Init(Actor* thisx, PlayState* play); void OceffStorm_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 4235b1c004..f9b14bc7de 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -7,7 +7,7 @@ #include "z_oceff_wipe.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe_Init(Actor* thisx, PlayState* play); void OceffWipe_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index d613381f81..9e3b03a8f9 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -7,7 +7,7 @@ #include "z_oceff_wipe2.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe2_Init(Actor* thisx, PlayState* play); void OceffWipe2_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index ea5c7eddcd..757e9b116d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -7,7 +7,7 @@ #include "z_oceff_wipe3.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe3_Init(Actor* thisx, PlayState* play); void OceffWipe3_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 0aaee51d08..9ad0dbf68e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -7,7 +7,7 @@ #include "z_oceff_wipe4.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe4_Init(Actor* thisx, PlayState* play); void OceffWipe4_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 4d581a4448..a91fb67154 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -68,7 +68,7 @@ void ShotSun_Init(Actor* thisx, PlayState* play) { params = PARAMS_GET_U(this->actor.params, 0, 8); if (params == 0x40 || params == 0x41) { this->fairySpawnerState = SPAWNER_OUT_OF_RANGE; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; this->actionFunc = ShotSun_UpdateFairySpawner; this->actor.flags |= ACTOR_FLAG_LOCK_ON_DISABLED; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 28b66bcb35..8f84f379e6 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -335,21 +335,21 @@ void Player_Action_CsAction(Player* this, PlayState* play); // .bss part 1 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.0:64 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" + "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:128 pal-1.1:128" static s32 D_80858AA0; // TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving // data around. It would be easier if we had more options for controlling BSS ordering in debug. #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ - "ntsc-1.0:192 ntsc-1.1:128 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" + "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" static s32 sSavedCurrentMask; static Vec3f sInteractWallCheckResult; static Input* sControlInput; -#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ - "ntsc-1.0:128 ntsc-1.1:192 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" +#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ + "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" // .data @@ -4817,7 +4817,8 @@ s32 func_808382DC(Player* this, PlayState* play) { respawnInfo = &fallingSpikeTrapRespawn; } - Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, 0xDFF); + Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, + PLAYER_PARAMS(PLAYER_START_MODE_IDLE, PLAYER_START_BG_CAM_DEFAULT)); gSaveContext.respawn[RESPAWN_MODE_DOWN].pos = respawnInfo->pos; gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw = respawnInfo->yaw; } @@ -10191,7 +10192,8 @@ s32 func_80845BA0(PlayState* play, Player* this, f32* arg2, s32 arg3) { s32 func_80845C68(PlayState* play, s32 arg1) { if (arg1 == 0) { - Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, 0xDFF); + Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, + PLAYER_PARAMS(PLAYER_START_MODE_IDLE, PLAYER_START_BG_CAM_DEFAULT)); } gSaveContext.respawn[RESPAWN_MODE_DOWN].data = 0; return arg1; @@ -10277,7 +10279,8 @@ void Player_Action_80845EF8(Player* this, PlayState* play) { Room_FinishRoomChange(play, &play->roomCtx); } Camera_SetFinishedFlag(Play_GetCamera(play, CAM_ID_MAIN)); - Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, 0xDFF); + Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, + PLAYER_PARAMS(PLAYER_START_MODE_IDLE, PLAYER_START_BG_CAM_DEFAULT)); } return; } @@ -10786,13 +10789,14 @@ void Player_Init(Actor* thisx, PlayState* play2) { } if (func_80845C68(play, (respawnFlag == 2) ? 1 : 0) == 0) { - gSaveContext.respawn[RESPAWN_MODE_DOWN].playerParams = PARAMS_GET_S(thisx->params, 0, 8) | 0xD00; + gSaveContext.respawn[RESPAWN_MODE_DOWN].playerParams = + PLAYER_PARAMS(PLAYER_START_MODE_IDLE, PLAYER_GET_START_BG_CAM_INDEX(thisx)); } gSaveContext.respawn[RESPAWN_MODE_DOWN].data = 1; if (play->sceneId <= SCENE_INSIDE_GANONS_CASTLE_COLLAPSE) { - gSaveContext.save.info.infTable[INFTABLE_1AX_INDEX] |= gBitFlags[play->sceneId]; + gSaveContext.save.info.infTable[INFTABLE_INDEX_1AX] |= gBitFlags[play->sceneId]; } startMode = PLAYER_GET_START_MODE(thisx); @@ -11920,7 +11924,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { if (DREG(25) != 0) { DREG(25) = 0; } else { - AREG(6) = 1; + R_EXITED_SCENE_RIDING_HORSE = true; } } } @@ -13296,7 +13300,7 @@ void Player_Action_8084CC98(Player* this, PlayState* play) { } if (LinkAnimation_OnFrame(&this->skelAnime, arr[1])) { - func_8002DE74(play, this); + Actor_RequestHorseCameraSetting(play, this); Player_PlaySfx(this, NA_SE_PL_SIT_ON_HORSE); return; } @@ -13304,7 +13308,7 @@ void Player_Action_8084CC98(Player* this, PlayState* play) { return; } - func_8002DE74(play, this); + Actor_RequestHorseCameraSetting(play, this); this->skelAnime.prevTransl = D_8085499C; if ((rideActor->animationIdx != this->av2.actionVar2) && @@ -13463,9 +13467,9 @@ void Player_Action_8084D3E4(Player* this, PlayState* play) { func_8083C0E8(this, play); this->stateFlags1 &= ~PLAYER_STATE1_23; this->actor.parent = NULL; - AREG(6) = 0; + R_EXITED_SCENE_RIDING_HORSE = false; - if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || (DREG(1) != 0)) { + if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || R_DEBUG_FORCE_EPONA_OBTAINED) { gSaveContext.save.info.horseData.pos.x = rideActor->actor.world.pos.x; gSaveContext.save.info.horseData.pos.y = rideActor->actor.world.pos.y; gSaveContext.save.info.horseData.pos.z = rideActor->actor.world.pos.z; @@ -13869,7 +13873,8 @@ void Player_Action_8084E3C4(Player* this, PlayState* play) { s32 pad; gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex = sWarpSongEntrances[play->msgCtx.lastPlayedSong]; - gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x5FF; + gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = + PLAYER_PARAMS(PLAYER_START_MODE_WARP_SONG, PLAYER_START_BG_CAM_DEFAULT); gSaveContext.respawn[RESPAWN_MODE_RETURN].data = play->msgCtx.lastPlayedSong; this->csAction = PLAYER_CSACTION_NONE; @@ -14972,13 +14977,15 @@ void Player_Action_808507F4(Player* this, PlayState* play) { if (this->av2.actionVar2 == 0) { gSaveContext.respawn[RESPAWN_MODE_TOP].data = 1; - Play_SetupRespawnPoint(play, RESPAWN_MODE_TOP, 0x6FF); + Play_SetupRespawnPoint(play, RESPAWN_MODE_TOP, + PLAYER_PARAMS(PLAYER_START_MODE_FARORES_WIND, PLAYER_START_BG_CAM_DEFAULT)); gSaveContext.save.info.fwMain.set = 1; gSaveContext.save.info.fwMain.pos.x = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.x; gSaveContext.save.info.fwMain.pos.y = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.y; gSaveContext.save.info.fwMain.pos.z = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.z; gSaveContext.save.info.fwMain.yaw = gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw; - gSaveContext.save.info.fwMain.playerParams = 0x6FF; + gSaveContext.save.info.fwMain.playerParams = + PLAYER_PARAMS(PLAYER_START_MODE_FARORES_WIND, PLAYER_START_BG_CAM_DEFAULT); gSaveContext.save.info.fwMain.entranceIndex = gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex; gSaveContext.save.info.fwMain.roomIndex = gSaveContext.respawn[RESPAWN_MODE_DOWN].roomIndex; gSaveContext.save.info.fwMain.tempSwchFlags = gSaveContext.respawn[RESPAWN_MODE_DOWN].tempSwchFlags; @@ -16158,7 +16165,7 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorCue* cueUnused) { } if (cue == NULL) { - this->actor.flags &= ~ACTOR_FLAG_6; + this->actor.flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; } else { s32 csAction; diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index a839900ec9..a79893c392 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -6,6 +6,7 @@ #include "z_eff_ss_kakera.h" #include "versions.h" +#include "line_numbers.h" #define rReg0 regs[0] #define rGravity regs[1] @@ -55,11 +56,7 @@ u32 EffectSsKakera_Init(PlayState* play, u32 index, EffectSs* this, void* initPa } else { PRINTF("shape_modelがNULL\n"); -#if OOT_VERSION < NTSC_1_1 - LogUtils_HungupThread("../z_eff_kakera.c", 175); -#else - LogUtils_HungupThread("../z_eff_kakera.c", 178); -#endif + LogUtils_HungupThread("../z_eff_kakera.c", LN1(175, 178)); } this->draw = EffectSsKakera_Draw; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 33c98159c9..e633b06e2e 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -466,7 +466,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { Inventory_ChangeEquipment(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP]); if (pauseCtx->cursorY[PAUSE_EQUIP] == 0) { - gSaveContext.save.info.infTable[INFTABLE_1DX_INDEX] = 0; + gSaveContext.save.info.infTable[INFTABLE_INDEX_1DX] = 0; gSaveContext.save.info.equips.buttonItems[0] = cursorItem; if ((pauseCtx->cursorX[PAUSE_EQUIP] == 3) && (gSaveContext.save.info.playerData.bgsFlag != 0)) { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index a34f324102..dfcccb33f4 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -3902,7 +3902,7 @@ void KaleidoScope_Update(PlayState* play) { if (CHECK_QUEST_ITEM(QUEST_SONG_STORMS)) { pauseCtx->worldMapPoints[WORLD_MAP_POINT_KAKARIKO_VILLAGE] = WORLD_MAP_POINT_STATE_HIGHLIGHT; } - if (GET_EVENTCHKINF(EVENTCHKINF_67)) { + if (GET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL)) { pauseCtx->worldMapPoints[WORLD_MAP_POINT_KAKARIKO_VILLAGE] = WORLD_MAP_POINT_STATE_SHOW; } if (GET_EVENTCHKINF(EVENTCHKINF_AA)) { diff --git a/tools/.gitignore b/tools/.gitignore index c5ae45dacd..dfde978af6 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -13,4 +13,5 @@ gzinject/obj/* z64compress/z64compress z64compress/o/* -graphovl/ +ido_recomp/ +egcs/ diff --git a/tools/Makefile b/tools/Makefile index 30d9114aaf..c591fa583f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,6 +1,23 @@ CFLAGS := -Wall -Wextra -pedantic -std=c99 -g -O2 PROGRAMS := elf2rom makeromfs mkdmadata mkldscript preprocess_pragmas reloc_prereq +UNAME_S := $(shell uname -s) +ifeq ($(UNAME_S),Linux) + DETECTED_OS=linux +else ifeq ($(UNAME_S),Darwin) + DETECTED_OS=macos +else + $(error Unsupported OS: $(UNAME_S)) +endif + +IDO_RECOMP_VERSION := v1.2 +IDO_RECOMP_5_3_DIR := ido_recomp/$(DETECTED_OS)/5.3 +IDO_RECOMP_7_1_DIR := ido_recomp/$(DETECTED_OS)/7.1 + +EGCS_BINUTILS_VERSION := 0.6 +EGCS_GCC_VERSION := 0.7 +EGCS_DIR := egcs/$(DETECTED_OS) + ifeq ($(shell command -v clang >/dev/null 2>&1; echo $$?),0) CC := clang else @@ -17,7 +34,7 @@ ifneq ($(LLD),0) CFLAGS += -fuse-ld=lld endif -all: $(PROGRAMS) +all: $(PROGRAMS) $(IDO_RECOMP_5_3_DIR) $(IDO_RECOMP_7_1_DIR) $(EGCS_DIR) $(MAKE) -C ZAPD $(MAKE) -C fado ifeq ($(wildcard ./gzinject/Makefile),) @@ -30,6 +47,7 @@ endif clean: $(RM) $(PROGRAMS) $(addsuffix .exe,$(PROGRAMS)) + $(RM) -r ido_recomp egcs $(MAKE) -C ZAPD clean $(MAKE) -C fado clean ifneq ($(wildcard ./gzinject/Makefile),) @@ -59,3 +77,16 @@ $(1): $($1_SOURCES) endef $(foreach p,$(PROGRAMS),$(eval $(call COMPILE,$(p)))) + +$(IDO_RECOMP_5_3_DIR): + mkdir -p $@ + curl -sL https://github.com/decompals/ido-static-recomp/releases/download/$(IDO_RECOMP_VERSION)/ido-5.3-recomp-$(DETECTED_OS).tar.gz | tar xz -C $@ + +$(IDO_RECOMP_7_1_DIR): + mkdir -p $@ + curl -sL https://github.com/decompals/ido-static-recomp/releases/download/$(IDO_RECOMP_VERSION)/ido-7.1-recomp-$(DETECTED_OS).tar.gz | tar xz -C $@ + +$(EGCS_DIR): + mkdir -p $@ + curl -sL https://github.com/decompals/mips-binutils-egcs-2.9.5/releases/download/$(EGCS_BINUTILS_VERSION)/mips-binutils-egcs-2.9.5-$(DETECTED_OS).tar.gz | tar xz -C $@ + curl -sL https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/download/$(EGCS_GCC_VERSION)/mips-gcc-egcs-2.91.66-$(DETECTED_OS).tar.gz | tar xz -C $@ diff --git a/tools/ZAPD/.gitrepo b/tools/ZAPD/.gitrepo index 35d0134910..bb5ac2efe1 100644 --- a/tools/ZAPD/.gitrepo +++ b/tools/ZAPD/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/zeldaret/ZAPD.git branch = master - commit = 0285e11f0a5937f60db023bfe5db273f2223fcf4 - parent = afd82230e1bd6e043eabe613f5b31f6e96f0f88c + commit = c04562d30aae565e98d538fd4c1e5c08699c8d48 + parent = cfe1e4db6e1a4b561ac1ed0e87f250c83b5a3c69 method = merge - cmdver = 0.4.6 + cmdver = 0.4.9 diff --git a/tools/ZAPD/ZAPD/ZCKeyFrame.cpp b/tools/ZAPD/ZAPD/ZCKeyFrame.cpp index 387f8ad2f2..3893394f5c 100644 --- a/tools/ZAPD/ZAPD/ZCKeyFrame.cpp +++ b/tools/ZAPD/ZAPD/ZCKeyFrame.cpp @@ -130,7 +130,17 @@ size_t ZKeyFrameSkel::GetRawDataSize() const std::string ZKeyFrameSkel::GetSourceTypeName() const { - return "KeyFrameSkeleton"; + switch (limbType) + { + case ZKeyframeSkelType::Normal: + return "KeyFrameSkeleton"; + + case ZKeyframeSkelType::Flex: + return "KeyFrameFlexSkeleton"; + + default: + return "KeyFrameSkeleton"; + } } ZResourceType ZKeyFrameSkel::GetResourceType() const diff --git a/tools/ZAPD/ZAPD/ZCutscene.cpp b/tools/ZAPD/ZAPD/ZCutscene.cpp index 7ae431ebab..636a7d4c73 100644 --- a/tools/ZAPD/ZAPD/ZCutscene.cpp +++ b/tools/ZAPD/ZAPD/ZCutscene.cpp @@ -24,7 +24,7 @@ std::string ZCutscene::GetBodySourceCode() const { std::string output = ""; - output += StringHelper::Sprintf(" CS_BEGIN_CUTSCENE(%i, %i),\n", numCommands, endFrame); + output += StringHelper::Sprintf(" CS_HEADER(%i, %i),\n", numCommands, endFrame); for (size_t i = 0; i < commands.size(); i++) { @@ -32,7 +32,7 @@ std::string ZCutscene::GetBodySourceCode() const output += " " + cmd->GenerateSourceCode(); } - output += StringHelper::Sprintf(" CS_END(),"); + output += StringHelper::Sprintf(" CS_END_OF_SCRIPT(),"); return output; } diff --git a/tools/ZAPDConfigs/EnumData.xml b/tools/ZAPDConfigs/EnumData.xml index 4b86308b63..bbe0b2d07a 100644 --- a/tools/ZAPDConfigs/EnumData.xml +++ b/tools/ZAPDConfigs/EnumData.xml @@ -148,7 +148,7 @@ - + @@ -172,8 +172,8 @@ - - + + @@ -297,8 +297,8 @@ - - + + diff --git a/tools/ZAPDConfigs/ique-cn/Config.xml b/tools/ZAPDConfigs/ique-cn/Config.xml new file mode 100644 index 0000000000..b2f4e3e4d3 --- /dev/null +++ b/tools/ZAPDConfigs/ique-cn/Config.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/tools/ZAPDConfigs/ique-cn/SymbolMap.txt b/tools/ZAPDConfigs/ique-cn/SymbolMap.txt new file mode 100644 index 0000000000..52ff547fde --- /dev/null +++ b/tools/ZAPDConfigs/ique-cn/SymbolMap.txt @@ -0,0 +1,2 @@ +80106980 gMtxClear +80AE0B10 sShadowTex diff --git a/tools/audio/.gitignore b/tools/audio/.gitignore index f0d3c612fd..5864deaf3c 100644 --- a/tools/audio/.gitignore +++ b/tools/audio/.gitignore @@ -1,5 +1,6 @@ __pycache__/ +afile_sizes atblgen sfpatch sbc diff --git a/tools/audio/Makefile b/tools/audio/Makefile index e93bb158c1..fa74b8c8a9 100644 --- a/tools/audio/Makefile +++ b/tools/audio/Makefile @@ -1,4 +1,4 @@ -PROGRAMS := atblgen sfpatch sbc sfc +PROGRAMS := afile_sizes atblgen sbc sfc sfpatch ifeq ($(shell which xml2-config),) $(error xml2-config not found. Did you install libxml2-dev?) @@ -9,7 +9,7 @@ FORMAT_ARGS := -i -style=file CC := gcc CFLAGS := -Wall -Wextra -pedantic -OPTFLAGS := -Og -g3 +OPTFLAGS := -O2 XML_CFLAGS := $(shell xml2-config --cflags) XML_LDFLAGS := $(shell xml2-config --libs) @@ -30,10 +30,11 @@ format: $(CLANG_FORMAT) $(FORMAT_ARGS) $(shell find . -maxdepth 1 -type f -name "*.[ch]") $(MAKE) -C sampleconv format -atblgen_SOURCES := audio_tablegen.c samplebank.c soundfont.c xml.c util.c -sfpatch_SOURCES := sfpatch.c util.c -sbc_SOURCES := samplebank_compiler.c samplebank.c aifc.c xml.c util.c -sfc_SOURCES := soundfont_compiler.c samplebank.c soundfont.c aifc.c xml.c util.c +afile_sizes_SOURCES := afile_sizes.c util.c +atblgen_SOURCES := audio_tablegen.c samplebank.c soundfont.c xml.c util.c +sbc_SOURCES := samplebank_compiler.c samplebank.c aifc.c xml.c util.c +sfc_SOURCES := soundfont_compiler.c samplebank.c soundfont.c aifc.c xml.c util.c +sfpatch_SOURCES := sfpatch.c util.c atblgen_CFLAGS := $(XML_CFLAGS) sbc_CFLAGS := $(XML_CFLAGS) diff --git a/tools/audio/README.md b/tools/audio/README.md new file mode 100644 index 0000000000..95998dd944 --- /dev/null +++ b/tools/audio/README.md @@ -0,0 +1,59 @@ +# Z64 Audio Tools + +The Z64 Audio Tools work together to implement the full audio asset pipeline + +![](../../docs/audio/build_flowchart.png) + +**Licensing Information** +* The programs `atblgen`, `sampleconv`, `sbc` and `sfc` are (mostly) distributed under MPL-2.0. The VADPCM encoding and decoding portions of `sampleconv` are under CC0-1.0. +* The programs `sfpatch` and `afile_sizes` are distributed under CC0-1.0. +* The extraction tool is distributed under CC0-1.0. + +## sampleconv + +Converts aifc <-> aiff / wav + +Used in extraction and build to convert audio sample data between uncompressed mono 16-bit PCM and the compressed formats used by the audio driver. + +## SampleBank Compiler (sbc) + +Converts samplebank xml + aifc -> asm + +Samplebanks are converted to assembly files for building as it is easier to define the necessary absolute symbols, and they are pure unstructured data. + +## SoundFont Compiler (sfc) + +Converts soundfont & samplebank xml + aifc -> C + +Soundfonts are converted to C rather than assembly as it shares data structures with the audio driver code. Modifying the structures used by the driver without updating `sfc` to write them should error at compile-time rather than crash at runtime. + +## sfpatch + +`Usage: sfpatch in.elf out.elf` + +This tool patches the symbol table of an ELF file (`in.elf`) to make every defined symbol in the file an absolute symbol. This is a required step for building soundfonts from C source as all pointers internal to a soundfont are offset from the start of the soundfont file and not the audiobank segment as a whole. Making all defined symbols ABS symbols prevents the linker from updating their values later, ensuring they remain file-relative. + +## atblgen + +Generates various audio code tables. + +- Samplebank table: Specifies where in the `Audiotable` file each samplebank begins and how large it is. +- Soundfont table: Specifies where in the `Audiobank` files each soundfont begins, how large it is, which samplebanks it uses, and how many instruments/drums/sfx it contains. +- Sequence font table: Contains information on what soundfonts each sequence uses. Generated from the sequence object files that embed a `.note.fonts` section that holds this information. + +The sequence table is not generated as some things in that table are better left manually specified, such as sequence enum names and flags. This also lets us have the sequence table before assembling any sequence files which is nice for some sequence commands like `runseq`. + +## afile_sizes + +Produces header files containing binary file sizes for a given set of object files. Used to produce headers containing soundfont and sequence files and the number of each for use in code files. + +## extraction + +This collection of python files implements the extraction of audio data from a base ROM. + +Files that are designed to be used externally include: +- `audio_extract.py` is the main file for audio extraction, it expects an external script to call `extract_audio_for_version` with the necessary inputs. +- `disassemble_sequence.py` is runnable but is not used in this way in either extraction or building. It may be used to manually disassemble a sequence binary. +- `tuning.py` is runnable but is not used that way in either extraction or building. It may be used to manually determine alternative matches for the samplerate and basenote of a sample as the extraction procedure cannot always determine these uniquely. + +See individual python source files for further details on their purposes. diff --git a/tools/audio/afile_sizes.c b/tools/audio/afile_sizes.c new file mode 100644 index 0000000000..1bd87ef483 --- /dev/null +++ b/tools/audio/afile_sizes.c @@ -0,0 +1,120 @@ +/* SPDX-FileCopyrightText: Copyright (C) 2024 ZeldaRET */ +/* SPDX-License-Identifier: CC0-1.0 */ +#include +#include +#include +#include + +#include "elf32.h" +#include "util.h" + +static int +usage(const char *progname) +{ + fprintf(stderr, + // clang-format off + "Generates a header containing definitions for the sizes of all the input object files and a" "\n" + "definition for the number of input files." "\n" + "Usage: %s
" "\n" + " header output path: Path to write the generated header to" "\n" + " num define: The name of the definition for the number of input files" "\n" + " header guard: The header guard definition name to be used for the output header" "\n" + " section name: The object file section to output the size of in each definition" "\n" + " object files: List of paths to each object file to be processed, each input object file" "\n" + " must contain the section requested in the section name argument and must" "\n" + " also contain a .note.name section containing the null-terminated symbolic " "\n" + " name of the object that is used to name the size definitions." "\n", + // clang-format on + progname); + return EXIT_FAILURE; +} + +int +main(int argc, char **argv) +{ + const char *progname = argv[0]; + + if (argc < 6) // progname, 4 required args, at least 1 input file + return usage(progname); + + const char *header_out = argv[1]; + const char *num_def = argv[2]; + const char *header_guard = argv[3]; + const char *secname = argv[4]; + int num_files = argc - 5; + char **files = &argv[5]; + + // Open the header for writing, write the header guard + + FILE *out = fopen(header_out, "w"); + if (out == NULL) + error("failed to open output file \"%s\" for writing: %s", header_out, strerror(errno)); + + fprintf(out, + // clang-format off + "#ifndef %s_H_" "\n" + "#define %s_H_" "\n" + "\n", + // clang-format on + header_guard, header_guard); + + // For each input elf file, write the size define + + for (int i = 0; i < num_files; i++) { + const char *path = files[i]; + + size_t data_size; + void *data = elf32_read(path, &data_size); + + Elf32_Shdr *shstrtab = elf32_get_shstrtab(data, data_size); + if (shstrtab == NULL) + error("Input file \"%s\" has no shstrtab?", path); + + // Read in the .note.name section containing the object's symbolic name. + // We run this on both soundfonts and sequences: + // - Soundfont .note.name sections are added with objcopy + // - Sequence .note.name sections are assembled as part of .startseq + + Elf32_Shdr *name_section = elf32_section_forname(".note.name", shstrtab, data, data_size); + if (name_section == NULL) + error("Input file \"%s\" has no name section?", path); + + uint32_t name_section_offset = elf32_read32(name_section->sh_offset); + uint32_t name_section_size = elf32_read32(name_section->sh_size); + validate_read(name_section_offset, name_section_size, data_size); + + const char *object_name = GET_PTR(data, name_section_offset); + if (strnlen(object_name, name_section_size + 1) >= name_section_size) + error("Input file \"%s\" name is not properly terminated?", path); + + // Read the section header for the data we're interested in, the name is given in the program args + + Elf32_Shdr *sec = elf32_section_forname(secname, shstrtab, data, data_size); + if (sec == NULL) + error("Input file \"%s\" has no section named \"%s\"?", path, secname); + + // Assumption: The section size matches the size in the _Size symbol, this is always + // true for soundfonts by nature of how they're built (cf. soundfont.ld) and should always be true + // of sequences since writing anything that results in output data before .startseq and after .endseq + // is essentially undefined. + size_t object_size = elf32_read32(sec->sh_size); + + fprintf(out, "#define %s_SIZE 0x%lX\n", object_name, object_size); + + free(data); + } + + // Write the total number of input files, end the header + + fprintf(out, + // clang-format off + "\n" + "#define %s %d" "\n" + "\n" + "#endif" "\n", + // clang-format on + num_def, num_files); + fclose(out); + + return EXIT_SUCCESS; +} diff --git a/tools/audio/aifc.c b/tools/audio/aifc.c index fcf83f8702..cadad5ae2b 100644 --- a/tools/audio/aifc.c +++ b/tools/audio/aifc.c @@ -534,14 +534,19 @@ aifc_read(aifc_data *af, const char *path, uint8_t *match_buf, size_t *match_buf void aifc_dispose(aifc_data *af) { - free(af->book_state); - af->has_book = false; + if (af->has_book) { + free(af->book_state); + af->has_book = false; + } af->has_loop = false; - free(af->compression_name); + if (af->compression_name != NULL) + free(af->compression_name); - for (size_t i = 0; i < af->num_markers; i++) - free((*af->markers)[i].label); - free(af->markers); + if (af->markers != NULL) { + for (size_t i = 0; i < af->num_markers; i++) + free((*af->markers)[i].label); + free(af->markers); + } } diff --git a/tools/audio/audio_tablegen.c b/tools/audio/audio_tablegen.c index f64ce2512d..a95557021e 100644 --- a/tools/audio/audio_tablegen.c +++ b/tools/audio/audio_tablegen.c @@ -424,11 +424,11 @@ tablegen_sequences(const char *seq_font_tbl_out, const char *seq_order_path, con if (shstrtab == NULL) error("ELF file \"%s\" has no section header string table?", path); - // The .fonts and .name sections are written when assembling the sequence: - // The .fonts section contains a list of bytes for each soundfont the sequences uses - // The .name section contains the null-terminated name of the sequence as set by .startseq + // The .note.fonts and .note.name sections are written when assembling the sequence: + // The .note.fonts section contains a list of bytes for each soundfont the sequences uses + // The .note.name section contains the null-terminated name of the sequence as set by .startseq - Elf32_Shdr *font_section = elf32_section_forname(".fonts", shstrtab, data, data_size); + Elf32_Shdr *font_section = elf32_section_forname(".note.fonts", shstrtab, data, data_size); if (font_section == NULL) error("Sequence file \"%s\" has no fonts section?", path); @@ -436,7 +436,7 @@ tablegen_sequences(const char *seq_font_tbl_out, const char *seq_order_path, con uint32_t font_section_size = elf32_read32(font_section->sh_size); validate_read(font_section_offset, font_section_size, data_size); - Elf32_Shdr *name_section = elf32_section_forname(".name", shstrtab, data, data_size); + Elf32_Shdr *name_section = elf32_section_forname(".note.name", shstrtab, data, data_size); if (name_section == NULL) error("Sequence file \"%s\" has no name section?", path); diff --git a/tools/audio/extraction/disassemble_sequence.py b/tools/audio/extraction/disassemble_sequence.py index a77a8fac52..29858e7afc 100644 --- a/tools/audio/extraction/disassemble_sequence.py +++ b/tools/audio/extraction/disassemble_sequence.py @@ -51,17 +51,7 @@ from typing import Callable, Dict, List, Optional, Tuple from .audiobank_file import AudiobankFile - -pitch_names = ( - "A0", "BF0", "B0", "C1", "DF1", "D1", "EF1", "E1", "F1", "GF1", "G1", "AF1", "A1", "BF1", "B1", "C2", - "DF2", "D2", "EF2", "E2", "F2", "GF2", "G2", "AF2", "A2", "BF2", "B2", "C3", "DF3", "D3", "EF3", "E3", - "F3", "GF3", "G3", "AF3", "A3", "BF3", "B3", "C4", "DF4", "D4", "EF4", "E4", "F4", "GF4", "G4", "AF4", - "A4", "BF4", "B4", "C5", "DF5", "D5", "EF5", "E5", "F5", "GF5", "G5", "AF5", "A5", "BF5", "B5", "C6", - "DF6", "D6", "EF6", "E6", "F6", "GF6", "G6", "AF6", "A6", "BF6", "B6", "C7", "DF7", "D7", "EF7", "E7", - "F7", "GF7", "G7", "AF7", "A7", "BF7", "B7", "C8", "DF8", "D8", "EF8", "E8", "F8", "GF8", "G8", "AF8", - "A8", "BF8", "B8", "C9", "DF9", "D9", "EF9", "E9", "F9", "GF9", "G9", "AF9", "A9", "BF9", "B9", "C10", - "DF10", "D10", "EF10", "E10", "F10", "BFNEG1", "BNEG1", "C0", "DF0", "D0", "EF0", "E0", "F0", "GF0", "G0", "AF0", -) +from .tuning import pitch_names # # VERSIONS @@ -1277,20 +1267,33 @@ def emit(self): outfile.write(f".endseq {self.seq_name}\n") if __name__ == '__main__': - import sys + import argparse + parser = argparse.ArgumentParser(description="Disassemble a Zelda 64 sequence binary") + parser.add_argument("file", help="Sequence binary to disassemble") + parser.add_argument("out", help="Path to output source file") + parser.add_argument("-v", dest="mml_version", required=False, default="OoT", type=str, help="Sample rate (integer)") + args = parser.parse_args() + + in_path = args.file + out_path = args.out + + mml_ver = { + "OoT" : MMLVersion.OOT, + "MM" : MMLVersion.MM, + }.get(args.mml_version, None) - in_path = sys.argv[1] - out_path = sys.argv[2] + if mml_ver is None: + raise Exception("Invalid MML Version, should be 'OoT' or 'MM'") with open(in_path, "rb") as infile: data = bytearray(infile.read()) class FontDummy: - def __init__(self, file_name) -> None: - self.name = file_name - self.file_name = file_name + def __init__(self, name) -> None: + self.name = name + self.file_name = name self.instrument_index_map = {} - disas = SequenceDisassembler(0, data, None, CMD_SPEC, MMLVersion.MM, out_path, "", [FontDummy("wow")], []) + disas = SequenceDisassembler(0, data, None, CMD_SPEC, mml_ver, out_path, "", [FontDummy("dummyfont")], []) disas.analyze() disas.emit() diff --git a/tools/audio/extraction/extraction_xml.py b/tools/audio/extraction/extraction_xml.py index f54b7749f0..4cdc816f4e 100644 --- a/tools/audio/extraction/extraction_xml.py +++ b/tools/audio/extraction/extraction_xml.py @@ -67,7 +67,7 @@ def post_init(self, xml_root : Element, version_name : str): in_version = self.in_version(version_include, version_exclude, version_name) if in_version: self.blob_info.append(item.attrib) - self.sample_info_versions.append((item.attrib, in_version)) + self.sample_info_versions.append((item.tag, item.attrib, in_version)) else: print(xml_root.attrib) assert False, item.tag diff --git a/tools/audio/samplebank_compiler.c b/tools/audio/samplebank_compiler.c index f188654f62..cc2bbc76f2 100644 --- a/tools/audio/samplebank_compiler.c +++ b/tools/audio/samplebank_compiler.c @@ -126,7 +126,7 @@ main(int argc, char **argv) sb.name, sb.name); // original tool appears to have a buffer clearing bug involving a buffer sized BUG_BUF_SIZE - match_buf_ptr = (matching) ? match_buf : NULL; + match_buf_ptr = (matching && sb.buffer_bug) ? match_buf : NULL; match_buf_pos = 0; for (size_t i = 0; i < sb.num_samples; i++) { @@ -172,13 +172,13 @@ main(int argc, char **argv) fprintf(outf, ".incbin \"%s\", 0x%lX, 0x%lX\n", path, aifc.ssnd_offset, aifc.ssnd_size); - if (matching && sb.buffer_bug && i == sb.num_samples - 1) { + if (match_buf_ptr != NULL && i == sb.num_samples - 1) { // emplace garbage - size_t end = ALIGN16(match_buf_pos); - fprintf(outf, "\n# Garbage data from buffer bug\n"); + + size_t end = ALIGN16(match_buf_pos); for (; match_buf_pos < end; match_buf_pos++) - fprintf(outf, ".byte 0x%02X\n", match_buf[match_buf_pos]); + fprintf(outf, ".byte 0x%02X\n", match_buf_ptr[match_buf_pos]); } else { fputs("\n.balign 16\n", outf); } diff --git a/tools/audio/sampleconv/Makefile b/tools/audio/sampleconv/Makefile index a023b237e1..d30578543d 100644 --- a/tools/audio/sampleconv/Makefile +++ b/tools/audio/sampleconv/Makefile @@ -1,7 +1,7 @@ CC := gcc CFLAGS := -Wall -Wextra -MMD -OPTFLAGS := -Og -g3 +OPTFLAGS := -O3 LDFLAGS := CLANG_FORMAT := clang-format-14 diff --git a/tools/audio/sampleconv/src/codec/vadpcm.c b/tools/audio/sampleconv/src/codec/vadpcm.c index 8765fa02cf..4314b5c60d 100644 --- a/tools/audio/sampleconv/src/codec/vadpcm.c +++ b/tools/audio/sampleconv/src/codec/vadpcm.c @@ -14,6 +14,18 @@ #include "codec.h" +/** + * Creates FIR filter matrices for each page of the prediction codebook. + * For order=2: each page contains coefficients c0..7 and d0..7, the matrix resembles: + * [ c0, d0, 1, 0, 0, 0, 0, 0, 0, 0 ] + * [ c0, d1, d0, 1, 0, 0, 0, 0, 0, 0 ] + * [ c0, d2, d1, d0, 1, 0, 0, 0, 0, 0 ] + * [ c0, d3, d2, d1, d0, 1, 0, 0, 0, 0 ] + * [ c0, d4, d3, d2, d1, d0, 1, 0, 0, 0 ] + * [ c0, d5, d4, d3, d2, d1, d0, 1, 0, 0 ] + * [ c0, d6, d5, d4, d3, d2, d1, d0, 1, 0 ] + * [ c0, d7, d6, d5, d4, d3, d2, d1, d0, 1 ] + */ int expand_codebook(int16_t *book_data, int32_t ****table_out, int32_t order, int32_t npredictors) { @@ -25,19 +37,25 @@ expand_codebook(int16_t *book_data, int32_t ****table_out, int32_t order, int32_ table[i][j] = MALLOC_CHECKED_INFO((order + 8) * sizeof(int32_t), "order=%d", order); } + // For each page, create the associated matrix for (int32_t i = 0; i < npredictors; i++) { int32_t **table_entry = table[i]; + // Fill the first columns of the FIR filter matrix, up to the "order" column for (int32_t j = 0; j < order; j++) { for (int32_t k = 0; k < 8; k++) table_entry[k][j] = *(book_data++); } + // For each row fill except the first in the "order" column for (int32_t k = 1; k < 8; k++) table_entry[k][order] = table_entry[k - 1][order - 1]; - table_entry[0][order] = 1 << 11; + // Place the 1.0 in the first row of the "order" column + table_entry[0][order] = 1 << 11; // 1.0 in qs4.11 fixed point + // Fill the remaining columns as a shifted-down copy of the previous column, + // adding 0s as-needed. for (int32_t k = 1; k < 8; k++) { int32_t j = 0; @@ -52,6 +70,10 @@ expand_codebook(int16_t *book_data, int32_t ****table_out, int32_t order, int32_ return 0; } +/** + * For each FIR filter matrix associated with a codebook page, pointed to by `table`, store the first + * "order" columns to a codebook at `book_data_out`. + */ int compressed_expanded_codebook(int16_t **book_data_out, int32_t ***table, int order, int npredictors) { @@ -59,9 +81,9 @@ compressed_expanded_codebook(int16_t **book_data_out, int32_t ***table, int orde MALLOC_CHECKED_INFO(sizeof(int16_t) * 8 * order * npredictors, "order=%d, npredictors=%d", order, npredictors); int n = 0; - for (int32_t i = 0; i < npredictors; i++) { - for (int32_t j = 0; j < order; j++) { - for (int32_t k = 0; k < 8; k++) + for (int32_t i = 0; i < npredictors; i++) { // For each matrix + for (int32_t j = 0; j < order; j++) { // For each column + for (int32_t k = 0; k < 8; k++) // For each row book_data[n++] = table[i][k][j]; } } @@ -207,7 +229,8 @@ vdecodeframe(uint8_t *frame, int32_t *prescaled, int32_t *state, int32_t order, int32_t **coef_page = coef_tbl[optimalp]; - // Inner product with predictor coefficients + // Matrix multiplication with FIR filter matrix associated with the book page, the matrix operates on + // 8 samples simultaneously so this needs to be done twice for all 16 samples in the output frame. for (int32_t j = 0; j < 2; j++) { int32_t in_vec[16]; diff --git a/tools/audio/sampleconv/src/codec/vadpcm_tabledesign.c b/tools/audio/sampleconv/src/codec/vadpcm_tabledesign.c index 90bad83499..9fdeb436d7 100644 --- a/tools/audio/sampleconv/src/codec/vadpcm_tabledesign.c +++ b/tools/audio/sampleconv/src/codec/vadpcm_tabledesign.c @@ -10,7 +10,7 @@ #include "../util.h" #include "vadpcm.h" -// Levinson-Durbin algorithm for iteratively solving for prediction coefficients +// Levinson-Durbin algorithm for iteratively solving for prediction and reflection coefficients, given autocorrelation // https://en.wikipedia.org/wiki/Levinson_recursion static int durbin(double *acvec, int order, double *reflection_coeffs, double *prediction_coeffs, double *error) @@ -36,7 +36,7 @@ durbin(double *acvec, int order, double *reflection_coeffs, double *prediction_c reflection_coeffs[i] = prediction_coeffs[i]; if (fabs(reflection_coeffs[i]) > 1.0) { - // incr when a predictor coefficient is > 1 (indicates numerical instability) + // incr when a reflection coefficient has a magnitude > 1 (indicates numerical instability in the model) ret++; } @@ -82,7 +82,7 @@ kfroma(double *in, double *out, int order) int i, j; double div; double temp; - double next[(order + 1)]; + double next[order + 1]; int ret = 0; out[order] = in[order]; @@ -144,29 +144,28 @@ rfroma(double *in, int n, double *out) } static double -model_dist(double *predictors, double *data, int order) +model_dist(double *mean_predictors, double *frame_predictors, int order) { - double autocorrelation_data[order + 1]; - double autocorrelation_predictors[order + 1]; + double autocorrelation_frame_predictors[order + 1]; + double autocorrelation_mean_predictors[order + 1]; double ret; int i, j; - // autocorrelation from data - rfroma(data, order, autocorrelation_data); + // autocorrelation from frame predictors + rfroma(frame_predictors, order, autocorrelation_frame_predictors); - // autocorrelation from predictors + // autocorrelation from current mean predictors (?) for (i = 0; i <= order; i++) { - autocorrelation_predictors[i] = 0.0; - for (j = 0; j <= order - i; j++) { - autocorrelation_predictors[i] += predictors[j] * predictors[i + j]; - } + autocorrelation_mean_predictors[i] = 0.0; + for (j = 0; j <= order - i; j++) + autocorrelation_mean_predictors[i] += mean_predictors[j] * mean_predictors[i + j]; } // compute "model distance" (scaled L2 norm: 2 * inner(ac1, ac2) ) - ret = autocorrelation_data[0] * autocorrelation_predictors[0]; - for (i = 1; i <= order; i++) { - ret += 2 * autocorrelation_data[i] * autocorrelation_predictors[i]; - } + // this compares how good the mean predictors are to the optimal predictors for this frame + ret = autocorrelation_frame_predictors[0] * autocorrelation_mean_predictors[0]; + for (i = 1; i <= order; i++) + ret += 2 * autocorrelation_frame_predictors[i] * autocorrelation_mean_predictors[i]; return ret; } @@ -363,7 +362,8 @@ split(double **predictors, double *delta, int order, int npredictors, double sca } static void -refine(double **predictors, int order, int npredictors, double *data, int data_size, int refine_iters) +refine(double **predictors, int order, int npredictors, double *all_frame_predictors, int num_frame_predictors, + int refine_iters) { int iter; double dist; @@ -376,50 +376,55 @@ refine(double **predictors, int order, int npredictors, double *data, int data_s int counts[npredictors]; double vec[order + 1]; + // For some number of refinement iterations for (iter = 0; iter < refine_iters; iter++) { - // For some number of refinement iterations - - // Initialize averages + // Initialize average autocorrelations memset(counts, 0, npredictors * sizeof(int)); memset(rsums, 0, npredictors * (order + 1) * sizeof(double)); - // Sum autocorrelations - for (i = 0; i < data_size; i++) { + // Sum autocorrelations for averaging for each frame, binning them based on best fitting predictor set + for (i = 0; i < num_frame_predictors; i++) { best_value = 1e30; best_index = 0; - // Find index that minimizes the "model distance" + // Find the choice of predictor that minimizes the "model distance" for this frame for (j = 0; j < npredictors; j++) { - dist = model_dist(predictors[j], &data[(order + 1) * i], order); + // Compare with current mean predictors, the distance metric is based on autocorrelations + dist = model_dist(predictors[j], &all_frame_predictors[(order + 1) * i], order); if (dist < best_value) { + // Record the new best predictors best_value = dist; best_index = j; } } - counts[best_index]++; - rfroma(&data[(order + 1) * i], order, vec); // compute autocorrelation from predictors - + // Compute autocorrelation from optimal predictor + rfroma(&all_frame_predictors[(order + 1) * i], order, vec); + // Add to average autocorrelation for the best predictor choice for (j = 0; j <= order; j++) - rsums[best_index][j] += vec[j]; // add to average autocorrelation + rsums[best_index][j] += vec[j]; + + // Update the counter of how many frames we've summed for this predictor + counts[best_index]++; } - // finalize average autocorrelations + // Finalize average autocorrelations for (i = 0; i < npredictors; i++) { - if (counts[i] > 0) { + if (counts[i] > 1) { + // Need to divide by the number of frames we summed for (j = 0; j <= order; j++) { rsums[i][j] /= counts[i]; } } } + // Update the predictors with the new average autocorrelations in each bin for (i = 0; i < npredictors; i++) { - // compute predictors from average autocorrelation + // Compute predictors and reflection coefficients from average autocorrelation durbin(rsums[i], order, vec, predictors[i], &dummy); - // vec is reflection coeffs - // clamp reflection coeffs + // Clamp reflection coeffs for stability for (j = 1; j <= order; j++) { if (vec[j] >= 1.0) vec[j] = 0.9999999999; @@ -427,44 +432,73 @@ refine(double **predictors, int order, int npredictors, double *data, int data_s vec[j] = -0.9999999999; } - // clamped reflection coeffs -> predictors + // Convert clamped reflection coeffs to stable predictors afromk(vec, predictors[i], order); } } } static int -read_row(int16_t *p, double *row, int order) +read_row(int16_t *out, double *predictors, int order) { - double fval; - int ival; int i, j, k; int overflows; double table[8][order]; + // (discussion is for order=2) + // + // Converts 2 predictors a,b into the coefficients for an FIR filter matrix + // [ c0, d0, 1, 0, 0, 0, 0, 0, 0, 0 ] + // [ c0, d1, d0, 1, 0, 0, 0, 0, 0, 0 ] + // [ c0, d2, d1, d0, 1, 0, 0, 0, 0, 0 ] + // [ c0, d3, d2, d1, d0, 1, 0, 0, 0, 0 ] + // [ c0, d4, d3, d2, d1, d0, 1, 0, 0, 0 ] + // [ c0, d5, d4, d3, d2, d1, d0, 1, 0, 0 ] + // [ c0, d6, d5, d4, d3, d2, d1, d0, 1, 0 ] + // [ c0, d7, d6, d5, d4, d3, d2, d1, d0, 1 ] + // + // Multiplication by this matrix on a vector containing the previous two samples p[-2] and p[-1] and 8 residuals + // s[i] decodes 8 samples p[i] simultaneously. + // Only c0..7 and d0..7 are actually stored in the book, the decoder arranges the rest. + // + // The coefficients are those you get by substituting decoded samples into the prediction model at each step to + // express each p[i] for i in [0, 8) as a linear combination of p[-2], p[-1] and past residuals + // p[i] = a * p[i - 2] * b * p[i - 1] + s[i] + // + // c0 = a, d0 = b + // c1 = ab, d1 = a + b^2 + // c2 = a^2 + ab^2, d2 = 2ab + b^3 + // ... + for (i = 0; i < order; i++) { for (j = 0; j < i; j++) table[i][j] = 0.0; for (j = i; j < order; j++) - table[i][j] = -row[order - j + i]; + table[i][j] = -predictors[order - j + i]; } - - for (i = order; i < 8; i++) + for (i = order; i < 8; i++) { for (j = 0; j < order; j++) table[i][j] = 0.0; + } - for (i = 1; i < 8; i++) - for (j = 1; j <= order; j++) - if (i - j >= 0) + for (i = 1; i < 8; i++) { + for (j = 1; j <= order; j++) { + if (i >= j) { for (k = 0; k < order; k++) - table[i][k] -= row[j] * table[i - j][k]; + table[i][k] -= predictors[j] * table[i - j][k]; + } + } + } + // Convert double-precision book entries into qs4.11 fixed point numbers, + // rounding away from 0 and checking for overflows overflows = 0; - for (i = 0; i < order; i++) { for (j = 0; j < 8; j++) { - fval = table[j][i] * (double)(1 << 11); + int ival; + double fval = table[j][i] * (double)(1 << 11); + if (fval < 0.0) { ival = (int)(fval - 0.5); if (ival < -0x8000) @@ -475,7 +509,7 @@ read_row(int16_t *p, double *row, int order) overflows++; } - *(p++) = ival; + *out++ = ival; } } @@ -517,27 +551,30 @@ tabledesign_run(int16_t *order_out, int16_t *npredictors_out, int16_t **book_dat for (int i = 0; i < num_order; i++) autocorrelation_matrix[i] = MALLOC_CHECKED_INFO(num_order * sizeof(double), "num_order=%d", num_order); + // (back-)align to a multiple of the frame size size_t nframes = num_samples - (num_samples % frame_size); - double *data = + double *all_frame_predictors = MALLOC_CHECKED_INFO(nframes * num_order * sizeof(double), "nframes=%lu, num_order=%d", nframes, num_order); - uint32_t data_size = 0; + uint32_t num_frame_predictors = 0; int16_t *sample = sample_data; - // (back-)align to a multiple of the frame size int16_t *sample_end = sample + nframes; - memset(buffer, 0, frame_size * sizeof(int16_t)); + memset(buffer, 0, frame_size * sizeof(*buffer)); + + // First, compute the optimal set of predictors for every complete frame in the signal, where optimal here means + // the predictors that minimize the mean-square error between the predicted signal and the true signal. for (; sample < sample_end; sample += frame_size) { // Copy sample data into second half of buffer, during the first iteration the first half is 0 while in // later iterations the second half of the previous iteration is shifted into the first half. - memcpy(&buffer[frame_size], sample, frame_size * sizeof(int16_t)); + memcpy(&buffer[frame_size], sample, frame_size * sizeof(*buffer)); // Compute autocorrelation vector of the two vectors in the buffer acvect(&buffer[frame_size], order, frame_size, vec); - // First element is the largest(?) + // First element of autocorrelation has the largest magnitude if (fabs(vec[0]) > design->thresh) { // Over threshold @@ -552,15 +589,20 @@ tabledesign_run(int16_t *order_out, int16_t *npredictors_out, int16_t **book_dat // R = autocorrelation matrix // r = autocorrelation vector // a = linear prediction coefficients - // After this vec contains the prediction coefficients + // After this vec contains the prediction coefficients that minimize the mean-square error. lubksb(autocorrelation_matrix, order, perm, vec); vec[0] = 1.0; // Compute reflection coefficients from prediction coefficients if (kfroma(vec, reflection_coeffs, order) == 0) { // Continue only if numerically stable - data[data_size * num_order + 0] = 1.0; - - // clamp the reflection coefficients + all_frame_predictors[num_frame_predictors * num_order] = 1.0; + + // Clamp the reflection coefficients. Reflection coefficients are clamped rather than the + // predictors themselves as the reflection coefficients have a direct relationship with the + // stability of the model. If the reflection coefficients are outside of the interval (-1,1) + // the model is unstable as the associated transfer function will contain poles outside the + // complex unit disk. If the reflection coefficients are all inside the interval (-1,1) there + // are no poles outside of the unit disk, guaranteeing the stability of the model. for (int i = 1; i < num_order; i++) { if (reflection_coeffs[i] >= 1.0) reflection_coeffs[i] = 0.9999999999; @@ -568,40 +610,44 @@ tabledesign_run(int16_t *order_out, int16_t *npredictors_out, int16_t **book_dat reflection_coeffs[i] = -0.9999999999; } - // Compute prediction coefficients from reflection coefficients - afromk(reflection_coeffs, &data[data_size * num_order], order); - data_size++; + // Compute prediction coefficients from clamped reflection coefficients + afromk(reflection_coeffs, &all_frame_predictors[num_frame_predictors * num_order], order); + num_frame_predictors++; } } } // Move second vector to first vector - memcpy(&buffer[0], &buffer[frame_size], frame_size * sizeof(int16_t)); + memcpy(&buffer[0], &buffer[frame_size], frame_size * sizeof(*buffer)); } + // Now that predictors for every frame have been found, they need to be reduced to a manageable quantity + // (determined by npredictors) to build the prediction codebook that will be exported. First compute the average + // autocorrelation of the prediction models for all frames: + // Create a vector [1.0, 0.0, ..., 0.0] vec[0] = 1.0; for (int i = 1; i < num_order; i++) vec[i] = 0.0; - for (uint32_t i = 0; i < data_size; i++) { - // Compute autocorrelation from predictors - rfroma(&data[i * num_order], order, predictors[0]); + for (uint32_t i = 0; i < num_frame_predictors; i++) { + // Compute autocorrelation from predictors, equivalent to computing the autocorrelation on the signal produced + // by following the prediction model exactly. + rfroma(&all_frame_predictors[i * num_order], order, predictors[0]); for (int k = 1; k < num_order; k++) vec[k] += predictors[0][k]; } for (int i = 1; i < num_order; i++) - vec[i] /= data_size; + vec[i] /= num_frame_predictors; - // vec is the average autocorrelation - - // Compute predictors for average autocorrelation using Levinson-Durbin algorithm + // vec now contains the average autocorrelation. + // Compute predictors for this average autocorrelation using the Levinson-Durbin algorithm. double dummy; durbin(vec, order, reflection_coeffs, predictors[0], &dummy); - // clamp results + // Clamp resulting reflection coefficients to ensure stability for (int i = 1; i < num_order; i++) { if (reflection_coeffs[i] >= 1.0) reflection_coeffs[i] = 0.9999999999; @@ -609,27 +655,37 @@ tabledesign_run(int16_t *order_out, int16_t *npredictors_out, int16_t **book_dat reflection_coeffs[i] = -0.9999999999; } - // Convert clamped reflection coefficients to predictors + // Convert clamped reflection coefficients to stable predictors afromk(reflection_coeffs, predictors[0], order); - // Split and refine predictors + // Starting with the predictors obtained from the average autocorrelation, cluster the predictors for each frame + // via k-means until we have just npredictors worth of output for (unsigned cur_bits = 0; cur_bits < design->bits; cur_bits++) { double split_delta[num_order]; + // Prepare [0, ..., -1, 0] for (int i = 0; i < num_order; i++) split_delta[i] = 0.0; split_delta[order - 1] = -1.0; + // Split the predictors into two halves split(predictors, split_delta, order, 1 << cur_bits, 0.01); - refine(predictors, order, 1 << (1 + cur_bits), data, data_size, design->refine_iters); + + // Update the values of each half to the means of the halves + refine(predictors, order, 1 << (1 + cur_bits), all_frame_predictors, num_frame_predictors, + design->refine_iters); } - int16_t *book_data = MALLOC_CHECKED_INFO((8 * order * npredictors + 2) * sizeof(int16_t), - "order=%d, npredictors=%d", order, npredictors); + // Now we have the reduced set of predictors, write them into the book of size 8 * order * npredictors + + int16_t *book_data = + MALLOC_CHECKED_INFO(8 * order * npredictors * sizeof(int16_t), "order=%d, npredictors=%d", order, npredictors); *order_out = order; *npredictors_out = npredictors; + // As a final step, we need to convert the predictors into coefficients for an FIR filter so that samples in a + // frame can be decoded in parallel taking advantage of the RSP's 8-lane SIMD instruction set. int num_oflow = 0; for (int i = 0; i < npredictors; i++) num_oflow += read_row(&book_data[8 * order * i], predictors[i], order); @@ -641,7 +697,7 @@ tabledesign_run(int16_t *order_out, int16_t *npredictors_out, int16_t **book_dat *book_data_out = book_data; free(buffer); - free(data); + free(all_frame_predictors); for (int i = 0; i < num_order; i++) free(autocorrelation_matrix[i]); diff --git a/tools/audio/sampleconv/src/container/aiff.c b/tools/audio/sampleconv/src/container/aiff.c index 7f824e016a..7c9a38ff17 100644 --- a/tools/audio/sampleconv/src/container/aiff.c +++ b/tools/audio/sampleconv/src/container/aiff.c @@ -138,8 +138,12 @@ f64_to_f80(double f64, uint8_t *f80) } f80tmp; // get f64 bits - - uint64_t f64_bits = *(uint64_t *)&f64; + union { + double f; + uint64_t u; + } tp; + tp.f = f64; + uint64_t f64_bits = tp.u; int f64_sgn = F64_GET_SGN(f64_bits); int f64_exponent = F64_GET_EXP(f64_bits); @@ -197,8 +201,12 @@ f80_to_f64(double *f64, uint8_t *f80) ((uint64_t)f64_mantissa_hi << 32) | ((uint64_t)f64_mantissa_lo); // write double - - *f64 = *(double *)&f64_bits; + union { + double f; + uint64_t u; + } tp; + tp.u = f64_bits; + *f64 = tp.f; } int @@ -309,6 +317,8 @@ aiff_aifc_common_read(container_data *out, FILE *in, UNUSED bool matching, uint3 nloops += inst.sustainLoop.playMode != LOOP_PLAYMODE_NONE; nloops += inst.releaseLoop.playMode != LOOP_PLAYMODE_NONE; + out->num_loops = nloops; + out->loops = NULL; if (nloops != 0) { out->loops = MALLOC_CHECKED_INFO(nloops * sizeof(container_loop), "nloops=%lu", nloops); @@ -495,11 +505,21 @@ aiff_aifc_common_read(container_data *out, FILE *in, UNUSED bool matching, uint3 if (!has_comm) error("aiff/aifc has no COMM chunk"); - if (!has_inst) - error("aiff/aifc has no INST chunk"); if (!has_ssnd) error("aiff/aifc has no SSND chunk"); + if (!has_inst) { + out->base_note = 60; // C4 + out->fine_tune = 0; + out->key_low = 0; + out->key_hi = 127; + out->vel_low = 0; + out->vel_hi = 127; + out->gain = 0; + out->num_loops = 0; + out->loops = NULL; + } + if (out->data_type == SAMPLE_TYPE_PCM16) { assert(out->data_size % 2 == 0); assert(out->bit_depth == 16); diff --git a/tools/audio/sampleconv/src/container/wav.c b/tools/audio/sampleconv/src/container/wav.c index 885acb35eb..ad345f76ed 100644 --- a/tools/audio/sampleconv/src/container/wav.c +++ b/tools/audio/sampleconv/src/container/wav.c @@ -222,6 +222,7 @@ wav_read(container_data *out, const char *path, UNUSED bool matching) smpl.sampler_data = le32toh(smpl.sampler_data); out->num_loops = smpl.num_sample_loops; + out->loops = NULL; if (out->num_loops != 0) { out->loops = MALLOC_CHECKED_INFO(out->num_loops * sizeof(container_loop), "num_loops=%u", out->num_loops); @@ -362,11 +363,11 @@ wav_read(container_data *out, const char *path, UNUSED bool matching) if (!has_inst) { out->base_note = 60; // C4 out->fine_tune = 0; - out->gain = 0; out->key_low = 0; - out->key_hi = 0; + out->key_hi = 127; out->vel_low = 0; - out->vel_hi = 0; + out->vel_hi = 127; + out->gain = 0; } if (!has_smpl) { diff --git a/tools/audio/soundfont_compiler.c b/tools/audio/soundfont_compiler.c index c8ba9633c6..4f9a5779c4 100644 --- a/tools/audio/soundfont_compiler.c +++ b/tools/audio/soundfont_compiler.c @@ -1076,7 +1076,7 @@ emit_c_samples(FILE *out, soundfont *sf) "NO_REORDER SECTION_DATA ALIGNED(16) AdpcmBookHeader SF%d_%s_BOOK_HEADER = {" "\n" " %d, %d," "\n" "};" "\n" - "NO_REORDER SECTION_DATA AdpcmBookData SF%d_%s_BOOK_DATA = {" "\n", + "NO_REORDER SECTION_DATA s16 SF%d_%s_BOOK_DATA[] = {" "\n", // clang-format on sf->info.index, bookname, sample->aifc.book.order, sample->aifc.book.npredictors, sf->info.index, bookname); @@ -1591,7 +1591,7 @@ emit_h_effects(FILE *out, soundfont *sf) NORETURN static void usage(const char *progname) { - fprintf(stderr, "Usage: %s [--matching] \n", progname); + fprintf(stderr, "Usage: %s [--matching] \n", progname); exit(EXIT_FAILURE); } @@ -1749,12 +1749,12 @@ main(int argc, char **argv) fprintf(out_h, // clang-format off - "#ifdef _LANGUAGE_ASEQ" "\n" - ".pushsection .fonts, \"\", @note" "\n" - " .byte %d /*sf id*/" "\n" - ".popsection" "\n" - "#endif" "\n" - "\n", + "#ifdef _LANGUAGE_ASEQ" "\n" + ".pushsection .note.fonts, \"\", @note" "\n" + " .byte %d /*sf id*/" "\n" + ".popsection" "\n" + "#endif" "\n" + "\n", // clang-format on sf.info.index); @@ -1779,8 +1779,11 @@ main(int argc, char **argv) // emit name marker - FILE *out_name = fopen(filename_out_name, "w"); - fprintf(out_name, "%s", sf.info.name); + FILE *out_name = fopen(filename_out_name, "wb"); + // We need to emit an explicit null terminator so that we can run objcopy --add-section to include the name + // in a .note.name section in the compiled object file. This is so that the string that ends up in the .note.name + // section is null-terminated, its length may be verified by any tools that read the name out of this section. + fprintf(out_name, "%s%c", sf.info.name, '\0'); fclose(out_name); // emit dependency file if wanted diff --git a/tools/audio/util.c b/tools/audio/util.c index 8043f95775..c446064767 100644 --- a/tools/audio/util.c +++ b/tools/audio/util.c @@ -1,6 +1,5 @@ /* SPDX-FileCopyrightText: Copyright (C) 2024 ZeldaRET */ /* SPDX-License-Identifier: CC0-1.0 */ -#define _GNU_SOURCE #include #include #include diff --git a/tools/compress.py b/tools/compress.py index 8abb8b09c6..f4d6a7e95e 100755 --- a/tools/compress.py +++ b/tools/compress.py @@ -17,6 +17,12 @@ import dmadata +COMPRESSION_METHODS = { + "yaz0": crunch64.yaz0.compress, + "gzip": crunch64.gzip.compress, +} + + def align(v: int): v += 0xF return v // 0x10 * 0x10 @@ -48,15 +54,24 @@ def compress_rom( rom_data: memoryview, dmadata_start: int, compress_entries_indices: set[int], + compression_format: str, + pad_to_multiple_of: int, + fill_padding_bytes: bool, n_threads: int = None, ): """ rom_data: the uncompressed rom data dmadata_start: the offset in the rom where the dmadata starts compress_entries_indices: the indices in the dmadata of the segments that should be compressed + compression_format: the compression format to use + pad_to_multiple_of: pad the compressed rom to a multiple of this size, in bytes + fill_padding_bytes: fill the padding bytes with a 0x00 0x01 0x02 ... pattern instead of zeros n_threads: how many cores to use for compression """ + # Compression function + compress = COMPRESSION_METHODS[compression_format] + # Segments of the compressed rom (not all are compressed) compressed_rom_segments: list[RomSegment] = [] @@ -80,7 +95,7 @@ def compress_rom( if is_compressed: segment_data = None segment_data_async = p.apply_async( - crunch64.yaz0.compress, + compress, (bytes(segment_data_uncompressed),), ) else: @@ -149,7 +164,6 @@ def compress_rom( compressed_rom_size = sum( align(len(segment.data)) for segment in compressed_rom_segments ) - pad_to_multiple_of = 8 * 2**20 # 8 MiB compressed_rom_size_padded = ( (compressed_rom_size + pad_to_multiple_of - 1) // pad_to_multiple_of @@ -186,9 +200,10 @@ def compress_rom( ) assert rom_offset == compressed_rom_size - # Pad the compressed rom with the pattern matching the baseroms - for i in range(compressed_rom_size, compressed_rom_size_padded): - compressed_rom_data[i] = i % 256 + if fill_padding_bytes: + # Pad the compressed rom with the pattern matching the baseroms + for i in range(compressed_rom_size, compressed_rom_size_padded): + compressed_rom_data[i] = i % 256 # Write the new dmadata offset = dmadata_start @@ -233,6 +248,25 @@ def main(): " e.g. '0-1,3,5,6-9' is all indices from 0 to 9 (included) except 2 and 4." ), ) + parser.add_argument( + "--format", + dest="format", + choices=COMPRESSION_METHODS.keys(), + default="yaz0", + help="compression format to use (default: yaz0)", + ) + parser.add_argument( + "--pad-to", + dest="pad_to", + type=lambda s: int(s, 16), + help="pad the compressed rom to a multiple of this size, in hex (e.g. 0x800000 for 8 MiB)", + ) + parser.add_argument( + "--fill-padding-bytes", + dest="fill_padding_bytes", + action="store_true", + help="fill the padding bytes with a 0x00 0x01 0x02 ... pattern instead of zeros", + ) parser.add_argument( "--threads", dest="n_threads", @@ -269,6 +303,9 @@ def main(): range(compress_range_first, compress_range_last + 1) ) + compression_format = args.format + pad_to_multiple_of = args.pad_to + fill_padding_bytes = args.fill_padding_bytes n_threads = args.n_threads in_rom_data = in_rom_p.read_bytes() @@ -276,6 +313,9 @@ def main(): memoryview(in_rom_data), dmadata_start, compress_entries_indices, + compression_format, + pad_to_multiple_of, + fill_padding_bytes, n_threads, ) out_rom_p.write_bytes(out_rom_data) diff --git a/tools/disasm/ique-cn/file_addresses.csv b/tools/disasm/ique-cn/file_addresses.csv new file mode 100644 index 0000000000..3f3c9d9590 --- /dev/null +++ b/tools/disasm/ique-cn/file_addresses.csv @@ -0,0 +1,472 @@ +name,vrom_start,vrom_end,rom_start,rom_end,vram_start,overlay_dir +boot,1050,B7A0,1050,0,80000450, +code,AB0000,BB8FA0,A890F0,B08080,80018FA0, +ovl_title,BB8FA0,BB98D0,B08080,B08650,80800000,gamestates +ovl_select,BB98D0,BBC550,B08650,B09C90,80800930,gamestates +ovl_opening,BBC550,BBC6A0,B09C90,B09DA0,808035B0,gamestates +ovl_file_choose,BBC6A0,BCD170,B09DA0,B114B0,80803700,gamestates +ovl_kaleido_scope,BCD170,BE91A0,B114B0,B1CE20,808141F0,misc +ovl_player_actor,BE91A0,C0F8B0,B1CE20,B318E0,80830290,actors +ovl_map_mark_data,C0F8B0,C16410,B318E0,B31C00,80856A70,misc +ovl_En_Test,C16410,C1BCC0,B31C00,B34720,8085D5D0,actors +ovl_En_GirlA,C1BCC0,C1E5E0,B34720,B357F0,80862E80,actors +ovl_En_Part,C1E5E0,C1FC40,B357F0,B36580,808657A0,actors +ovl_En_Light,C1FC40,C20A40,B36580,B36DD0,80866E00,actors +ovl_En_Door,C20A40,C21880,B36DD0,B37790,80867C00,actors +ovl_En_Box,C21880,C233D0,B37790,B387B0,80868A40,actors +ovl_En_Poh,C233D0,C275C0,B387B0,B3AB60,8086A5A0,actors +ovl_En_Okuta,C275C0,C29BA0,B3AB60,B3C1B0,8086E790,actors +ovl_En_Bom,C29BA0,C2AA70,B3C1B0,B3CB60,80870D70,actors +ovl_En_Wallmas,C2AA70,C2C480,B3CB60,B3DA80,80871C40,actors +ovl_En_Dodongo,C2C480,C2F220,B3DA80,B3F4D0,80873650,actors +ovl_En_Firefly,C2F220,C31390,B3F4D0,B40800,808763F0,actors +ovl_En_Horse,C31390,C3D5F0,B40800,B46B20,80878560,actors +ovl_En_Arrow,C3D5F0,C3ECF0,B46B20,B47900,808847C0,actors +ovl_En_Elf,C3ECF0,C436B0,B47900,B4A170,80885EC0,actors +ovl_En_Niw,C436B0,C469E0,B4A170,B4C040,8088A880,actors +ovl_En_Tite,C469E0,C49780,B4C040,B4D800,8088DBB0,actors +ovl_En_Reeba,C49780,C4B1F0,B4D800,B4E810,80890950,actors +ovl_En_Peehat,C4B1F0,C4E8F0,B4E810,B505B0,808923C0,actors +ovl_En_Holl,C4E8F0,C4F8C0,B505B0,B50F90,80895AC0,actors +ovl_En_Scene_Change,C4F8C0,C4F9F0,B50F90,B51060,80896A90,actors +ovl_En_Zf,C4F9F0,C564D0,B51060,B548E0,80896BC0,actors +ovl_En_Hata,C564D0,C56A60,B548E0,B54D00,8089D6B0,actors +ovl_Boss_Dodongo,C56A60,C60560,B54D00,B5A160,8089DC40,actors +ovl_Boss_Goma,C60560,C66500,B5A160,B5D240,808A7740,actors +ovl_En_Zl1,C66500,C6A310,B5D240,B5ED00,808AD6E0,actors +ovl_En_Viewer,C6A310,C6D1B0,B5ED00,B607E0,808B14F0,actors +ovl_En_Goma,C6D1B0,C6FE60,B607E0,B62130,808B43B0,actors +ovl_Bg_Pushbox,C6FE60,C70160,B62130,B62350,808B7060,actors +ovl_En_Bubble,C70160,C71580,B62350,B63030,808B7360,actors +ovl_Door_Shutter,C71580,C73840,B63030,B64550,808B8780,actors +ovl_En_Dodojr,C73840,C756E0,B64550,B65760,808BAA40,actors +ovl_En_Bdfire,C756E0,C76280,B65760,B65EF0,808BC8E0,actors +ovl_En_Boom,C76280,C76B50,B65EF0,B664F0,808BD480,actors +ovl_En_Torch2,C76B50,C792B0,B664F0,B67D50,808BDD50,actors +ovl_En_Bili,C792B0,C7B580,B67D50,B691C0,808C04F0,actors +ovl_En_Tp,C7B580,C7D3F0,B691C0,B6A490,808C27C0,actors +ovl_En_St,C7D3F0,C80060,B6A490,B6BEB0,808C4630,actors +ovl_En_Bw,C80060,C833F0,B6BEB0,B6DC30,808C72A0,actors +ovl_En_Eiyer,C833F0,C85050,B6DC30,B6ED50,808CA630,actors +ovl_En_River_Sound,C85050,C859E0,B6ED50,B6F3D0,808CC290,actors +ovl_En_Horse_Normal,C859E0,C88000,B6F3D0,B708B0,808CCC20,actors +ovl_En_Ossan,C88000,C8E5E0,B708B0,B73780,808CF240,actors +ovl_Bg_Treemouth,C8E5E0,C8FC40,B73780,B741C0,808D5820,actors +ovl_Bg_Dodoago,C8FC40,C90980,B741C0,B74A60,808D6E80,actors +ovl_Bg_Hidan_Dalm,C90980,C911D0,B74A60,B74FB0,808D7C30,actors +ovl_Bg_Hidan_Hrock,C911D0,C91A00,B74FB0,B75510,808D8480,actors +ovl_En_Horse_Ganon,C91A00,C92780,B75510,B75DD0,808D8CB0,actors +ovl_Bg_Hidan_Rock,C92780,C93880,B75DD0,B76880,808D9A30,actors +ovl_Bg_Hidan_Rsekizou,C93880,C94460,B76880,B76FC0,808DAB30,actors +ovl_Bg_Hidan_Sekizou,C94460,C958B0,B76FC0,B77C90,808DB710,actors +ovl_Bg_Hidan_Sima,C958B0,C967B0,B77C90,B78660,808DCB60,actors +ovl_Bg_Hidan_Syoku,C967B0,C96C10,B78660,B78900,808DDA60,actors +ovl_En_Xc,C96C10,C9D370,B78900,B7B400,808DDEC0,actors +ovl_Bg_Hidan_Curtain,C9D370,C9DE10,B7B400,B7BAE0,808E4650,actors +ovl_Bg_Spot00_Hanebasi,C9DE10,C9EF20,B7BAE0,B7C670,808E50F0,actors +ovl_En_Mb,C9EF20,CA3150,B7C670,B7EAB0,808E6200,actors +ovl_En_Bombf,CA3150,CA45E0,B7EAB0,B7F820,808EA430,actors +ovl_Bg_Hidan_Firewall,CA45E0,CA4D40,B7F820,B7FD30,808EB8C0,actors +ovl_Bg_Dy_Yoseizo,CA4D40,CA7B30,B7FD30,B817E0,808EC020,actors +ovl_En_Zl2,CA7B30,CAC230,B817E0,B834B0,808EEE10,actors +ovl_Bg_Hidan_Fslift,CAC230,CAC700,B834B0,B837B0,808F3510,actors +ovl_En_OE2,CAC700,CAC7E0,B837B0,B83830,808F39E0,actors +ovl_Bg_Ydan_Hasi,CAC7E0,CACF90,B83830,B83D40,808F3AC0,actors +ovl_Bg_Ydan_Maruta,CACF90,CAD670,B83D40,B841D0,808F4270,actors +ovl_Boss_Ganondrof,CAD670,CB2400,B841D0,B86CE0,808F4950,actors +ovl_En_Am,CB2400,CB4800,B86CE0,B88160,808F96E0,actors +ovl_En_Dekubaba,CB4800,CB82B0,B88160,B8A190,808FBAE0,actors +ovl_En_M_Fire1,CB82B0,CB8450,B8A190,B8A2C0,808FF590,actors +ovl_En_M_Thunder,CB8450,CB9A50,B8A2C0,B8B070,808FF730,actors +ovl_Bg_Ddan_Jd,CB9A50,CBA0A0,B8B070,B8B4A0,80900D30,actors +ovl_Bg_Breakwall,CBA0A0,CBAF10,B8B4A0,B8BE10,80901380,actors +ovl_En_Jj,CBAF10,CBC4E0,B8BE10,B8C890,809021F0,actors +ovl_En_Horse_Zelda,CBC4E0,CBCFD0,B8C890,B8CFF0,809037C0,actors +ovl_Bg_Ddan_Kd,CBCFD0,CBD8C0,B8CFF0,B8D5A0,809042B0,actors +ovl_Door_Warp1,CBD8C0,CC1BC0,B8D5A0,B8F6A0,80904BA0,actors +ovl_Obj_Syokudai,CC1BC0,CC2800,B8F6A0,B8FF20,80908EB0,actors +ovl_Item_B_Heart,CC2800,CC2C10,B8FF20,B90200,80909B00,actors +ovl_En_Dekunuts,CC2C10,CC4410,B90200,B90F60,80909F10,actors +ovl_Bg_Menkuri_Kaiten,CC4410,CC45A0,B90F60,B91090,8090B710,actors +ovl_Bg_Menkuri_Eye,CC45A0,CC4A30,B91090,B913C0,8090B8A0,actors +ovl_En_Vali,CC4A30,CC70F0,B913C0,B92A60,8090BD40,actors +ovl_Bg_Mizu_Movebg,CC70F0,CC8270,B92A60,B934F0,8090E400,actors +ovl_Bg_Mizu_Water,CC8270,CC8F40,B934F0,B93C70,8090F590,actors +ovl_Arms_Hook,CC8F40,CC9CB0,B93C70,B94520,80910260,actors +ovl_En_fHG,CC9CB0,CCC5E0,B94520,B95C80,80910FD0,actors +ovl_Bg_Mori_Hineri,CCC5E0,CCD330,B95C80,B964C0,80913900,actors +ovl_En_Bb,CCD330,CD1010,B964C0,B98950,80914650,actors +ovl_Bg_Toki_Hikari,CD1010,CD1DB0,B98950,B99070,80918330,actors +ovl_En_Yukabyun,CD1DB0,CD23C0,B99070,B994E0,809190D0,actors +ovl_Bg_Toki_Swd,CD23C0,CD3A10,B994E0,B99DB0,809196E0,actors +ovl_En_Fhg_Fire,CD3A10,CD60B0,B99DB0,B9B520,8091AD30,actors +ovl_Bg_Mjin,CD60B0,CD64A0,B9B520,B9B7F0,8091D3D0,actors +ovl_Bg_Hidan_Kousi,CD64A0,CD6A30,B9B7F0,B9BB80,8091D7C0,actors +ovl_Door_Toki,CD6A30,CD6B90,B9BB80,B9BC80,8091DD50,actors +ovl_Bg_Hidan_Hamstep,CD6B90,CD7A40,B9BC80,B9C5E0,8091DEB0,actors +ovl_En_Bird,CD7A40,CD7F00,B9C5E0,B9C920,8091ED60,actors +ovl_En_Wood02,CD7F00,CD90D0,B9C920,B9D4C0,8091F220,actors +ovl_En_Lightbox,CD90D0,CD9550,B9D4C0,B9D800,80920400,actors +ovl_En_Pu_box,CD9550,CD9890,B9D800,B9DA60,80920880,actors +ovl_En_Trap,CD9890,CDAB30,B9DA60,B9E4B0,80920BC0,actors +ovl_En_Arow_Trap,CDAB30,CDAC80,B9E4B0,B9E5D0,80921E60,actors +ovl_En_Vase,CDAC80,CDAD80,B9E5D0,B9E690,80921FB0,actors +ovl_En_Ta,CDAD80,CDE740,B9E690,BA0470,809220B0,actors +ovl_En_Tk,CDE740,CE0570,BA0470,BA1710,80925A70,actors +ovl_Bg_Mori_Bigst,CE0570,CE0EA0,BA1710,BA1C80,809278A0,actors +ovl_Bg_Mori_Elevator,CE0EA0,CE1990,BA1C80,BA22B0,809281D0,actors +ovl_Bg_Mori_Kaitenkabe,CE1990,CE2000,BA22B0,BA2720,80928CC0,actors +ovl_Bg_Mori_Rakkatenjo,CE2000,CE2980,BA2720,BA2CD0,80929330,actors +ovl_En_Vm,CE2980,CE4240,BA2CD0,BA3BB0,80929CB0,actors +ovl_Demo_Effect,CE4240,CE9DE0,BA3BB0,BA6D90,8092B570,actors +ovl_Demo_Kankyo,CE9DE0,CEDA80,BA6D90,BA8C80,80931110,actors +ovl_Bg_Hidan_Fwbig,CEDA80,CEE760,BA8C80,BA9520,80934E00,actors +ovl_En_Floormas,CEE760,CF1B40,BA9520,BAB060,80935AE0,actors +ovl_En_Heishi1,CF1B40,CF3050,BAB060,BABC80,80938EC0,actors +ovl_En_Rd,CF3050,CF5910,BABC80,BAD2A0,8093A3D0,actors +ovl_En_Po_Sisters,CF5910,CFA600,BAD2A0,BAFCF0,8093CC90,actors +ovl_Bg_Heavy_Block,CFA600,CFBEF0,BAFCF0,BB0C40,80941980,actors +ovl_Bg_Po_Event,CFBEF0,CFDD20,BB0C40,BB1F30,80943270,actors +ovl_Obj_Mure,CFDD20,CFED30,BB1F30,BB2890,809450B0,actors +ovl_En_Sw,CFED30,D024A0,BB2890,BB4A40,809460C0,actors +ovl_Boss_Fd,D024A0,D09800,BB4A40,BB8AF0,809498B0,actors +ovl_Object_Kankyo,D09800,D0CA80,BB8AF0,BBA8B0,80950C10,actors +ovl_En_Du,D0CA80,D0E510,BBA8B0,BBB820,80953E90,actors +ovl_En_Fd,D0E510,D111B0,BBB820,BBD3D0,80955920,actors +ovl_En_Horse_Link_Child,D111B0,D12FB0,BBD3D0,BBE350,809585C0,actors +ovl_Door_Ana,D12FB0,D13620,BBE350,BBE7D0,8095A3C0,actors +ovl_Bg_Spot02_Objects,D13620,D14980,BBE7D0,BBF3A0,8095AA30,actors +ovl_Bg_Haka,D14980,D15040,BBF3A0,BBF860,8095BD90,actors +ovl_Magic_Wind,D15040,D16D40,BBF860,BC0F20,8095C450,actors +ovl_Magic_Fire,D16D40,D19040,BC0F20,BC2B20,8095E150,actors +ovl_En_Ru1,D19040,D206E0,BC2B20,BC5F20,80960450,actors +ovl_Boss_Fd2,D206E0,D24410,BC5F20,BC83D0,80967AF0,actors +ovl_En_Fd_Fire,D24410,D25120,BC83D0,BC8CD0,8096B820,actors +ovl_En_Dh,D25120,D26C00,BC8CD0,BC9D70,8096C530,actors +ovl_En_Dha,D26C00,D27C00,BC9D70,BCA750,8096E010,actors +ovl_En_Rl,D27C00,D28AE0,BCA750,BCAEE0,8096F010,actors +ovl_En_Encount1,D28AE0,D29640,BCAEE0,BCB6B0,8096FEF0,actors +ovl_Demo_Du,D29640,D2CE20,BCB6B0,BCCE20,80970A50,actors +ovl_Demo_Im,D2CE20,D30D90,BCCE20,BCE8A0,80974230,actors +ovl_Demo_Tre_Lgt,D30D90,D314A0,BCE8A0,BCED80,809781A0,actors +ovl_En_Fw,D314A0,D32C60,BCED80,BCFD90,809788B0,actors +ovl_Bg_Vb_Sima,D32C60,D33380,BCFD90,BD02B0,8097A070,actors +ovl_En_Vb_Ball,D33380,D34530,BD02B0,BD0DF0,8097A790,actors +ovl_Bg_Haka_Megane,D34530,D34930,BD0DF0,BD10B0,8097B940,actors +ovl_Bg_Haka_MeganeBG,D34930,D34FF0,BD10B0,BD1510,8097BD40,actors +ovl_Bg_Haka_Ship,D34FF0,D35A40,BD1510,BD1BE0,8097C400,actors +ovl_Bg_Haka_Sgami,D35A40,D36660,BD1BE0,BD23D0,8097CE50,actors +ovl_En_Heishi2,D36660,D38860,BD23D0,BD3570,8097DA70,actors +ovl_En_Encount2,D38860,D39A90,BD3570,BD4140,8097FC70,actors +ovl_En_Fire_Rock,D39A90,D3ABA0,BD4140,BD4BB0,80980EA0,actors +ovl_En_Brob,D3ABA0,D3BC90,BD4BB0,BD5610,80981FB0,actors +ovl_Mir_Ray,D3BC90,D3D540,BD5610,BD66B0,809830A0,actors +ovl_Bg_Spot09_Obj,D3D540,D3DA60,BD66B0,BD69E0,80984950,actors +ovl_Bg_Spot18_Obj,D3DA60,D3E330,BD69E0,BD6F20,80984E70,actors +ovl_Boss_Va,D3E330,D4CBC0,BD6F20,BDEBF0,80985740,actors +ovl_Bg_Haka_Tubo,D4CBC0,D4D5E0,BDEBF0,BDF2D0,8099C9D0,actors +ovl_Bg_Haka_Trap,D4D5E0,D4EBB0,BDF2D0,BE0060,8099D3F0,actors +ovl_Bg_Haka_Huta,D4EBB0,D4F650,BE0060,BE0760,8099E9C0,actors +ovl_Bg_Haka_Zou,D4F650,D50840,BE0760,BE12E0,8099F460,actors +ovl_Bg_Spot17_Funen,D50840,D50A90,BE12E0,BE14A0,809A0650,actors +ovl_En_Syateki_Itm,D50A90,D51830,BE14A0,BE1D30,809A08A0,actors +ovl_En_Syateki_Man,D51830,D525F0,BE1D30,BE25B0,809A1640,actors +ovl_En_Tana,D525F0,D528A0,BE25B0,BE2790,809A2400,actors +ovl_En_Nb,D528A0,D56E70,BE2790,BE4570,809A26B0,actors +ovl_Boss_Mo,D56E70,D62940,BE4570,BEB300,809A6C80,actors +ovl_En_Sb,D62940,D63D80,BEB300,BEBE70,809B7260,actors +ovl_En_Bigokuta,D63D80,D66880,BEBE70,BED740,809B86A0,actors +ovl_En_Karebaba,D66880,D68170,BED740,BEE610,809BB1A0,actors +ovl_Bg_Bdan_Objects,D68170,D69440,BEE610,BEF150,809BCA90,actors +ovl_Demo_Sa,D69440,D6BF60,BEF150,BF03C0,809BDD60,actors +ovl_Demo_Go,D6BF60,D6CCB0,BF03C0,BF0B70,809C0880,actors +ovl_En_In,D6CCB0,D6FA50,BF0B70,BF2750,809C15D0,actors +ovl_En_Tr,D6FA50,D71350,BF2750,BF3690,809C4370,actors +ovl_Bg_Spot16_Bombstone,D71350,D728A0,BF3690,BF4490,809C5C70,actors +ovl_Bg_Hidan_Kowarerukabe,D728A0,D73780,BF4490,BF4CE0,809C71C0,actors +ovl_Bg_Bombwall,D73780,D74040,BF4CE0,BF52A0,809C80A0,actors +ovl_En_Ru2,D74040,D76DC0,BF52A0,BF65C0,809C8960,actors +ovl_Obj_Dekujr,D76DC0,D77400,BF65C0,BF6A10,809CB6E0,actors +ovl_Bg_Mizu_Uzu,D77400,D775D0,BF6A10,BF6B70,809CBD20,actors +ovl_Bg_Spot06_Objects,D775D0,D789D0,BF6B70,BF7840,809CBEF0,actors +ovl_Bg_Ice_Objects,D789D0,D79910,BF7840,BF80C0,809CD2F0,actors +ovl_Bg_Haka_Water,D79910,D7A110,BF80C0,BF85A0,809CE230,actors +ovl_En_Ma2,D7A110,D7B170,BF85A0,BF9020,809CEA30,actors +ovl_En_Bom_Chu,D7B170,D7C810,BF9020,BF9F10,809CFA90,actors +ovl_En_Horse_Game_Check,D7C810,D7D8E0,BF9F10,BFA960,809D1130,actors +ovl_Boss_Tw,D7D8E0,D90A30,BFA960,C04CE0,809D2200,actors +ovl_En_Rr,D90A30,D92F60,C04CE0,C06350,809E7DD0,actors +ovl_En_Ba,D92F60,D94E30,C06350,C07490,809EA300,actors +ovl_En_Bx,D94E30,D95930,C07490,C07C60,809EC1D0,actors +ovl_En_Anubice,D95930,D96BE0,C07C60,C08810,809ECCD0,actors +ovl_En_Anubice_Fire,D96BE0,D979A0,C08810,C09180,809EDF80,actors +ovl_Bg_Mori_Hashigo,D979A0,D98260,C09180,C09700,809EED40,actors +ovl_Bg_Mori_Hashira4,D98260,D987E0,C09700,C09AA0,809EF600,actors +ovl_Bg_Mori_Idomizu,D987E0,D98E20,C09AA0,C09EC0,809EFB90,actors +ovl_Bg_Spot16_Doughnut,D98E20,D993E0,C09EC0,C0A2C0,809F01D0,actors +ovl_Bg_Bdan_Switch,D993E0,D9A810,C0A2C0,C0ACC0,809F0790,actors +ovl_En_Ma1,D9A810,D9BAF0,C0ACC0,C0B870,809F1BC0,actors +ovl_Boss_Ganon,D9BAF0,DBDDA0,C0B870,C1E5A0,809F2EA0,actors +ovl_Boss_Sst,DBDDA0,DCA330,C1E5A0,C24DB0,80A18CD0,actors +ovl_En_Ny,DCA330,DCBC70,C24DB0,C25D40,80A252A0,actors +ovl_En_Fr,DCBC70,DCE700,C25D40,C276B0,80A26BE0,actors +ovl_Item_Shield,DCE700,DCF110,C276B0,C27D70,80A29670,actors +ovl_Bg_Ice_Shelter,DCF110,DD0350,C27D70,C28900,80A2A080,actors +ovl_En_Ice_Hono,DD0350,DD1540,C28900,C293E0,80A2B2C0,actors +ovl_Item_Ocarina,DD1540,DD1D10,C293E0,C298C0,80A2C4B0,actors +ovl_Magic_Dark,DD1D10,DD3560,C298C0,C2A9A0,80A2CC80,actors +ovl_Demo_6K,DD3560,DD62C0,C2A9A0,C2C5E0,80A2E4D0,actors +ovl_En_Anubice_Tag,DD62C0,DD6590,C2C5E0,C2C7F0,80A31230,actors +ovl_Bg_Haka_Gate,DD6590,DD7620,C2C7F0,C2D290,80A31500,actors +ovl_Bg_Spot15_Saku,DD7620,DD7960,C2D290,C2D4F0,80A325A0,actors +ovl_Bg_Jya_Goroiwa,DD7960,DD80E0,C2D4F0,C2DA20,80A328E0,actors +ovl_Bg_Jya_Zurerukabe,DD80E0,DD8790,C2DA20,C2DE80,80A33060,actors +ovl_Bg_Jya_Cobra,DD8790,DDA4D0,C2DE80,C2F0B0,80A33710,actors +ovl_Bg_Jya_Kanaami,DDA4D0,DDA880,C2F0B0,C2F330,80A35450,actors +ovl_Fishing,DDA880,DECD10,C2F330,C38420,80A35800,actors +ovl_Obj_Oshihiki,DECD10,DEE7C0,C38420,C393D0,80A4ED40,actors +ovl_Bg_Gate_Shutter,DEE7C0,DEEC50,C393D0,C396C0,80A507F0,actors +ovl_Eff_Dust,DEEC50,DF0020,C396C0,C3A0E0,80A50C80,actors +ovl_Bg_Spot01_Fusya,DF0020,DF02C0,C3A0E0,C3A2E0,80A52050,actors +ovl_Bg_Spot01_Idohashira,DF02C0,DF0EC0,C3A2E0,C3AA70,80A522F0,actors +ovl_Bg_Spot01_Idomizu,DF0EC0,DF11E0,C3AA70,C3ACD0,80A52EF0,actors +ovl_Bg_Po_Syokudai,DF11E0,DF1B50,C3ACD0,C3B320,80A53210,actors +ovl_Bg_Ganon_Otyuka,DF1B50,DF4190,C3B320,C3CCA0,80A53B80,actors +ovl_Bg_Spot15_Rrbox,DF4190,DF4F70,C3CCA0,C3D500,80A561C0,actors +ovl_Bg_Umajump,DF4F70,DF5100,C3D500,C3D630,80A56FA0,actors +ovl_En_Insect,DF5100,DF7620,C3D630,C3EB20,80A57130,actors +ovl_En_Butte,DF7620,DF8BF0,C3EB20,C3F870,80A59650,actors +ovl_En_Fish,DF8BF0,DFAD00,C3F870,C40A30,80A5AC20,actors +ovl_Bg_Spot08_Iceblock,DFAD00,DFBD40,C40A30,C413B0,80A5CD30,actors +ovl_Item_Etcetera,DFBD40,DFC610,C413B0,C41920,80A5DD70,actors +ovl_Arrow_Fire,DFC610,DFE4F0,C41920,C430F0,80A5E640,actors +ovl_Arrow_Ice,DFE4F0,E003F0,C430F0,C446A0,80A60520,actors +ovl_Arrow_Light,E003F0,E02300,C446A0,C45CD0,80A62420,actors +ovl_Obj_Kibako,E02300,E03000,C45CD0,C46440,80A64330,actors +ovl_Obj_Tsubo,E03000,E03FF0,C46440,C46DD0,80A65030,actors +ovl_En_Wonder_Item,E03FF0,E04C40,C46DD0,C47520,80A66020,actors +ovl_En_Ik,E04C40,E09290,C47520,C497E0,80A66D50,actors +ovl_Demo_Ik,E09290,E0A7A0,C497E0,C4A2D0,80A6B3B0,actors +ovl_En_Skj,E0A7A0,E0E0E0,C4A2D0,C4C0E0,80A6C8C0,actors +ovl_En_Skjneedle,E0E0E0,E0E3F0,C4C0E0,C4C320,80A70210,actors +ovl_En_G_Switch,E0E3F0,E0FC10,C4C320,C4D2D0,80A70520,actors +ovl_Demo_Ext,E0FC10,E10560,C4D2D0,C4D8D0,80A71D40,actors +ovl_Demo_Shd,E10560,E12970,C4D8D0,C4EE30,80A72690,actors +ovl_En_Dns,E12970,E13D00,C4EE30,C4F900,80A74AA0,actors +ovl_Elf_Msg,E13D00,E142F0,C4F900,C4FCB0,80A75E30,actors +ovl_En_Honotrap,E142F0,E15850,C4FCB0,C50A20,80A76420,actors +ovl_En_Tubo_Trap,E15850,E164F0,C50A20,C511C0,80A77980,actors +ovl_Obj_Ice_Poly,E164F0,E16EA0,C511C0,C51850,80A78620,actors +ovl_Bg_Spot03_Taki,E16EA0,E177C0,C51850,C51E00,80A78FD0,actors +ovl_Bg_Spot07_Taki,E177C0,E17DB0,C51E00,C521C0,80A798F0,actors +ovl_En_Fz,E17DB0,E19DC0,C521C0,C534E0,80A79EE0,actors +ovl_En_Po_Relay,E19DC0,E1B4D0,C534E0,C543A0,80A7BEF0,actors +ovl_Bg_Relay_Objects,E1B4D0,E1BC80,C543A0,C548B0,80A7D600,actors +ovl_En_Diving_Game,E1BC80,E1D630,C548B0,C55800,80A7DDB0,actors +ovl_En_Kusa,E1D630,E1EB10,C55800,C564E0,80A7F760,actors +ovl_Obj_Bean,E1EB10,E212A0,C564E0,C57A00,80A80C40,actors +ovl_Obj_Bombiwa,E212A0,E21810,C57A00,C57DF0,80A833D0,actors +ovl_Obj_Switch,E21810,E235F0,C57DF0,C58DF0,80A83940,actors +ovl_Obj_Elevator,E235F0,E239B0,C58DF0,C59070,80A85720,actors +ovl_Obj_Lift,E239B0,E243D0,C59070,C59750,80A85AE0,actors +ovl_Obj_Hsblock,E243D0,E249A0,C59750,C59B30,80A86500,actors +ovl_En_Okarina_Tag,E249A0,E25EA0,C59B30,C5A570,80A86AD0,actors +ovl_En_Yabusame_Mark,E25EA0,E26570,C5A570,C5A9D0,80A87FD0,actors +ovl_En_Goroiwa,E26570,E28930,C5A9D0,C5BF50,80A886A0,actors +ovl_En_Ex_Ruppy,E28930,E299F0,C5BF50,C5C9F0,80A8AA60,actors +ovl_En_Toryo,E299F0,E2A680,C5C9F0,C5D1A0,80A8BB20,actors +ovl_En_Daiku,E2A680,E2BDC0,C5D1A0,C5E0C0,80A8C7B0,actors +ovl_En_Nwc,E2BDC0,E2C7E0,C5E0C0,C5E7E0,80A8DEF0,actors +ovl_En_Blkobj,E2C7E0,E2CD40,C5E7E0,C5EBA0,80A8E910,actors +ovl_Item_Inbox,E2CD40,E2CEA0,C5EBA0,C5EC90,80A8EE70,actors +ovl_En_Ge1,E2CEA0,E2EED0,C5EC90,C5FDC0,80A8EFD0,actors +ovl_Obj_Blockstop,E2EED0,E2F070,C5FDC0,C5FF00,80A91000,actors +ovl_En_Sda,E2F070,E306A0,C5FF00,C60BA0,80A911A0,actors +ovl_En_Clear_Tag,E306A0,E39210,C60BA0,C64720,80A92890,actors +ovl_En_Niw_Lady,E39210,E3AB10,C64720,C65630,80A9DE30,actors +ovl_En_Gm,E3AB10,E3B840,C65630,C65EB0,80A9F730,actors +ovl_En_Ms,E3B840,E3BF30,C65EB0,C66370,80AA0460,actors +ovl_En_Hs,E3BF30,E3CAD0,C66370,C66A60,80AA0B50,actors +ovl_Bg_Ingate,E3CAD0,E3CE60,C66A60,C66CF0,80AA16F0,actors +ovl_En_Kanban,E3CE60,E3FFB0,C66CF0,C68660,80AA1A80,actors +ovl_En_Heishi3,E3FFB0,E40980,C68660,C68C60,80AA4BD0,actors +ovl_En_Syateki_Niw,E40980,E42A10,C68C60,C6A060,80AA55A0,actors +ovl_En_Attack_Niw,E42A10,E43C70,C6A060,C6ABA0,80AA7630,actors +ovl_Bg_Spot01_Idosoko,E43C70,E43E80,C6ABA0,C6AD20,80AA8890,actors +ovl_En_Sa,E43E80,E460F0,C6AD20,C6BFE0,80AA8AA0,actors +ovl_En_Wonder_Talk,E460F0,E46780,C6BFE0,C6C450,80AAAD10,actors +ovl_Bg_Gjyo_Bridge,E46780,E46C70,C6C450,C6C7E0,80AAB3A0,actors +ovl_En_Ds,E46C70,E47890,C6C7E0,C6CF10,80AAB890,actors +ovl_En_Mk,E47890,E48720,C6CF10,C6D770,80AAC4B0,actors +ovl_En_Bom_Bowl_Man,E48720,E49C60,C6D770,C6E4B0,80AAD340,actors +ovl_En_Bom_Bowl_Pit,E49C60,E4A5D0,C6E4B0,C6EAD0,80AAE880,actors +ovl_En_Owl,E4A5D0,E4E170,C6EAD0,C707E0,80AAF1F0,actors +ovl_En_Ishi,E4E170,E572C0,C707E0,C717A0,80AB2D90,actors +ovl_Obj_Hana,E572C0,E575D0,C717A0,C719C0,80ABBEE0,actors +ovl_Obj_Lightswitch,E575D0,E58A00,C719C0,C72570,80ABC1F0,actors +ovl_Obj_Mure2,E58A00,E59420,C72570,C72BB0,80ABD620,actors +ovl_En_Go,E59420,E5DA60,C72BB0,C75160,80ABE040,actors +ovl_En_Fu,E5DA60,E5E7A0,C75160,C75A10,80AC2680,actors +ovl_En_Changer,E5E7A0,E5F180,C75A10,C76020,80AC33D0,actors +ovl_Bg_Jya_Megami,E5F180,E60370,C76020,C76CA0,80AC3DB0,actors +ovl_Bg_Jya_Lift,E60370,E608C0,C76CA0,C77040,80AC4FA0,actors +ovl_Bg_Jya_Bigmirror,E608C0,E61110,C77040,C77610,80AC54F0,actors +ovl_Bg_Jya_Bombchuiwa,E61110,E61C50,C77610,C77D40,80AC5D40,actors +ovl_Bg_Jya_Amishutter,E61C50,E61FE0,C77D40,C77F40,80AC6880,actors +ovl_Bg_Jya_Bombiwa,E61FE0,E625A0,C77F40,C78350,80AC6C10,actors +ovl_Bg_Spot18_Basket,E625A0,E63590,C78350,C78D60,80AC71D0,actors +ovl_En_Ganon_Organ,E63590,E6A5D0,C78D60,C7BCA0,80AC81C0,actors +ovl_En_Siofuki,E6A5D0,E6B380,C7BCA0,C7C530,80ACF200,actors +ovl_En_Stream,E6B380,E6B910,C7C530,C7C920,80ACFFB0,actors +ovl_En_Mm,E6B910,E6CF70,C7C920,C7D770,80AD0540,actors +ovl_En_Ko,E6CF70,E710B0,C7D770,C7F6F0,80AD1BA0,actors +ovl_En_Kz,E710B0,E72650,C7F6F0,C80480,80AD5CE0,actors +ovl_En_Weather_Tag,E72650,E73540,C80480,C80AA0,80AD7280,actors +ovl_Bg_Sst_Floor,E73540,E73AA0,C80AA0,C80EB0,80AD8170,actors +ovl_En_Ani,E73AA0,E74810,C80EB0,C816C0,80AD86D0,actors +ovl_En_Ex_Item,E74810,E75990,C816C0,C82120,80AD9440,actors +ovl_Bg_Jya_Ironobj,E75990,E76740,C82120,C82910,80ADA5C0,actors +ovl_En_Js,E76740,E77110,C82910,C82F00,80ADB370,actors +ovl_En_Jsjutan,E77110,E7BEE0,C82F00,C847E0,80ADBD40,actors +ovl_En_Cs,E7BEE0,E7D110,C847E0,C85380,80AE1670,actors +ovl_En_Md,E7D110,E7F780,C85380,C866E0,80AE28A0,actors +ovl_En_Hy,E7F780,E830C0,C866E0,C88530,80AE4F10,actors +ovl_En_Ganon_Mant,E830C0,E872F0,C88530,C89E00,80AE8850,actors +ovl_En_Okarina_Effect,E872F0,E876B0,C89E00,C8A080,80AECA80,actors +ovl_En_Mag,E876B0,E8A6F0,C8A080,C8B630,80AECE40,actors +ovl_Door_Gerudo,E8A6F0,E8ACE0,C8B630,C8BA60,80AF1E80,actors +ovl_Elf_Msg2,E8ACE0,E8B150,C8BA60,C8BCE0,80AF2470,actors +ovl_Demo_Gt,E8B150,E90760,C8BCE0,C8E1A0,80AF28E0,actors +ovl_En_Po_Field,E90760,E94160,C8E1A0,C903D0,80AF7EF0,actors +ovl_Efc_Erupc,E94160,E94C50,C903D0,C90B40,80AFB980,actors +ovl_Bg_Zg,E94C50,E950A0,C90B40,C90E20,80AFC470,actors +ovl_En_Heishi4,E950A0,E95FA0,C90E20,C91710,80AFC8C0,actors +ovl_En_Zl3,E95FA0,E9DDF0,C91710,C94CC0,80AFD7C0,actors +ovl_Boss_Ganon2,E9DDF0,EAF140,C94CC0,C9DC80,80B05610,actors +ovl_En_Kakasi,EAF140,EAFE80,C9DC80,C9E500,80B18480,actors +ovl_En_Takara_Man,EAFE80,EB0740,C9E500,C9EB20,80B191C0,actors +ovl_Obj_Makeoshihiki,EB0740,EB0BD0,C9EB20,C9EE50,80B19A80,actors +ovl_Oceff_Spot,EB0BD0,EB1B00,C9EE50,C9F9C0,80B19F10,actors +ovl_End_Title,EB1B00,EB7540,C9F9C0,CA1670,80B1AE40,actors +ovl_En_Torch,EB7540,EB7630,CA1670,CA1740,80B20880,actors +ovl_Demo_Ec,EB7630,EBAE90,CA1740,CA2A30,80B20970,actors +ovl_Shot_Sun,EBAE90,EBB550,CA2A30,CA2EF0,80B241D0,actors +ovl_En_Dy_Extra,EBB550,EBBAF0,CA2EF0,CA3300,80B24890,actors +ovl_En_Wonder_Talk2,EBBAF0,EBC190,CA3300,CA37A0,80B24E30,actors +ovl_En_Ge2,EBC190,EBDB30,CA37A0,CA4690,80B254D0,actors +ovl_Obj_Roomtimer,EBDB30,EBDD80,CA4690,CA4850,80B26E70,actors +ovl_En_Ssh,EBDD80,EC0370,CA4850,CA5EA0,80B270C0,actors +ovl_En_Sth,EC0370,EC4430,CA5EA0,CA8540,80B296B0,actors +ovl_Oceff_Wipe,EC4430,EC51B0,CA8540,CA8FA0,80B2D770,actors +ovl_Effect_Ss_Dust,EC51B0,EC59F0,CA8FA0,CA9530,80B2E4F0,effects +ovl_Effect_Ss_KiraKira,EC59F0,EC6060,CA9530,CA99D0,80B2ED30,effects +ovl_Effect_Ss_Bomb,EC6060,EC6490,CA99D0,CA9D00,80B2F3A0,effects +ovl_Effect_Ss_Bomb2,EC6490,EC6D90,CA9D00,CAA290,80B2F7D0,effects +ovl_Effect_Ss_Blast,EC6D90,EC7120,CAA290,CAA560,80B300D0,effects +ovl_Effect_Ss_G_Spk,EC7120,EC76D0,CAA560,CAA990,80B30460,effects +ovl_Effect_Ss_D_Fire,EC76D0,EC7BC0,CAA990,CAAD60,80B30A10,effects +ovl_Effect_Ss_Bubble,EC7BC0,EC8040,CAAD60,CAB0B0,80B30F00,effects +ovl_Effect_Ss_G_Ripple,EC8040,EC85A0,CAB0B0,CAB4B0,80B31380,effects +ovl_Effect_Ss_G_Splash,EC85A0,EC8A50,CAB4B0,CAB7C0,80B318E0,effects +ovl_Effect_Ss_G_Magma,EC8A50,EC8CB0,CAB7C0,CAB9A0,80B31D90,effects +ovl_Effect_Ss_G_Fire,EC8CB0,EC8F40,CAB9A0,CABB90,80B31FF0,effects +ovl_Effect_Ss_Lightning,EC8F40,EC9610,CABB90,CAC0C0,80B32280,effects +ovl_Effect_Ss_Dt_Bubble,EC9610,EC9BA0,CAC0C0,CAC4C0,80B32950,effects +ovl_Effect_Ss_Hahen,EC9BA0,ECA1E0,CAC4C0,CAC8E0,80B32EE0,effects +ovl_Effect_Ss_Stick,ECA1E0,ECA580,CAC8E0,CACB90,80B33520,effects +ovl_Effect_Ss_Sibuki,ECA580,ECAC50,CACB90,CAD080,80B338C0,effects +ovl_Effect_Ss_Sibuki2,ECAC50,ECAF80,CAD080,CAD300,80B33F90,effects +ovl_Effect_Ss_G_Magma2,ECAF80,ECB490,CAD300,CAD6E0,80B342C0,effects +ovl_Effect_Ss_Stone1,ECB490,ECB810,CAD6E0,CAD990,80B347D0,effects +ovl_Effect_Ss_HitMark,ECB810,ECBD60,CAD990,CADD60,80B34B50,effects +ovl_Effect_Ss_Fhg_Flash,ECBD60,ECCCE0,CADD60,CAE5E0,80B350A0,effects +ovl_Effect_Ss_K_Fire,ECCCE0,ECD120,CAE5E0,CAE930,80B36020,effects +ovl_Effect_Ss_Solder_Srch_Ball,ECD120,ECD2D0,CAE930,CAEA90,80B36460,effects +ovl_Effect_Ss_Kakera,ECD2D0,ECE360,CAEA90,CAF4C0,80B36610,effects +ovl_Effect_Ss_Ice_Piece,ECE360,ECE7A0,CAF4C0,CAF810,80B376A0,effects +ovl_Effect_Ss_En_Ice,ECE7A0,ECF060,CAF810,CAFE60,80B37AE0,effects +ovl_Effect_Ss_Fire_Tail,ECF060,ECF760,CAFE60,CB0390,80B383A0,effects +ovl_Effect_Ss_En_Fire,ECF760,ECFEB0,CB0390,CB08F0,80B38AA0,effects +ovl_Effect_Ss_Extra,ECFEB0,ED0270,CB08F0,CB0BE0,80B391F0,effects +ovl_Effect_Ss_Fcircle,ED0270,ED0720,CB0BE0,CB0F80,80B395B0,effects +ovl_Effect_Ss_Dead_Db,ED0720,ED0C00,CB0F80,CB1360,80B39A60,effects +ovl_Effect_Ss_Dead_Dd,ED0C00,ED1190,CB1360,CB1780,80B39F40,effects +ovl_Effect_Ss_Dead_Ds,ED1190,ED1610,CB1780,CB1AF0,80B3A4D0,effects +ovl_Effect_Ss_Dead_Sound,ED1610,ED1750,CB1AF0,CB1C00,80B3A950,effects +ovl_Oceff_Storm,ED1750,ED3300,CB1C00,CB33A0,80B3AA90,actors +ovl_En_Weiyer,ED3300,ED4D00,CB33A0,CB4250,80B3C640,actors +ovl_Bg_Spot05_Soko,ED4D00,ED5020,CB4250,CB4480,80B3E040,actors +ovl_Bg_Jya_1flift,ED5020,ED56B0,CB4480,CB48B0,80B3E360,actors +ovl_Bg_Jya_Haheniron,ED56B0,ED5EA0,CB48B0,CB4E10,80B3E9F0,actors +ovl_Bg_Spot12_Gate,ED5EA0,ED62B0,CB4E10,CB50C0,80B3F1E0,actors +ovl_Bg_Spot12_Saku,ED62B0,ED6770,CB50C0,CB53F0,80B3F5F0,actors +ovl_En_Hintnuts,ED6770,ED81A0,CB53F0,CB62E0,80B3FAB0,actors +ovl_En_Nutsball,ED81A0,ED87C0,CB62E0,CB6760,80B414E0,actors +ovl_Bg_Spot00_Break,ED87C0,ED8960,CB6760,CB68A0,80B41B00,actors +ovl_En_Shopnuts,ED8960,ED9870,CB68A0,CB7170,80B41CA0,actors +ovl_En_It,ED9870,ED9A00,CB7170,CB7280,80B42BB0,actors +ovl_En_GeldB,ED9A00,EDEDB0,CB7280,CB9DA0,80B42D40,actors +ovl_Oceff_Wipe2,EDEDB0,EE0520,CB9DA0,CBA9E0,80B480F0,actors +ovl_Oceff_Wipe3,EE0520,EE1C70,CBA9E0,CBBA20,80B49860,actors +ovl_En_Niw_Girl,EE1C70,EE2740,CBBA20,CBC1D0,80B4AFB0,actors +ovl_En_Dog,EE2740,EE38F0,CBC1D0,CBCC50,80B4BA80,actors +ovl_En_Si,EE38F0,EE3DF0,CBCC50,CBCFC0,80B4CC30,actors +ovl_Bg_Spot01_Objects2,EE3DF0,EE42B0,CBCFC0,CBD330,80B4D130,actors +ovl_Obj_Comb,EE42B0,EE4B10,CBD330,CBD940,80B4D5F0,actors +ovl_Bg_Spot11_Bakudankabe,EE4B10,EE5150,CBD940,CBDDB0,80B4DE50,actors +ovl_Obj_Kibako2,EE5150,EE5810,CBDDB0,CBE260,80B4E490,actors +ovl_En_Dnt_Demo,EE5810,EE6530,CBE260,CBEB10,80B4EB50,actors +ovl_En_Dnt_Jiji,EE6530,EE7A50,CBEB10,CBF5F0,80B4F870,actors +ovl_En_Dnt_Nomal,EE7A50,EEA850,CBF5F0,CC0D90,80B50D90,actors +ovl_En_Guest,EEA850,EEB1F0,CC0D90,CC1440,80B53B90,actors +ovl_Bg_Bom_Guard,EEB1F0,EEB410,CC1440,CC15F0,80B54530,actors +ovl_En_Hs2,EEB410,EEB9F0,CC15F0,CC19F0,80B54750,actors +ovl_Demo_Kekkai,EEB9F0,EECCE0,CC19F0,CC2630,80B54D30,actors +ovl_Bg_Spot08_Bakudankabe,EECCE0,EED380,CC2630,CC2AE0,80B56020,actors +ovl_Bg_Spot17_Bakudankabe,EED380,EEDA70,CC2AE0,CC2FC0,80B566C0,actors +ovl_Obj_Mure3,EEDA70,EEE240,CC2FC0,CC34F0,80B56DB0,actors +ovl_En_Tg,EEE240,EEE920,CC34F0,CC39A0,80B57580,actors +ovl_En_Mu,EEE920,EEF240,CC39A0,CC4000,80B57C60,actors +ovl_En_Go2,EEF240,EF5280,CC4000,CC7460,80B58580,actors +ovl_En_Wf,EF5280,EF9590,CC7460,CC97F0,80B5E5C0,actors +ovl_En_Skb,EF9590,EFAE80,CC97F0,CCA720,80B628D0,actors +ovl_Demo_Gj,EFAE80,EFEB30,CCA720,CCBEA0,80B641C0,actors +ovl_Demo_Geff,EFEB30,EFF350,CCBEA0,CCC380,80B67E70,actors +ovl_Bg_Gnd_Firemeiro,EFF350,EFF8A0,CCC380,CCC720,80B68690,actors +ovl_Bg_Gnd_Darkmeiro,EFF8A0,F00060,CCC720,CCCC00,80B68BE0,actors +ovl_Bg_Gnd_Soulmeiro,F00060,F008C0,CCCC00,CCD1D0,80B693A0,actors +ovl_Bg_Gnd_Nisekabe,F008C0,F00A30,CCD1D0,CCD2F0,80B69C00,actors +ovl_Bg_Gnd_Iceblock,F00A30,F01B20,CCD2F0,CCDC00,80B69D70,actors +ovl_Bg_Ydan_Sp,F01B20,F03240,CCDC00,CCEA50,80B6AE70,actors +ovl_En_Gb,F03240,F04970,CCEA50,CCF8E0,80B6C590,actors +ovl_En_Gs,F04970,F067E0,CCF8E0,CD0BD0,80B6DCC0,actors +ovl_Bg_Mizu_Bwall,F067E0,F07CB0,CD0BD0,CD1780,80B6FB30,actors +ovl_Bg_Mizu_Shutter,F07CB0,F084B0,CD1780,CD1CB0,80B71000,actors +ovl_En_Daiku_Kakariko,F084B0,F09870,CD1CB0,CD2940,80B71800,actors +ovl_Bg_Bowl_Wall,F09870,F0A1F0,CD2940,CD3000,80B72BC0,actors +ovl_En_Wall_Tubo,F0A1F0,F0A6E0,CD3000,CD3370,80B73540,actors +ovl_En_Po_Desert,F0A6E0,F0B4A0,CD3370,CD3CD0,80B73A30,actors +ovl_En_Crow,F0B4A0,F0CB40,CD3CD0,CD4B00,80B747F0,actors +ovl_Door_Killer,F0CB40,F0E0B0,CD4B00,CD58C0,80B75E90,actors +ovl_Bg_Spot11_Oasis,F0E0B0,F0E7E0,CD58C0,CD5DE0,80B77400,actors +ovl_Bg_Spot18_Futa,F0E7E0,F0E980,CD5DE0,CD5F20,80B77B30,actors +ovl_Bg_Spot18_Shutter,F0E980,F0EED0,CD5F20,CD62A0,80B77CD0,actors +ovl_En_Ma3,F0EED0,F0FE80,CD62A0,CD6CA0,80B78220,actors +ovl_En_Cow,F0FE80,F112E0,CD6CA0,CD77D0,80B791D0,actors +ovl_Bg_Ice_Turara,F112E0,F11B10,CD77D0,CD7D70,80B7A630,actors +ovl_Bg_Ice_Shutter,F11B10,F11F80,CD7D70,CD8040,80B7AE60,actors +ovl_En_Kakasi2,F11F80,F126A0,CD8040,CD84E0,80B7B2D0,actors +ovl_En_Kakasi3,F126A0,F13780,CD84E0,CD8F40,80B7B9F0,actors +ovl_Oceff_Wipe4,F13780,F14760,CD8F40,CD9970,80B7CAD0,actors +ovl_En_Eg,F14760,F14910,CD9970,CD9AB0,80B7DAB0,actors +ovl_Bg_Menkuri_Nisekabe,F14910,F14A60,CD9AB0,CD9BB0,80B7DC60,actors +ovl_En_Zo,F14A60,F17020,CD9BB0,CDB1A0,80B7DDB0,actors +ovl_Effect_Ss_Ice_Smoke,F17020,F17500,CDB1A0,CDB530,80B80370,effects +ovl_Obj_Makekinsuta,F17500,F17650,CDB530,CDB650,80B80850,actors +ovl_En_Ge3,F17650,F18290,CDB650,CDBDE0,80B809A0,actors +ovl_Obj_Timeblock,F18290,F18EE0,CDBDE0,CDC570,80B815E0,actors +ovl_Obj_Hamishi,F18EE0,F19730,CDC570,CDCB40,80B82230,actors +ovl_En_Zl4,F19730,F1E160,CDCB40,CDEB30,80B82A80,actors +ovl_En_Mm2,F1E160,F1EF20,CDEB30,CDF3F0,80B874B0,actors +ovl_Bg_Jya_Block,F1EF20,F1F190,CDF3F0,CDF5F0,80B88270,actors +ovl_Obj_Warp2block,F1F190,F1FCC0,CDF5F0,CDFD50,80B884E0,actors diff --git a/tools/disasm/ique-cn/files_boot.csv b/tools/disasm/ique-cn/files_boot.csv new file mode 100644 index 0000000000..0aae45345e --- /dev/null +++ b/tools/disasm/ique-cn/files_boot.csv @@ -0,0 +1,141 @@ +offset,vram,.text +0,80000450,src/boot/boot_main +140,80000590,src/boot/idle +390,800007E0,src/boot/viconfig +4D0,80000920,src/boot/z_std_dma +B50,80000FA0,src/boot/zlib +2830,80002C80,src/boot/z_locale +2870,80002CC0,src/boot/is_debug +2890,80002CE0,src/boot/driverominit +2A70,80002EC0,src/boot/mio0 +2B20,80002F70,src/libu64/stackcheck +2D70,800031C0,src/libultra/os/invaldcache +2E20,80003270,src/libultra/os/invalicache +2EA0,800032F0,src/libultra/libc/bcmp +2FB0,80003400,src/libultra/libc/bzero +3050,800034A0,src/libultra/os/createmesgqueue +30C0,80003510,src/libultra/os/recvmesg +3230,80003680,src/libultra/os/sendmesg +33A0,800037F0,src/libultra/os/getfpccsr +33B0,80003800,src/libultra/os/getsr +33C0,80003810,src/libultra/os/setfpccsr +33D0,80003820,src/libultra/os/setsr +33E0,80003830,src/libultra/os/createthread +3550,800039A0,src/libultra/os/setthreadpri +3660,80003AB0,src/libultra/os/startthread +37F0,80003C40,src/libultra/os/stopthread +38E0,80003D30,src/libultra/os/thread +3940,80003D90,src/libultra/os/gettime +39F0,80003E40,src/libultra/os/timerintr +3F10,80004360,src/libultra/io/vigetnextframebuf +3F50,800043A0,src/libultra/io/vimgr +4250,800046A0,src/libultra/io/visetmode +42D0,80004720,src/libultra/io/visetspecial +4450,800048A0,src/libultra/io/visetxscale +4510,80004960,src/libultra/io/visetyscale +4560,800049B0,src/libultra/io/viswapbuf +45B0,80004A00,src/libultra/io/viswapcontext +48C0,80004D10,src/libultra/io/viblack +4920,80004D70,src/libultra/io/viextendvstart +4930,80004D80,src/libultra/os/exceptasm +53B0,80005800,src/libultra/os/interrupt +5440,80005890,src/libultra/os/setintmask +54F0,80005940,src/libultra/os/sethwintrroutine +5580,800059D0,src/libultra/os/gethwintrroutine +55F0,80005A40,src/libultra/io/pimgr +5770,80005BC0,src/libultra/io/epirawdma +5B30,80005F80,src/libultra/io/epiread +5B90,80005FE0,src/libultra/io/epidma +5C30,80006080,src/libultra/io/cartrominit +5D90,800061E0,src/libultra/io/devmgr +6230,80006680,src/libultra/io/piacs +62F0,80006740,src/libultra/os/parameters +6360,800067B0,src/libultra/os/getmemsize +6390,800067E0,src/libultra/os/initialize +6920,80006D70,src/libultra/os/writebackdcache +69A0,80006DF0,src/libultra/os/virtualtophysical +6A70,80006EC0,src/libultra/libc/bcopy +6D90,800071E0,src/libultra/os/jammesg +6F10,80007360,src/libultra/os/seteventmesg +6FE0,80007430,src/libultra/os/getcause +6FF0,80007440,src/libultra/os/setwatchlo +7000,80007450,src/libultra/os/getcount +7100,80007550,src/libultra/os/setcompare +71B0,80007600,src/libultra/io/sirawread +7200,80007650,src/libultra/io/sirawwrite +7250,800076A0,src/libultra/os/destroythread +7380,800077D0,src/libultra/os/getthreadpri +73D0,80007820,src/libultra/os/yieldthread +7430,80007880,src/libultra/os/probetlb +74F0,80007940,src/libultra/os/maptlbrdb +7550,800079A0,src/libultra/os/unmaptlball +75A0,800079F0,src/libultra/io/vi +76A0,80007AF0,src/libultra/io/vigetcurrcontext +76B0,80007B00,src/libultra/os/setglobalintmask +7710,80007B60,src/libultra/os/resetglobalintmask +7780,80007BD0,src/libultra/io/pirawdma +7860,80007CB0,src/libultra/io/pigetcmdq +7890,80007CE0,src/libultra/io/epirawread +7A10,80007E60,src/libultra/io/epirawwrite +7B90,80007FE0,src/libultra/io/si +7BC0,80008010,src/libgcc/__divdi3 +81A0,800085F0,src/libgcc/__moddi3 +8730,80008B80,src/libgcc/__udivdi3 +8CA0,800090F0,src/libgcc/__umoddi3 +91B0,80009600,src/libgcc/__cmpdi2 +9200,80009650,src/libgcc/__floatdidf +9250,800096A0,src/libgcc/__floatdisf +9310,80009760,src/libgcc/__fixunsdfdi +9510,80009960,src/libgcc/__fixdfdi +9580,800099D0,src/libgcc/__fixunssfdi +9780,80009BD0,src/libgcc/__fixsfdi +97E0,80009C30,data/rsp_boot + +offset,vram,.data +98D0,80009D20,src/boot/idle +98F0,80009D40,src/boot/viconfig +9910,80009D60,src/boot/carthandle +9920,80009D70,src/boot/z_std_dma +9930,80009D80,src/boot/zlib +9AB0,80009F00,src/boot/z_locale +9AC0,80009F10,src/boot/driverominit +9AD0,80009F20,src/libu64/stackcheck +9AE0,80009F30,src/libultra/os/thread +9B00,80009F50,src/libultra/os/timerintr +9B10,80009F60,src/libultra/io/vimgr +9B30,80009F80,src/libultra/io/vimodentsclan1 +9B80,80009FD0,src/libultra/io/vimodepallan1 +9BD0,8000A020,src/libultra/io/vimodempallan1 +9C20,8000A070,src/libultra/os/exceptasm +9C50,8000A0A0,src/libultra/io/pimgr +9C80,8000A0D0,src/libultra/io/cartrominit +9C90,8000A0E0,src/libultra/io/piacs +9CA0,8000A0F0,src/libultra/os/initialize +9CC0,8000A110,src/libultra/os/seteventmesg +9CD0,8000A120,src/libultra/io/vi + +offset,vram,.rodata +9D40,8000A190,src/boot/boot_main +9D50,8000A1A0,src/boot/idle +9FA0,8000A3F0,src/boot/z_std_dma +A210,8000A660,src/libu64/stackcheck +A220,8000A670,src/libultra/os/exceptasm +A270,8000A6C0,src/libultra/os/setintmask +A2F0,8000A740,src/libultra/io/devmgr +A310,8000A760,src/libgcc/__divdi3 +A410,8000A860,src/libgcc/__moddi3 +A510,8000A960,src/libgcc/__udivdi3 +A610,8000AA60,src/libgcc/__umoddi3 +A710,8000AA70,src/boot/build + +offset,vram,.bss +A750,8000ABA0,data/boot_common_8000ABA0 +A7A0,8000ABF0,src/boot/boot_main +B190,8000B5E0,src/boot/idle +BD90,8000C1E0,src/boot/z_std_dma +C500,8000C950,src/boot/zlib +10310,80010760,src/boot/driverominit +10390,800107E0,src/libultra/io/vimgr +115B0,80011A00,src/libultra/io/pimgr +12940,80012D90,data/boot_common_80012D90 +12BF0,80013040,.end diff --git a/tools/disasm/ique-cn/files_code.csv b/tools/disasm/ique-cn/files_code.csv new file mode 100644 index 0000000000..031d059a0b --- /dev/null +++ b/tools/disasm/ique-cn/files_code.csv @@ -0,0 +1,528 @@ +offset,vram,.text +0,80018FA0,src/code/z_en_a_keep +AA0,80019A40,src/code/z_en_item00 +2EA0,8001BE40,src/code/z_eff_blure +62D0,8001F270,src/code/z_eff_shield_particle +7930,800208D0,src/code/z_eff_spark +8FE0,80021F80,src/code/z_eff_ss_dead +9790,80022730,src/code/z_effect +9F10,80022EB0,src/code/z_effect_soft_sprite +A9B0,80023950,src/code/z_effect_soft_sprite_old_init +D4D0,80026470,src/code/flg_set +D8F0,80026890,src/code/z_DLF +DB40,80026AE0,src/code/z_actor +18ED0,80031E70,src/code/z_actor_dlftbls +19020,80031FC0,src/code/z_bgcheck +22C00,8003BBA0,src/code/z_bg_collect +22F20,8003BEC0,src/code/z_bg_item +232B0,8003C250,src/code/z_camera +378E0,80050880,src/code/z_collision_btltbls +37940,800508E0,src/code/z_collision_check +3F5C0,80058560,src/code/z_common_data +3F670,80058610,src/code/z_debug +3F980,80058920,src/code/z_debug_display +3FE40,80058DE0,src/code/z_demo +44B20,8005DAC0,src/code/z_memory_utils +44BB0,8005DB50,src/code/z_draw +46AB0,8005FA50,src/code/z_sfx_source +46C70,8005FC10,src/code/z_elf_message +47350,800602F0,src/code/z_face_reaction +473A0,80060340,src/code/z_env_flags +47520,800604C0,src/code/z_fcurve_data +47760,80060700,src/code/z_fcurve_data_skelanime +47F70,80060F10,src/code/z_horse +48C50,80061BF0,src/code/z_jpeg +49410,800623B0,src/code/z_kaleido_setup +497E0,80062780,src/code/z_kanfont +499E0,80062980,src/code/z_kankyo +511F0,8006A190,src/code/z_lib +52390,8006B330,src/code/z_lifemeter +53730,8006C6D0,src/code/z_lights +547D0,8006D770,src/code/z_malloc +549B0,8006D950,src/code/z_map_mark +54FB0,8006DF50,src/code/z_prenmi_buff +55070,8006E010,src/code/z_nulltask +550F0,8006E090,src/code/z_olib +557E0,8006E780,src/code/z_onepointdemo +59780,80072720,src/code/z_map_exp +5B320,800742C0,src/code/z_parameter +66080,8007F020,src/code/z_path +66250,8007F1F0,src/code/z_frame_advance +66300,8007F2A0,src/code/z_player_lib +69D70,80082D10,src/code/z_prenmi +69F10,80082EB0,src/code/z_quake +6AD80,80083D20,src/code/z_rcp +6C640,800855E0,src/code/z_room +6DE30,80086DD0,src/code/z_sample +6E230,800871D0,src/code/z_inventory +6E3F0,80087390,src/code/z_scene +6F8A0,80088840,src/code/z_scene_table +760A0,8008F040,src/code/z_skelanime +7AA90,80093A30,src/code/z_skin +7B630,800945D0,src/code/z_skin_awb +7BF40,80094EE0,src/code/z_skin_matrix +7D2E0,80096280,src/code/z_sram +7E690,80097630,src/code/z_ss_sram +7E860,80097800,src/code/z_rumble +7EAE0,80097A80,src/code/z_view +801E0,80099180,src/code/z_vimode +80D50,80099CF0,src/code/z_viscvg +80EF0,80099E90,src/code/z_vismono +81710,8009A6B0,src/code/z_viszbuf +819A0,8009A940,src/code/z_vr_box +84270,8009D210,src/code/z_vr_box_draw +84950,8009D8F0,src/code/z_player_call +84AC0,8009DA60,src/code/z_fbdemo +854E0,8009E480,src/code/z_fbdemo_triforce +85AA0,8009EA40,src/code/z_fbdemo_wipe1 +85F10,8009EEB0,src/code/z_fbdemo_circle +865D0,8009F570,src/code/z_fbdemo_fade +86930,8009F8D0,src/code/shrink_window +86AA0,8009FA40,src/code/z_cutscene_spline +86F70,8009FF10,src/code/z_kaleido_manager +871A0,800A0140,src/code/z_kaleido_scope_call +87480,800A0420,src/code/z_play +8AEA0,800A3E40,src/code/PreRender +8CF90,800A5F30,src/code/TwoHeadGfxArena +8D1A0,800A6140,src/code/TwoHeadArena +8D360,800A6300,src/code/audio_stop_all_sfx +8D3B0,800A6350,src/code/audio_thread_manager +8D7C0,800A6760,src/code/title_setup +8D830,800A67D0,src/code/game +8DFB0,800A6F50,src/code/gamealloc +8E0F0,800A7090,src/code/graph +8EA90,800A7A30,src/code/gfxalloc +8EAF0,800A7A90,src/code/listalloc +8EC40,800A7BE0,src/code/main +8EFA0,800A7F40,src/code/padmgr +8FAA0,800A8A40,src/code/sched +90720,800A96C0,src/code/speed_meter +91160,800AA100,src/code/sys_cfb +91280,800AA220,src/code/sys_math +91520,800AA4C0,src/code/sys_math3d +972F0,800B0290,src/code/sys_math_atan +97520,800B04C0,src/code/sys_matrix +99920,800B28C0,src/code/sys_ucode +99970,800B2910,src/code/sys_rumble +99CD0,800B2C70,src/code/sys_freeze +99D00,800B2CA0,src/code/irqmgr +9A320,800B32C0,src/code/fault_gc +9CB70,800B5B10,src/code/fault_gc_drawer +9D5F0,800B6590,src/code/kanread +9E0E0,800B7080,src/audio/lib/synthesis +A1240,800BA1E0,src/audio/lib/heap +A4610,800BD5B0,src/audio/lib/load +A8400,800C13A0,src/audio/lib/thread +A9C60,800C2C00,src/audio/lib/dcache +A9CE0,800C2C80,src/audio/lib/aisetnextbuf +A9D60,800C2D00,src/audio/lib/playback +ABCE0,800C4C80,src/audio/lib/effects +AC760,800C5700,src/audio/lib/seqplayer +AFD80,800C8D20,src/audio/general +B5F10,800CEEB0,src/audio/sfx +B7D70,800D0D10,src/audio/sequence +B9990,800D2930,src/libu64/system_heap +B9CD0,800D2C70,src/libu64/debug +B9D30,800D2CD0,src/libu64/gfxprint +BAAA0,800D3A40,src/libu64/relocation_gc +BACE0,800D3C80,src/libu64/loadfragment2_gc +BAD40,800D3CE0,src/libu64/load_gc +BAE10,800D3DB0,src/libu64/padsetup +BAF50,800D3EF0,src/libu64/pad +BB140,800D40E0,src/libu64/rcp_utils +BB1A0,800D4140,src/libc64/__osMalloc_gc +BBF50,800D4EF0,src/libc64/aprintf +BBFB0,800D4F50,src/libc64/malloc +BC180,800D5120,src/libc64/math64 +BC690,800D5630,src/libc64/fp +BC7F0,800D5790,src/libc64/qrand +BC9B0,800D5950,src/libc64/sleep +BCB50,800D5AF0,src/libc64/sprintf +BCC20,800D5BC0,src/code/jpegutils +BD130,800D60D0,src/code/jpegdecoder +BD720,800D66C0,src/libultra/io/aigetlen +BD730,800D66D0,src/libultra/io/aisetfreq +BD830,800D67D0,src/libultra/audio/sl +BD8E0,800D6880,src/libultra/audio/synthesizer +BDF50,800D6EF0,src/libultra/audio/syndelete +BDF60,800D6F00,src/libultra/audio/synallocfx +BE000,800D6FA0,src/libultra/os/writebackdcacheall +BE030,800D6FD0,src/libultra/io/contquery +BE0E0,800D7080,src/libultra/io/contreaddata +BE360,800D7300,src/libultra/io/controller +BE730,800D76D0,src/libultra/io/contsetch +BE790,800D7730,src/libultra/gu/sqrtf +BE7A0,800D7740,src/libultra/gu/cosf +BE8D0,800D7870,src/libultra/gu/coss +BE8F0,800D7890,src/libultra/gu/lookat +BEC20,800D7BC0,src/libultra/gu/lookathil +BF4F0,800D8490,src/libultra/gu/ortho +BF660,800D8600,src/libultra/gu/perspective +BF860,800D8800,src/libultra/gu/position +BFA40,800D89E0,src/libultra/gu/sinf +BFBC0,800D8B60,src/libultra/gu/sins +BFC10,800D8BB0,src/libultra/gu/us2dex +BFD30,800D8CD0,src/libultra/libc/ll +C02B0,800D9250,src/libultra/libc/llcvt +C05C0,800D9560,src/libultra/libc/string +C0640,800D95E0,src/libultra/libc/xprintf +C1020,800D9FC0,src/libultra/io/dpgetstat +C1030,800D9FD0,src/libultra/io/dpsetstat +C1040,800D9FE0,src/libultra/io/spgetstat +C1050,800D9FF0,src/libultra/io/spsetstat +C1060,800DA000,src/libultra/io/sptask +C1270,800DA210,src/libultra/io/sptaskyield +C1290,800DA230,src/libultra/io/sptaskyielded +C12E0,800DA280,src/libultra/io/sirawdma +C13C0,800DA360,src/libultra/io/siacs +C1480,800DA420,src/libultra/os/getthreadid +C14D0,800DA470,src/libultra/os/getactivequeue +C1500,800DA4A0,src/libultra/os/settimer +C16C0,800DA660,src/libultra/os/stoptimer +C17E0,800DA780,src/libultra/io/vigetcurrframebuf +C1820,800DA7C0,src/libultra/io/visetevent +C1880,800DA820,src/libultra/mgu/mtxident +C18E0,800DA880,src/libultra/mgu/mtxidentf +C1940,800DA8E0,src/libultra/mgu/mtxf2l +C19C0,800DA960,src/libultra/mgu/scale +C1A60,800DAA00,src/libultra/mgu/translate +C1B30,800DAAD0,src/libultra/gu/rotate +C1CC0,800DAC60,src/libultra/os/getcurrfaultedthread +C1CF0,800DAC90,src/libultra/bb/sk/skapi +C1F40,800DAEE0,src/libultra/bb/sa/common +C2030,800DAFD0,src/libultra/io/motor +C2040,800DAFE0,src/libultra/os/afterprenmi +C2080,800DB020,src/libultra/audio/drvrnew +C2830,800DB7D0,src/libultra/audio/load +C32C0,800DC260,src/libultra/audio/auxbus +C33D0,800DC370,src/libultra/audio/env +C3F40,800DCEE0,src/libultra/audio/filter +C3F60,800DCF00,src/libultra/audio/mainbus +C40D0,800DD070,src/libultra/audio/resample +C4370,800DD310,src/libultra/audio/reverb +C4EE0,800DDE80,src/libultra/audio/save +C4FC0,800DDF60,src/libultra/audio/heapalloc +C5010,800DDFB0,src/libultra/audio/copy +C5040,800DDFE0,src/libultra/libc/xlitob +C5270,800DE210,src/libultra/libc/xldtob +C5C70,800DEC10,src/libultra/io/sp +C5CA0,800DEC40,src/libultra/io/spsetpc +C5CD0,800DEC70,src/libultra/io/sprawdma +C5D60,800DED00,src/libultra/mgu/normalize +C5DC0,800DED60,src/libultra/libc/ldiv +C5F80,800DEF20,src/libc/fmodf +C5FC0,800DEF60,src/libc/memmove +C6050,800DEFF0,src/libc/absf +C6060,800DF000,src/libc/sqrt +C6070,800DF010,src/code/z_message_z_game_over +D20D0,800EB070,src/code/z_construct +D2FD0,800EBF70,data/rsp.text + +offset,vram,.data +D6330,800EF2D0,src/code/z_en_a_keep +D63D0,800EF370,src/code/z_en_item00 +D6670,800EF610,src/code/z_eff_blure +D6720,800EF6C0,src/code/z_eff_shield_particle +D6770,800EF710,src/code/z_effect +D67C0,800EF760,src/code/z_effect_soft_sprite +D67D0,800EF770,src/code/z_effect_soft_sprite_old_init +D68C0,800EF860,src/code/z_effect_soft_sprite_dlftbls +D6CD0,800EFC70,src/code/flg_set +D6E90,800EFE30,src/code/z_actor +D7180,800F0120,src/code/z_actor_dlftbls +DAC70,800F3C10,src/code/z_bgcheck +DADC0,800F3D60,src/code/z_camera +DE310,800F72B0,src/code/z_collision_btltbls +DE5F0,800F7590,src/code/z_collision_check +DE8A0,800F7840,src/code/z_debug +DE8D0,800F7870,src/code/z_debug_display +DE920,800F78C0,src/code/z_demo +DEA80,800F7A20,src/code/z_draw +DFB00,800F8AA0,src/code/z_elf_message +DFB50,800F8AF0,src/code/z_face_reaction +DFF90,800F8F30,src/code/z_game_dlftbls +E00B0,800F9050,src/code/z_horse +E01C0,800F9160,src/code/z_jpeg +E0200,800F91A0,src/code/z_kaleido_setup +E0250,800F91F0,src/code/z_kankyo +E0640,800F95E0,src/code/z_lib +E0670,800F9610,src/code/z_lifemeter +E0790,800F9730,src/code/z_lights +E07A0,800F9740,src/code/z_map_mark +E0860,800F9800,src/code/z_onepointdemo +E4180,800FD120,src/code/z_map_exp +E41A0,800FD140,src/code/z_map_data +E5FA0,800FEF40,src/code/z_parameter +E6280,800FF220,src/code/z_player_lib +E6960,800FF900,src/code/z_quake +E6990,800FF930,src/code/z_rcp +E77B0,80100750,src/code/z_room +E7830,801007D0,src/code/z_inventory +E7BB0,80100B50,src/code/z_scene +E7C30,80100BD0,src/code/object_table +E88D0,80101870,src/code/z_scene_table +EAAE0,80103A80,src/code/z_skelanime +EAB00,80103AA0,src/code/z_skin_matrix +EAB40,80103AE0,src/code/z_sram +EACF0,80103C90,src/code/z_ss_sram +EADA0,80103D40,data/unk_8012ABC0.data +EADD0,80103D70,src/code/z_view +EADE0,80103D80,src/code/z_viscvg +EAE70,80103E10,src/code/z_vr_box +EB170,80104110,src/code/z_player_call +EB190,80104130,src/code/z_fbdemo +EB210,801041B0,src/code/z_fbdemo_triforce +EB2E0,80104280,src/code/z_fbdemo_wipe1 +EBD80,80104D20,src/code/z_fbdemo_circle +ED080,80106020,src/code/z_fbdemo_fade +ED0B0,80106050,src/code/shrink_window +ED0C0,80106060,src/code/z_kaleido_manager +ED110,801060B0,src/code/z_play +ED120,801060C0,src/code/audio_stop_all_sfx +ED130,801060D0,src/code/graph +ED140,801060E0,src/code/main +ED150,801060F0,src/code/padmgr +ED160,80106100,src/code/speed_meter +ED190,80106130,src/code/sys_math +ED1D0,80106170,src/code/sys_math_atan +ED9E0,80106980,src/code/sys_matrix +EDA60,80106A00,src/code/sys_ucode +EDA70,80106A10,src/code/sys_rumble +EDA80,80106A20,src/code/irqmgr +EDAA0,80106A40,src/code/fault_gc +EDB00,80106AA0,src/code/fault_gc_drawer +EDB40,80106AE0,src/audio/lib/data +EFF50,80108EF0,src/audio/lib/synthesis +EFF80,80108F20,src/audio/lib/load +EFF90,80108F30,src/audio/lib/thread +EFFB0,80108F50,src/audio/lib/aisetnextbuf +EFFC0,80108F60,src/audio/lib/effects +EFFD0,80108F70,src/audio/lib/seqplayer +F0020,80108FC0,src/audio/general +F1740,8010A6E0,src/audio/sfx_params +F2B10,8010BAB0,src/audio/data +F2B80,8010BB20,src/audio/session_config +F3320,8010C2C0,src/libu64/system_heap +F3330,8010C2D0,src/libu64/gfxprint +F3BE0,8010CB80,src/libu64/logseverity_gc +F3BF0,8010CB90,src/libc64/__osMalloc_gc +F3C00,8010CBA0,src/libc64/fp +F3C20,8010CBC0,src/libc64/qrand +F3C30,8010CBD0,src/libultra/audio/sl +F3C40,8010CBE0,src/libultra/io/controller +F3C50,8010CBF0,src/libultra/gu/position +F3C60,8010CC00,src/libultra/gu/sins +F4460,8010D400,src/libultra/libc/xprintf +F44B0,8010D450,src/libultra/io/siacs +F44C0,8010D460,src/libultra/io/vitbl +F5640,8010E5E0,src/libultra/io/vimodentsclpn1 +F5690,8010E630,src/libultra/io/vimodentsclpf1 +F56E0,8010E680,src/libultra/io/vimodentsclaf1 +F5730,8010E6D0,src/libultra/io/vimodentsclpn2 +F5780,8010E720,src/libultra/io/vimodentsclpf2 +F57D0,8010E770,src/libultra/io/vimodentsclan2 +F5820,8010E7C0,src/libultra/io/vimodentsclaf2 +F5870,8010E810,src/libultra/io/vimodentschpn1 +F58C0,8010E860,src/libultra/io/vimodentschpf1 +F5910,8010E8B0,src/libultra/io/vimodentschan1 +F5960,8010E900,src/libultra/io/vimodentschaf1 +F59B0,8010E950,src/libultra/io/vimodentschpn2 +F5A00,8010E9A0,src/libultra/io/vimodentschpf2 +F5A50,8010E9F0,src/libultra/io/vimodepallpn1 +F5AA0,8010EA40,src/libultra/io/vimodepallpf1 +F5AF0,8010EA90,src/libultra/io/vimodepallaf1 +F5B40,8010EAE0,src/libultra/io/vimodepallpn2 +F5B90,8010EB30,src/libultra/io/vimodepallpf2 +F5BE0,8010EB80,src/libultra/io/vimodepallan2 +F5C30,8010EBD0,src/libultra/io/vimodepallaf2 +F5C80,8010EC20,src/libultra/io/vimodepalhpn1 +F5CD0,8010EC70,src/libultra/io/vimodepalhpf1 +F5D20,8010ECC0,src/libultra/io/vimodepalhan1 +F5D70,8010ED10,src/libultra/io/vimodepalhaf1 +F5DC0,8010ED60,src/libultra/io/vimodepalhpn2 +F5E10,8010EDB0,src/libultra/io/vimodepalhpf2 +F5E60,8010EE00,src/libultra/io/vimodempallpn1 +F5EB0,8010EE50,src/libultra/io/vimodempallpf1 +F5F00,8010EEA0,src/libultra/io/vimodempallaf1 +F5F50,8010EEF0,src/libultra/io/vimodempallpn2 +F5FA0,8010EF40,src/libultra/io/vimodempallpf2 +F5FF0,8010EF90,src/libultra/io/vimodempallan2 +F6040,8010EFE0,src/libultra/io/vimodempallaf2 +F6090,8010F030,src/libultra/io/vimodempalhpn1 +F60E0,8010F080,src/libultra/io/vimodempalhpf1 +F6130,8010F0D0,src/libultra/io/vimodempalhan1 +F6180,8010F120,src/libultra/io/vimodempalhaf1 +F61D0,8010F170,src/libultra/io/vimodempalhpn2 +F6220,8010F1C0,src/libultra/io/vimodempalhpf2 +F6270,8010F210,src/libultra/io/vimodefpallpn1 +F62C0,8010F260,src/libultra/io/vimodefpallpf1 +F6310,8010F2B0,src/libultra/io/vimodefpallan1 +F6360,8010F300,src/libultra/io/vimodefpallaf1 +F63B0,8010F350,src/libultra/io/vimodefpallpn2 +F6400,8010F3A0,src/libultra/io/vimodefpallpf2 +F6450,8010F3F0,src/libultra/io/vimodefpallan2 +F64A0,8010F440,src/libultra/io/vimodefpallaf2 +F64F0,8010F490,src/libultra/io/vimodefpalhpn1 +F6540,8010F4E0,src/libultra/io/vimodefpalhpf1 +F6590,8010F530,src/libultra/io/vimodefpalhan1 +F65E0,8010F580,src/libultra/io/vimodefpalhaf1 +F6630,8010F5D0,src/libultra/io/vimodefpalhpn2 +F6680,8010F620,src/libultra/io/vimodefpalhpf2 +F66D0,8010F670,src/libultra/gu/rotate +F66E0,8010F680,src/libultra/audio/drvrnew +F6870,8010F810,src/libultra/audio/env +F6970,8010F910,src/libultra/libc/xlitob + +offset,vram,.rodata +F69A0,8010F940,src/code/z_en_a_keep +F69F0,8010F990,src/code/z_en_item00 +F6C60,8010FC00,src/code/z_eff_blure +F6C90,8010FC30,src/code/z_eff_shield_particle +F6CA0,8010FC40,src/code/z_eff_spark +F6CB0,8010FC50,src/code/z_eff_ss_dead +F6CC0,8010FC60,src/code/z_effect_soft_sprite_old_init +F6CE0,8010FC80,src/code/flg_set +F7070,80110010,src/code/z_actor +F7790,80110730,src/code/z_actor_dlftbls +F77E0,80110780,src/code/z_bgcheck +F7880,80110820,src/code/z_bg_item +F7890,80110830,src/code/z_camera +F8010,80110FB0,src/code/z_collision_check +F8060,80111000,src/code/z_debug +F8070,80111010,src/code/z_demo +F8550,801114F0,src/code/z_draw +F8560,80111500,src/code/z_elf_message +F8680,80111620,src/code/z_fcurve_data +F8690,80111630,src/code/z_fcurve_data_skelanime +F86A0,80111640,src/code/z_horse +F86B0,80111650,src/code/z_jpeg +F8740,801116E0,src/code/z_kanfont +F87A0,80111740,src/code/z_kankyo +F8850,801117F0,src/code/z_lib +F8860,80111800,src/code/z_lifemeter +F8880,80111820,src/code/z_lights +F8890,80111830,src/code/z_map_mark +F88F0,80111890,src/code/z_olib +F8910,801118B0,src/code/z_onepointdemo +F91D0,80112170,src/code/z_map_exp +F94F0,80112490,src/code/z_parameter +F9BF0,80112B90,src/code/z_path +F9C00,80112BA0,src/code/z_player_lib +F9C60,80112C00,src/code/z_quake +F9CF0,80112C90,src/code/z_room +F9D30,80112CD0,src/code/z_sample +F9D40,80112CE0,src/code/z_scene_table +F9D80,80112D20,src/code/z_skelanime +F9DA0,80112D40,src/code/z_skin +F9DB0,80112D50,src/code/z_skin_matrix +F9DC0,80112D60,src/code/z_sram +FA460,80113400,src/code/z_rumble +FA470,80113410,src/code/z_view +FA480,80113420,src/code/z_vr_box +FA570,80113510,src/code/z_fbdemo_triforce +FA580,80113520,src/code/z_fbdemo_wipe1 +FA590,80113530,src/code/z_fbdemo_circle +FA5A0,80113540,src/code/z_cutscene_spline +FA5B0,80113550,src/code/z_kaleido_manager +FA5D0,80113570,src/code/z_play +FA690,80113630,src/code/game +FA6B0,80113650,src/code/graph +FA700,801136A0,src/code/main +FA730,801136D0,src/code/padmgr +FA740,801136E0,src/code/sys_cfb +FA750,801136F0,src/code/sys_math +FA760,80113700,src/code/sys_math3d +FA7F0,80113790,src/code/sys_math_atan +FA800,801137A0,src/code/sys_matrix +FA830,801137D0,src/code/irqmgr +FA850,801137F0,src/code/fault_gc +FB260,80114200,src/code/fault_gc_drawer +FB690,80114630,src/audio/lib/synthesis +FB6B0,80114650,src/audio/lib/heap +FB6E0,80114680,src/audio/lib/load +FB750,801146F0,src/audio/lib/thread +FB880,80114820,src/audio/lib/playback +FB8B0,80114850,src/audio/lib/effects +FB8E0,80114880,src/audio/lib/seqplayer +FBF20,80114EC0,src/audio/general +FC0B0,80115050,src/audio/sfx +FC0D0,80115070,src/audio/sequence +FC150,801150F0,src/audio/session_init +FC160,80115100,src/libu64/debug +FC170,80115110,src/libu64/gfxprint +FC190,80115130,src/libc64/__osMalloc_gc +FC450,801153F0,src/libc64/math64 +FC4A0,80115440,src/libultra/audio/synthesizer +FC4B0,80115450,src/libultra/gu/cosf +FC500,801154A0,src/libultra/gu/lookathil +FC510,801154B0,src/libultra/gu/perspective +FC520,801154C0,src/libultra/gu/sinf +FC570,80115510,src/libultra/libc/xprintf +FC6F0,80115690,src/libultra/audio/drvrnew +FC710,801156B0,src/libultra/audio/env +FC7B0,80115750,src/libultra/audio/resample +FC7E0,80115780,src/libultra/audio/reverb +FC810,801157B0,src/libultra/gu/libm_vals +FC820,801157C0,src/libultra/libc/xldtob +FC880,80115820,src/code/z_message_z_game_over +106130,8011F0D0,src/code/z_construct +1062E0,8011F280,data/audio_tables.rodata +106E80,8011FE20,data/rsp.rodata + +offset,vram,.bss +108FA0,80121F40,data/code_common_80121F40 +108FC0,80121F60,src/code/z_en_item00 +108FD0,80121F70,src/code/z_effect +10CDC0,80125D60,src/code/flg_set +10CDD0,80125D70,src/code/z_actor +10CE50,80125DF0,src/code/z_actor_dlftbls +10CE60,80125E00,src/code/z_bgcheck +10CF80,80125F20,src/code/z_camera +10D060,80126000,src/code/z_collision_check +10E7C0,80127760,src/code/z_debug +10E9E0,80127980,src/code/z_debug_display +10E9F0,80127990,src/code/z_demo +10EA20,801279C0,src/code/z_kankyo +10EAF0,80127A90,src/code/z_lifemeter +10EB20,80127AC0,src/code/z_lights +10ECB0,80127C50,src/code/z_malloc +10ECE0,80127C80,src/code/z_map_mark +10ECF0,80127C90,src/code/z_map_exp +10ED00,80127CA0,src/code/z_parameter +10ED20,80127CC0,src/code/z_player_lib +10ED40,80127CE0,src/code/z_quake +10EDD0,80127D70,src/code/z_skelanime +10EDE0,80127D80,src/code/z_skin +10FCF0,80128C90,src/code/z_rumble +10FE00,80128DA0,src/code/z_vr_box_draw +10FE10,80128DB0,src/code/z_player_call +10FE20,80128DC0,src/code/z_kaleido_scope_call +10FE40,80128DE0,src/code/z_play +10FF50,80128EF0,src/code/game +110030,80128FD0,src/code/graph +1100A0,80129040,src/code/main +113F30,8012CED0,src/code/padmgr +113F40,8012CEE0,src/code/sched +113F60,8012CF00,src/code/speed_meter +113FD0,8012CF70,src/code/sys_cfb +113FE0,8012CF80,src/code/sys_math3d +114200,8012D1A0,src/code/sys_matrix +114210,8012D1B0,src/code/fault_gc +115090,8012E030,src/code/fault_gc_drawer +1150F0,8012E090,src/audio/lib/load +1151B0,8012E150,src/audio/general +1153B0,8012E350,src/audio/sfx +117BC0,80130B60,src/audio/sequence +118980,80131920,src/audio/data +118A20,801319C0,src/audio/session_config +11EE90,80137E30,src/libu64/gfxprint +11EEA0,80137E40,src/libc64/__osMalloc_gc +11EEB0,80137E50,src/libc64/malloc +11EEE0,80137E80,src/libc64/math64 +11EEF0,80137E90,src/libc64/qrand +11EF00,80137EA0,src/code/jpegdecoder +11EF10,80137EB0,src/libultra/io/sptask +11EF50,80137EF0,src/libultra/io/siacs +11EF60,80137F00,data/code_common_80137F00 +120420,801393C0,src/code/z_message_z_game_over +120440,801393E0,.end diff --git a/tools/disasm/ique-cn/files_ovl_file_choose.csv b/tools/disasm/ique-cn/files_ovl_file_choose.csv new file mode 100644 index 0000000000..d1c024e666 --- /dev/null +++ b/tools/disasm/ique-cn/files_ovl_file_choose.csv @@ -0,0 +1,23 @@ +offset,vram,.text +0,80803700,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase +3AE0,808071E0,src/overlays/gamestates/ovl_file_choose/z_file_nameset +8F30,8080C630,src/overlays/gamestates/ovl_file_choose/z_file_choose + +offset,vram,.data +F6E0,80812DE0,src/overlays/gamestates/ovl_file_choose/z_file_nameset_data +FDC0,808134C0,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase +FE00,80813500,src/overlays/gamestates/ovl_file_choose/z_file_nameset +FFA0,808136A0,src/overlays/gamestates/ovl_file_choose/z_file_choose + +offset,vram,.rodata +10280,80813980,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase +102B0,808139B0,src/overlays/gamestates/ovl_file_choose/z_file_nameset +102C0,808139C0,src/overlays/gamestates/ovl_file_choose/z_file_choose + +offset,vram,.ovl +102E0,808139E0,src/overlays/gamestates/ovl_file_choose/ovl_file_choose_reloc + +offset,vram,.bss +10AD0,808141D0,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase +10AE0,808141E0,src/overlays/gamestates/ovl_file_choose/z_file_nameset +10AF0,808141F0,.end diff --git a/tools/disasm/ique-cn/files_ovl_kaleido_scope.csv b/tools/disasm/ique-cn/files_ovl_kaleido_scope.csv new file mode 100644 index 0000000000..4f63c0b0e9 --- /dev/null +++ b/tools/disasm/ique-cn/files_ovl_kaleido_scope.csv @@ -0,0 +1,35 @@ +offset,vram,.text +0,808141F0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect +2400,808165F0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug +43B0,808185A0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment +5E30,8081A020,src/overlays/misc/ovl_kaleido_scope/z_kaleido_item +7E20,8081C010,src/overlays/misc/ovl_kaleido_scope/z_kaleido_map +B3F0,8081F5E0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt +B5F0,8081F7E0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope +149E0,80828BD0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark + +offset,vram,.data +150A0,80829290,src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect +15250,80829440,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug +15420,80829610,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment +15450,80829640,src/overlays/misc/ovl_kaleido_scope/z_kaleido_item +154C0,808296B0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_map +15700,808298F0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt +15710,80829900,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope +160A0,8082A290,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark +160F0,8082A2E0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data + +offset,vram,.rodata +1A250,8082E440,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug +1A330,8082E520,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment +1A340,8082E530,src/overlays/misc/ovl_kaleido_scope/z_kaleido_map +1A380,8082E570,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope +1A5F0,8082E7E0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark +1A6A0,8082E890,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data + +offset,vram,.ovl +1A720,8082E910,src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc + +offset,vram,.bss +1C030,80830220,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope +1C040,80830230,.end diff --git a/tools/disasm/ique-cn/functions.txt b/tools/disasm/ique-cn/functions.txt new file mode 100644 index 0000000000..b10ad38737 --- /dev/null +++ b/tools/disasm/ique-cn/functions.txt @@ -0,0 +1,13214 @@ +entrypoint = 0x80000400; // type:func +bootclear = 0x80000450; // type:func +bootproc = 0x80000484; // type:func +Main_ThreadEntry = 0x80000590; // type:func +Idle_ThreadEntry = 0x80000604; // type:func +ViConfig_UpdateVi = 0x800007E0; // type:func +ViConfig_UpdateBlack = 0x800008D8; // type:func +DmaMgr_StrCmp = 0x80000920; // type:func +DmaMgr_DmaRomToRam = 0x80000980; // type:func +DmaMgr_AudioDmaHandler = 0x80000AD0; // type:func +DmaMgr_DmaFromDriveRom = 0x80000AEC; // type:func +DmaMgr_GetFileName = 0x80000BA4; // type:func +DmaMgr_ProcessRequest = 0x80000BB0; // type:func +DmaMgr_ThreadEntry = 0x80000D60; // type:func +DmaMgr_RequestAsync = 0x80000DC4; // type:func +DmaMgr_RequestSync = 0x80000E14; // type:func +DmaMgr_Init = 0x80000EAC; // type:func +Locale_Init = 0x80002C80; // type:func +Locale_ResetRegion = 0x80002CB4; // type:func +osSyncPrintfUnused = 0x80002CC0; // type:func +osSyncPrintf = 0x80002CC8; // type:func +rmonPrintf = 0x80002CD0; // type:func +osDriveRomInit = 0x80002CE0; // type:func +Mio0_Decompress = 0x80002EC0; // type:func +StackCheck_Init = 0x80002F70; // type:func +StackCheck_Cleanup = 0x80003048; // type:func +StackCheck_GetState = 0x800030B8; // type:func +StackCheck_CheckAll = 0x80003130; // type:func +StackCheck_Check = 0x80003188; // type:func +osInvalDCache = 0x800031C0; // type:func +osInvalICache = 0x80003270; // type:func +bcmp = 0x800032F0; // type:func +bzero = 0x80003400; // type:func +osCreateMesgQueue = 0x800034A0; // type:func +osRecvMesg = 0x80003510; // type:func +osSendMesg = 0x80003680; // type:func +__osGetFpcCsr = 0x800037F0; // type:func +__osGetSR = 0x80003800; // type:func +__osSetFpcCsr = 0x80003810; // type:func +__osSetSR = 0x80003820; // type:func +osCreateThread = 0x80003830; // type:func +osSetThreadPri = 0x800039A0; // type:func +osStartThread = 0x80003AB0; // type:func +osStopThread = 0x80003C40; // type:func +__osDequeueThread = 0x80003D30; // type:func +osGetTime = 0x80003D90; // type:func +__osTimerServicesInit = 0x80003E40; // type:func +__osTimerInterrupt = 0x80003EEC; // type:func +__osSetTimerIntr = 0x800040D4; // type:func +__osInsertTimer = 0x800041A8; // type:func +osViGetNextFramebuffer = 0x80004360; // type:func +osCreateViManager = 0x800043A0; // type:func +viMgrMain = 0x80004518; // type:func +osViSetMode = 0x800046A0; // type:func +osViSetSpecialFeatures = 0x80004720; // type:func +osViSetXScale = 0x800048A0; // type:func +osViSetYScale = 0x80004960; // type:func +osViSwapBuffer = 0x800049B0; // type:func +__osViSwapContext = 0x80004A00; // type:func +osViBlack = 0x80004D10; // type:func +osViExtendVStart = 0x80004D70; // type:func +__osExceptionPreamble = 0x80004D80; // type:func +__osException = 0x80004D90; // type:func +__osEnqueueAndYield = 0x80005504; // type:func +__osEnqueueThread = 0x80005610; // type:func +__osPopThread = 0x80005658; // type:func +__osNop = 0x80005668; // type:func +__osDispatchThread = 0x80005670; // type:func +__osCleanupThread = 0x800057F0; // type:func +__osDisableInt = 0x80005800; // type:func +__osRestoreInt = 0x80005870; // type:func +osSetIntMask = 0x80005890; // type:func +__osSetHWIntrRoutine = 0x80005940; // type:func +__osGetHWIntrRoutine = 0x800059D0; // type:func +osCreatePiManager = 0x80005A40; // type:func +__osEPiRawStartDma = 0x80005BC0; // type:func +osEPiReadIo = 0x80005F80; // type:func +osEPiStartDma = 0x80005FE0; // type:func +osCartRomInit = 0x80006080; // type:func +__osDevMgrMain = 0x800061E0; // type:func +__osPiCreateAccessQueue = 0x80006680; // type:func +__osPiGetAccess = 0x800066D4; // type:func +__osPiRelAccess = 0x80006710; // type:func +osGetMemSize = 0x800067B0; // type:func +__createSpeedParam = 0x800067E0; // type:func +__osInitialize_common = 0x80006894; // type:func +__osInitialize_autodetect = 0x80006D4C; // type:func +osWritebackDCache = 0x80006D70; // type:func +osVirtualToPhysical = 0x80006DF0; // type:func +bcopy = 0x80006EC0; // type:func +osJamMesg = 0x800071E0; // type:func +osSetEventMesg = 0x80007360; // type:func +__osGetCause = 0x80007430; // type:func +__osSetWatchLo = 0x80007440; // type:func +osGetCount = 0x80007450; // type:func +__osSetCompare = 0x80007550; // type:func +__osSiRawReadIo = 0x80007600; // type:func +__osSiRawWriteIo = 0x80007650; // type:func +osDestroyThread = 0x800076A0; // type:func +osGetThreadPri = 0x800077D0; // type:func +osYieldThread = 0x80007820; // type:func +__osProbeTLB = 0x80007880; // type:func +osMapTLBRdb = 0x80007940; // type:func +osUnmapTLBAll = 0x800079A0; // type:func +__osViInit = 0x800079F0; // type:func +__osViGetCurrentContext = 0x80007AF0; // type:func +__osSetGlobalIntMask = 0x80007B00; // type:func +__osResetGlobalIntMask = 0x80007B60; // type:func +__osPiRawStartDma = 0x80007BD0; // type:func +osPiGetCmdQueue = 0x80007CB0; // type:func +__osEPiRawReadIo = 0x80007CE0; // type:func +__osEPiRawWriteIo = 0x80007E60; // type:func +__osSiDeviceBusy = 0x80007FE0; // type:func +__divdi3 = 0x80008010; // type:func +__moddi3 = 0x800085F0; // type:func +__udivdi3 = 0x80008B80; // type:func +__umoddi3 = 0x800090F0; // type:func +__cmpdi2 = 0x80009600; // type:func +__floatdidf = 0x80009650; // type:func +__floatdisf = 0x800096A0; // type:func +__fixunsdfdi = 0x80009760; // type:func +__fixdfdi = 0x80009960; // type:func +__fixunssfdi = 0x800099D0; // type:func +__fixsfdi = 0x80009BD0; // type:func +EnAObj_SetupAction = 0x80018FA0; // type:func +EnAObj_Init = 0x80018FAC; // type:func +EnAObj_Destroy = 0x800192EC; // type:func +EnAObj_WaitFinishedTalking = 0x80019348; // type:func +EnAObj_SetupWaitTalk = 0x80019378; // type:func +EnAObj_WaitTalk = 0x800193A0; // type:func +EnAObj_SetupBlockRot = 0x80019454; // type:func +EnAObj_BlockRot = 0x800194A4; // type:func +EnAObj_SetupBoulderFragment = 0x800195C4; // type:func +EnAObj_BoulderFragment = 0x800195EC; // type:func +EnAObj_SetupBlock = 0x8001970C; // type:func +EnAObj_Block = 0x8001974C; // type:func +EnAObj_Update = 0x80019834; // type:func +EnAObj_Draw = 0x80019950; // type:func +EnItem00_SetupAction = 0x80019A40; // type:func +EnItem00_Init = 0x80019A4C; // type:func +EnItem00_Destroy = 0x8001A0B4; // type:func +func_8001DFC8 = 0x8001A0E0; // type:func +func_8001E1C8 = 0x8001A2E0; // type:func +func_8001E304 = 0x8001A41C; // type:func +EnItem00_Collected = 0x8001A6E0; // type:func +EnItem00_Update = 0x8001A838; // type:func +EnItem00_Draw = 0x8001AEB8; // type:func +EnItem00_DrawRupee = 0x8001B050; // type:func +EnItem00_DrawCollectible = 0x8001B168; // type:func +EnItem00_DrawHeartContainer = 0x8001B2A8; // type:func +EnItem00_DrawHeartPiece = 0x8001B3A0; // type:func +func_8001F404 = 0x8001B438; // type:func +Item_DropCollectible = 0x8001B580; // type:func +Item_DropCollectible2 = 0x8001B7B8; // type:func +Item_DropCollectibleRandom = 0x8001B98C; // type:func +EffectBlure_AddVertex = 0x8001BE40; // type:func +EffectBlure_AddSpace = 0x8001C164; // type:func +EffectBlure_InitElements = 0x8001C1A8; // type:func +EffectBlure_Init1 = 0x8001C260; // type:func +EffectBlure_Init2 = 0x8001C370; // type:func +EffectBlure_Destroy = 0x8001C4A4; // type:func +EffectBlure_Update = 0x8001C4B0; // type:func +EffectBlure_UpdateFlags = 0x8001C914; // type:func +EffectBlure_GetComputedValues = 0x8001CA84; // type:func +EffectBlure_SetupSmooth = 0x8001CF98; // type:func +EffectBlure_DrawElemNoInterpolation = 0x8001CFCC; // type:func +EffectBlure_DrawElemHermiteInterpolation = 0x8001D4A0; // type:func +EffectBlure_DrawSmooth = 0x8001DE2C; // type:func +EffectBlure_SetupSimple = 0x8001E0FC; // type:func +EffectBlure_SetupSimpleAlt = 0x8001E134; // type:func +EffectBlure_DrawSimpleVertices = 0x8001E39C; // type:func +EffectBlure_DrawSimple = 0x8001E87C; // type:func +EffectBlure_Draw = 0x8001ED88; // type:func +EffectShieldParticle_Init = 0x8001F270; // type:func +EffectShieldParticle_Destroy = 0x8001F4A8; // type:func +EffectShieldParticle_Update = 0x8001F534; // type:func +EffectShieldParticle_GetColors = 0x8001F698; // type:func +EffectShieldParticle_Draw = 0x800203B8; // type:func +EffectSpark_Init = 0x800208D0; // type:func +EffectSpark_Destroy = 0x80020CAC; // type:func +EffectSpark_Update = 0x80020CB8; // type:func +EffectSpark_Draw = 0x80020D7C; // type:func +func_80026230 = 0x80021F80; // type:func +func_80026400 = 0x80022128; // type:func +func_80026608 = 0x8002230C; // type:func +func_80026690 = 0x80022350; // type:func +func_80026860 = 0x800224F8; // type:func +func_80026A6C = 0x800226E4; // type:func +Effect_GetPlayState = 0x80022730; // type:func +Effect_GetByIndex = 0x80022740; // type:func +Effect_InitStatus = 0x80022850; // type:func +Effect_InitContext = 0x80022864; // type:func +Effect_Add = 0x8002290C; // type:func +Effect_DrawAll = 0x80022A8C; // type:func +Effect_UpdateAll = 0x80022B88; // type:func +Effect_Delete = 0x80022CB4; // type:func +Effect_DeleteAll = 0x80022DC0; // type:func +EffectSs_InitInfo = 0x80022EB0; // type:func +EffectSs_ClearAll = 0x80022F94; // type:func +EffectSs_Delete = 0x80023054; // type:func +EffectSs_Reset = 0x800230B4; // type:func +EffectSs_FindSlot = 0x80023148; // type:func +EffectSs_Insert = 0x80023280; // type:func +EffectSs_Spawn = 0x80023318; // type:func +EffectSs_Update = 0x800234C0; // type:func +EffectSs_UpdateAll = 0x80023560; // type:func +EffectSs_Draw = 0x8002361C; // type:func +EffectSs_DrawAll = 0x80023660; // type:func +EffectSs_LerpInv = 0x800237AC; // type:func +EffectSs_LerpS16 = 0x80023810; // type:func +EffectSs_LerpU8 = 0x80023864; // type:func +EffectSs_DrawGEffect = 0x80023950; // type:func +EffectSsDust_Spawn = 0x80023B8C; // type:func +func_8002829C = 0x80023C40; // type:func +func_80028304 = 0x80023CA8; // type:func +func_8002836C = 0x80023D10; // type:func +func_800283D4 = 0x80023D78; // type:func +func_8002843C = 0x80023DE0; // type:func +func_800284A4 = 0x80023E48; // type:func +func_80028510 = 0x80023EB4; // type:func +func_8002857C = 0x80023F20; // type:func +func_800285EC = 0x80023F90; // type:func +func_8002865C = 0x80024000; // type:func +func_800286CC = 0x80024070; // type:func +func_8002873C = 0x800240E0; // type:func +func_800287AC = 0x80024150; // type:func +func_8002881C = 0x800241C0; // type:func +func_80028858 = 0x800241FC; // type:func +func_80028894 = 0x80024238; // type:func +func_80028990 = 0x80024334; // type:func +func_80028A54 = 0x800243F8; // type:func +EffectSsKiraKira_SpawnSmallYellow = 0x800244BC; // type:func +EffectSsKiraKira_SpawnSmall = 0x80024518; // type:func +EffectSsKiraKira_SpawnDispersed = 0x80024554; // type:func +EffectSsKiraKira_SpawnFocused = 0x80024690; // type:func +EffectSsBomb_Spawn = 0x80024768; // type:func +EffectSsBomb2_SpawnFade = 0x800247C0; // type:func +EffectSsBomb2_SpawnLayered = 0x80024828; // type:func +EffectSsBlast_Spawn = 0x80024898; // type:func +EffectSsBlast_SpawnWhiteShockwaveSetScale = 0x80024928; // type:func +EffectSsBlast_SpawnShockwaveSetColor = 0x8002497C; // type:func +EffectSsBlast_SpawnWhiteShockwave = 0x800249C8; // type:func +EffectSsGSpk_SpawnAccel = 0x80024A04; // type:func +EffectSsGSpk_SpawnNoAccel = 0x80024A94; // type:func +EffectSsGSpk_SpawnFuse = 0x80024B28; // type:func +EffectSsGSpk_SpawnRandColor = 0x80024B7C; // type:func +EffectSsGSpk_SpawnSmall = 0x80024C80; // type:func +EffectSsDFire_Spawn = 0x80024CC4; // type:func +EffectSsDFire_SpawnFixedScale = 0x80024D44; // type:func +EffectSsBubble_Spawn = 0x80024D88; // type:func +EffectSsGRipple_Spawn = 0x80024DE8; // type:func +EffectSsGSplash_Spawn = 0x80024E40; // type:func +EffectSsGMagma_Spawn = 0x80024ED4; // type:func +EffectSsGFire_Spawn = 0x80024F0C; // type:func +EffectSsLightning_Spawn = 0x80024F44; // type:func +EffectSsDtBubble_SpawnColorProfile = 0x80024FBC; // type:func +EffectSsDtBubble_SpawnCustomColor = 0x80025038; // type:func +EffectSsHahen_Spawn = 0x800250C8; // type:func +EffectSsHahen_SpawnBurst = 0x80025148; // type:func +EffectSsStick_Spawn = 0x80025290; // type:func +EffectSsSibuki_Spawn = 0x800252E4; // type:func +EffectSsSibuki_SpawnBurst = 0x80025354; // type:func +EffectSsSibuki2_Spawn = 0x800254D8; // type:func +EffectSsGMagma2_Spawn = 0x80025538; // type:func +EffectSsStone1_Spawn = 0x800255A8; // type:func +EffectSsHitMark_Spawn = 0x800255FC; // type:func +EffectSsHitMark_SpawnFixedScale = 0x80025654; // type:func +EffectSsHitMark_SpawnCustomScale = 0x80025678; // type:func +EffectSsFhgFlash_SpawnLightBall = 0x800256A4; // type:func +EffectSsFhgFlash_SpawnShock = 0x80025710; // type:func +EffectSsKFire_Spawn = 0x80025774; // type:func +EffectSsSolderSrchBall_Spawn = 0x800257DC; // type:func +EffectSsKakera_Spawn = 0x80025844; // type:func +EffectSsIcePiece_Spawn = 0x800258FC; // type:func +EffectSsIcePiece_SpawnBurst = 0x80025964; // type:func +EffectSsEnIce_SpawnFlyingVec3f = 0x80025AF8; // type:func +EffectSsEnIce_SpawnFlyingVec3s = 0x80025B98; // type:func +EffectSsEnIce_Spawn = 0x80025C64; // type:func +EffectSsFireTail_Spawn = 0x80025CEC; // type:func +EffectSsFireTail_SpawnFlame = 0x80025D84; // type:func +EffectSsFireTail_SpawnFlameOnPlayer = 0x80025E48; // type:func +EffectSsEnFire_SpawnVec3f = 0x80025E98; // type:func +EffectSsEnFire_SpawnVec3s = 0x80025F10; // type:func +EffectSsExtra_Spawn = 0x80025FBC; // type:func +EffectSsFCircle_Spawn = 0x80026024; // type:func +EffectSsDeadDb_Spawn = 0x80026080; // type:func +EffectSsDeadDd_Spawn = 0x80026138; // type:func +EffectSsDeadDd_SpawnRandYellow = 0x800261EC; // type:func +EffectSsDeadDs_Spawn = 0x8002625C; // type:func +EffectSsDeadDs_SpawnStationary = 0x800262D4; // type:func +EffectSsDeadSound_Spawn = 0x80026324; // type:func +EffectSsDeadSound_SpawnStationary = 0x800263BC; // type:func +EffectSsIceSmoke_Spawn = 0x8002640C; // type:func +FlagSet_Update = 0x80026470; // type:func +Overlay_LoadGameState = 0x80026890; // type:func +Overlay_FreeGameState = 0x800269B8; // type:func +ActorShape_Init = 0x80026AE0; // type:func +ActorShadow_Draw = 0x80026AF8; // type:func +ActorShadow_DrawCircle = 0x80026DC0; // type:func +ActorShadow_DrawWhiteCircle = 0x80026DE4; // type:func +ActorShadow_DrawHorse = 0x80026E10; // type:func +ActorShadow_DrawFoot = 0x80026E34; // type:func +ActorShadow_DrawFeet = 0x8002701C; // type:func +Actor_SetFeetPos = 0x80027450; // type:func +Actor_ProjectPos = 0x80027490; // type:func +Attention_SetReticlePos = 0x800274E0; // type:func +Attention_InitReticle = 0x80027510; // type:func +Attention_SetNaviState = 0x800275DC; // type:func +Attention_Init = 0x800276CC; // type:func +Attention_Draw = 0x8002773C; // type:func +Attention_Update = 0x80027D18; // type:func +Flags_GetSwitch = 0x80028068; // type:func +Flags_SetSwitch = 0x8002809C; // type:func +Flags_UnsetSwitch = 0x800280DC; // type:func +Flags_GetUnknown = 0x80028124; // type:func +Flags_SetUnknown = 0x80028158; // type:func +Flags_UnsetUnknown = 0x80028198; // type:func +Flags_GetTreasure = 0x800281E0; // type:func +Flags_SetTreasure = 0x800281F4; // type:func +Flags_GetClear = 0x8002820C; // type:func +Flags_SetClear = 0x80028220; // type:func +Flags_UnsetClear = 0x80028238; // type:func +Flags_GetTempClear = 0x80028254; // type:func +Flags_SetTempClear = 0x80028268; // type:func +Flags_UnsetTempClear = 0x80028280; // type:func +Flags_GetCollectible = 0x8002829C; // type:func +Flags_SetCollectible = 0x800282D0; // type:func +TitleCard_Init = 0x80028318; // type:func +TitleCard_InitBossName = 0x8002832C; // type:func +TitleCard_InitPlaceName = 0x8002835C; // type:func +TitleCard_Update = 0x800283F0; // type:func +TitleCard_Draw = 0x80028488; // type:func +TitleCard_Clear = 0x80028A18; // type:func +Actor_Kill = 0x80028A44; // type:func +Actor_SetWorldToHome = 0x80028A60; // type:func +Actor_SetFocus = 0x80028A8C; // type:func +Actor_SetWorldRotToShape = 0x80028AC8; // type:func +Actor_SetShapeRotToWorld = 0x80028AE4; // type:func +Actor_SetScale = 0x80028B00; // type:func +Actor_SetObjectDependency = 0x80028B14; // type:func +Actor_Init = 0x80028B4C; // type:func +Actor_Destroy = 0x80028C60; // type:func +Actor_UpdatePos = 0x80028C98; // type:func +Actor_UpdateVelocityXZGravity = 0x80028D10; // type:func +Actor_MoveXZGravity = 0x80028D78; // type:func +Actor_UpdateVelocityXYZ = 0x80028DA4; // type:func +Actor_MoveXYZ = 0x80028E10; // type:func +Actor_SetProjectileSpeed = 0x80028E3C; // type:func +Actor_UpdatePosByAnimation = 0x80028E90; // type:func +Actor_WorldYawTowardActor = 0x80028F08; // type:func +Actor_FocusYawTowardActor = 0x80028F28; // type:func +Actor_WorldYawTowardPoint = 0x80028F48; // type:func +Actor_WorldPitchTowardActor = 0x80028F64; // type:func +Actor_FocusPitchTowardActor = 0x80028F84; // type:func +Actor_WorldPitchTowardPoint = 0x80028FA4; // type:func +Actor_WorldDistXYZToActor = 0x80028FC0; // type:func +Actor_WorldDistXYZToPoint = 0x80028FE0; // type:func +Actor_WorldDistXZToActor = 0x80028FFC; // type:func +Actor_WorldDistXZToPoint = 0x8002901C; // type:func +Actor_WorldToActorCoords = 0x80029038; // type:func +Actor_HeightDiff = 0x800290D8; // type:func +Player_GetHeight = 0x800290E8; // type:func +func_8002DCE4 = 0x80029140; // type:func +func_8002DD6C = 0x800291CC; // type:func +func_8002DD78 = 0x800291D8; // type:func +func_8002DDA8 = 0x8002921C; // type:func +func_8002DDE4 = 0x80029264; // type:func +func_8002DDF4 = 0x80029274; // type:func +Actor_SwapHookshotAttachment = 0x80029284; // type:func +Actor_RequestHorseCameraSetting = 0x800292F0; // type:func +Actor_MountHorse = 0x8002934C; // type:func +func_8002DEEC = 0x80029368; // type:func +Actor_InitPlayerHorse = 0x80029398; // type:func +Player_SetCsAction = 0x800293B4; // type:func +Player_SetCsActionWithHaltedActors = 0x800293CC; // type:func +func_8002DF90 = 0x80029404; // type:func +func_8002DFA4 = 0x80029414; // type:func +Player_IsFacingActor = 0x8002942C; // type:func +Actor_ActorBIsFacingActorA = 0x80029478; // type:func +Actor_IsFacingPlayer = 0x800294DC; // type:func +Actor_ActorAIsFacingActorB = 0x80029520; // type:func +Actor_IsFacingAndNearPlayer = 0x80029580; // type:func +Actor_ActorAIsFacingAndNearActorB = 0x800295F8; // type:func +func_8002E234 = 0x80029684; // type:func +func_8002E2AC = 0x800296E4; // type:func +Actor_UpdateBgCheckInfo = 0x800298D0; // type:func +func_8002E830 = 0x80029C04; // type:func +func_8002EABC = 0x80029DA0; // type:func +func_8002EB44 = 0x80029DDC; // type:func +func_8002EBCC = 0x80029E18; // type:func +func_8002ED80 = 0x80029F38; // type:func +Actor_GetFocus = 0x8002A058; // type:func +Actor_GetWorld = 0x8002A08C; // type:func +Actor_GetWorldPosShapeRot = 0x8002A0C0; // type:func +Attention_WeightedDistToPlayerSq = 0x8002A13C; // type:func +Attention_ActorIsInRange = 0x8002A1FC; // type:func +Attention_ShouldReleaseLockOn = 0x8002A22C; // type:func +Actor_TalkOfferAccepted = 0x8002A2E8; // type:func +Actor_OfferTalkExchange = 0x8002A310; // type:func +Actor_OfferTalkExchangeEquiCylinder = 0x8002A3E0; // type:func +Actor_OfferTalk = 0x8002A404; // type:func +Actor_OfferTalkNearColChkInfoCylinder = 0x8002A420; // type:func +Actor_TextboxIsClosing = 0x8002A458; // type:func +Actor_GetPlayerExchangeItemId = 0x8002A484; // type:func +Actor_GetScreenPos = 0x8002A494; // type:func +Actor_HasParent = 0x8002A524; // type:func +Actor_OfferGetItem = 0x8002A540; // type:func +Actor_OfferGetItemNearby = 0x8002A65C; // type:func +Actor_OfferCarry = 0x8002A684; // type:func +Actor_HasNoParent = 0x8002A6A0; // type:func +func_8002F5C4 = 0x8002A6BC; // type:func +Actor_SetClosestSecretDistance = 0x8002A6E4; // type:func +Actor_IsMounted = 0x8002A708; // type:func +Actor_SetRideActor = 0x8002A724; // type:func +Actor_NotMounted = 0x8002A754; // type:func +Actor_SetPlayerKnockback = 0x8002A770; // type:func +Actor_SetPlayerKnockbackLarge = 0x8002A798; // type:func +Actor_SetPlayerKnockbackLargeNoDamage = 0x8002A7D0; // type:func +Actor_SetPlayerKnockbackSmall = 0x8002A7FC; // type:func +Actor_SetPlayerKnockbackSmallNoDamage = 0x8002A834; // type:func +Player_PlaySfx = 0x8002A860; // type:func +Actor_PlaySfx = 0x8002A8A0; // type:func +Actor_PlaySfx_SurfaceBomb = 0x8002A8C0; // type:func +Actor_PlaySfx_Flagged2 = 0x8002A94C; // type:func +Actor_PlaySfx_FlaggedCentered1 = 0x8002A970; // type:func +Actor_PlaySfx_FlaggedCentered2 = 0x8002A994; // type:func +Actor_PlaySfx_Flagged = 0x8002A9B8; // type:func +Actor_PlaySfx_FlaggedTimer = 0x8002A9D4; // type:func +func_8002F9EC = 0x8002AA24; // type:func +func_8002FA60 = 0x8002AA9C; // type:func +Actor_DrawFaroresWindPointer = 0x8002ABE4; // type:func +func_80030488 = 0x8002B34C; // type:func +Actor_DisableLens = 0x8002B370; // type:func +Actor_InitContext = 0x8002B394; // type:func +Actor_UpdateAll = 0x8002B4B8; // type:func +Actor_FaultPrint = 0x8002B904; // type:func +Actor_Draw = 0x8002B970; // type:func +Actor_UpdateFlaggedAudio = 0x8002BC1C; // type:func +Actor_DrawLensOverlay = 0x8002BCF0; // type:func +Actor_DrawLensActors = 0x8002BE8C; // type:func +Actor_CullingCheck = 0x8002C0EC; // type:func +Actor_CullingVolumeTest = 0x8002C10C; // type:func +func_800315AC = 0x8002C1B8; // type:func +Actor_KillAllWithMissingObject = 0x8002C3A4; // type:func +Actor_FreezeAllEnemies = 0x8002C438; // type:func +func_80031B14 = 0x8002C48C; // type:func +func_80031C3C = 0x8002C5A0; // type:func +Actor_AddToCategory = 0x8002C650; // type:func +Actor_RemoveFromCategory = 0x8002C6A0; // type:func +Actor_FreeOverlay = 0x8002C770; // type:func +Actor_Spawn = 0x8002C7CC; // type:func +Actor_SpawnAsChild = 0x8002CA70; // type:func +Actor_SpawnTransitionActors = 0x8002CAFC; // type:func +Actor_SpawnEntry = 0x8002CC7C; // type:func +Actor_Delete = 0x8002CCF4; // type:func +Attention_ActorOnScreen = 0x8002CDF8; // type:func +Attention_FindActorInCategory = 0x8002CE48; // type:func +Attention_FindActor = 0x8002D040; // type:func +Actor_Find = 0x8002D178; // type:func +Enemy_StartFinishingBlow = 0x8002D1B4; // type:func +FaceChange_UpdateBlinking = 0x8002D1E0; // type:func +FaceChange_UpdateRandomSet = 0x8002D280; // type:func +BodyBreak_Alloc = 0x8002D358; // type:func +BodyBreak_SetInfo = 0x8002D448; // type:func +BodyBreak_SpawnParts = 0x8002D554; // type:func +Actor_SpawnFloorDustRing = 0x8002D730; // type:func +func_80033480 = 0x8002D930; // type:func +Actor_GetCollidedExplosive = 0x8002DAB8; // type:func +func_80033684 = 0x8002DAEC; // type:func +Actor_ChangeCategory = 0x8002DB8C; // type:func +Actor_GetProjectileActor = 0x8002DBD8; // type:func +Actor_SetTextWithPrefix = 0x8002DD44; // type:func +Actor_TestFloorInDirection = 0x8002DDB8; // type:func +Actor_IsLockedOn = 0x8002DE98; // type:func +Actor_OtherIsLockedOn = 0x8002DEC8; // type:func +func_80033AEC = 0x8002DEF8; // type:func +func_80033C30 = 0x8002DFD4; // type:func +Actor_RequestQuake = 0x8002E124; // type:func +Actor_RequestQuakeWithSpeed = 0x8002E1A0; // type:func +Actor_RequestQuakeAndRumble = 0x8002E22C; // type:func +Rand_ZeroFloat = 0x8002E2B0; // type:func +Rand_CenteredFloat = 0x8002E2D8; // type:func +Actor_DrawDoorLock = 0x8002E30C; // type:func +func_8003424C = 0x8002E57C; // type:func +Actor_SetColorFilter = 0x8002E598; // type:func +func_800342EC = 0x8002E5CC; // type:func +func_8003435C = 0x8002E63C; // type:func +Npc_UpdateTalking = 0x8002E6AC; // type:func +Npc_TrackPointWithLimits = 0x8002E79C; // type:func +Npc_GetTrackingPresetMaxPlayerYaw = 0x8002EA9C; // type:func +Npc_UpdateAutoTurn = 0x8002EAC0; // type:func +Npc_TrackPoint = 0x8002EC48; // type:func +func_80034B28 = 0x8002ED90; // type:func +func_80034B54 = 0x8002EDAC; // type:func +func_80034BA0 = 0x8002EDE0; // type:func +func_80034CC4 = 0x8002EEF8; // type:func +Actor_UpdateAlphaByDistance = 0x8002EFF8; // type:func +Animation_ChangeByInfo = 0x8002F0C4; // type:func +Actor_UpdateFidgetTables = 0x8002F150; // type:func +Actor_Noop = 0x8002F1A8; // type:func +func_80035124 = 0x8002F1B0; // type:func +Gfx_DrawDListOpa = 0x8002F2F4; // type:func +Gfx_DrawDListXlu = 0x8002F380; // type:func +func_800353E8 = 0x8002F40C; // type:func +Actor_FindNearby = 0x8002F41C; // type:func +func_800354B4 = 0x8002F4C0; // type:func +func_8003555C = 0x8002F554; // type:func +func_800355B8 = 0x8002F5AC; // type:func +func_800355E4 = 0x8002F5D8; // type:func +Actor_ApplyDamage = 0x8002F614; // type:func +Actor_SetDropFlag = 0x8002F63C; // type:func +Actor_SetDropFlagJntSph = 0x8002F724; // type:func +func_80035844 = 0x8002F820; // type:func +func_800358DC = 0x8002F8C0; // type:func +func_800359B8 = 0x8002F994; // type:func +func_80035B18 = 0x8002FAE0; // type:func +Flags_GetEventChkInf = 0x8002FB18; // type:func +Flags_SetEventChkInf = 0x8002FB40; // type:func +Flags_GetInfTable = 0x8002FB70; // type:func +Flags_SetInfTable = 0x8002FB98; // type:func +func_80035BFC = 0x8002FBC8; // type:func +func_80036E50 = 0x800309B0; // type:func +func_800374E0 = 0x80031038; // type:func +func_80037C30 = 0x80031710; // type:func +func_80037C5C = 0x80031734; // type:func +func_80037C94 = 0x8003175C; // type:func +func_80037CB8 = 0x8003177C; // type:func +func_80037D98 = 0x80031884; // type:func +Actor_TrackNone = 0x800319F0; // type:func +Actor_TrackPoint = 0x80031A8C; // type:func +Actor_TrackPlayerSetFocusHeight = 0x80031C1C; // type:func +Actor_TrackPlayer = 0x80031D4C; // type:func +ActorOverlayTable_LogPrint = 0x80031E70; // type:func +ActorOverlayTable_FaultPrint = 0x80031E78; // type:func +ActorOverlayTable_Init = 0x80031F50; // type:func +ActorOverlayTable_Cleanup = 0x80031F90; // type:func +SSNode_SetValue = 0x80031FC0; // type:func +SSList_SetNull = 0x80031FDC; // type:func +SSNodeList_SetSSListHead = 0x80031FEC; // type:func +DynaSSNodeList_SetSSListHead = 0x80032044; // type:func +DynaSSNodeList_Initialize = 0x8003209C; // type:func +DynaSSNodeList_Alloc = 0x800320B0; // type:func +DynaSSNodeList_ResetCount = 0x80032100; // type:func +DynaSSNodeList_GetNextNodeIdx = 0x8003210C; // type:func +BgCheck_Vec3sToVec3f = 0x8003213C; // type:func +BgCheck_Vec3fToVec3s = 0x80032180; // type:func +CollisionPoly_GetMinY = 0x800321C4; // type:func +CollisionPoly_GetNormalF = 0x80032270; // type:func +func_80038A28 = 0x800322C8; // type:func +CollisionPoly_GetPointDistanceFromPlane = 0x8003241C; // type:func +CollisionPoly_GetVertices = 0x80032484; // type:func +CollisionPoly_GetVerticesByBgId = 0x80032524; // type:func +CollisionPoly_CheckYIntersectApprox1 = 0x800325A4; // type:func +CollisionPoly_CheckYIntersect = 0x800326D8; // type:func +CollisionPoly_CheckYIntersectApprox2 = 0x80032784; // type:func +CollisionPoly_CheckXIntersectApprox = 0x800327C4; // type:func +CollisionPoly_CheckZIntersectApprox = 0x80032868; // type:func +CollisionPoly_LineVsPoly = 0x8003290C; // type:func +CollisionPoly_SphVsPoly = 0x80032BEC; // type:func +StaticLookup_AddPolyToSSList = 0x80032CBC; // type:func +StaticLookup_AddPoly = 0x80032EDC; // type:func +BgCheck_RaycastDownStaticList = 0x80032F70; // type:func +BgCheck_RaycastDownStatic = 0x800331AC; // type:func +BgCheck_ComputeWallDisplacement = 0x800332C4; // type:func +BgCheck_SphVsStaticWall = 0x80033374; // type:func +BgCheck_CheckStaticCeiling = 0x80033C08; // type:func +BgCheck_CheckLineAgainstSSList = 0x80033DE0; // type:func +BgCheck_CheckLineInSubdivision = 0x80034004; // type:func +BgCheck_SphVsFirstStaticPolyList = 0x80034190; // type:func +BgCheck_SphVsFirstStaticPoly = 0x80034360; // type:func +BgCheck_GetNearestStaticLookup = 0x80034498; // type:func +BgCheck_GetStaticLookup = 0x8003454C; // type:func +BgCheck_GetStaticLookupIndicesFromPos = 0x80034618; // type:func +BgCheck_GetSubdivisionMinBounds = 0x800346F8; // type:func +BgCheck_GetSubdivisionMaxBounds = 0x8003489C; // type:func +BgCheck_GetPolySubdivisionBounds = 0x80034A68; // type:func +BgCheck_PolyIntersectsSubdivision = 0x80034C18; // type:func +BgCheck_InitializeStaticLookup = 0x8003536C; // type:func +BgCheck_IsSpotScene = 0x8003576C; // type:func +BgCheck_TryGetCustomMemsize = 0x800357B0; // type:func +BgCheck_SetSubdivisionDimension = 0x80035848; // type:func +BgCheck_Allocate = 0x800358D0; // type:func +BgCheck_GetCollisionHeader = 0x80035CB4; // type:func +BgCheck_PosInStaticBoundingBox = 0x80035D1C; // type:func +BgCheck_RaycastDownImpl = 0x80035DD8; // type:func +BgCheck_CameraRaycastDown1 = 0x80035FA8; // type:func +BgCheck_EntityRaycastDown1 = 0x80036004; // type:func +BgCheck_EntityRaycastDown2 = 0x80036060; // type:func +BgCheck_EntityRaycastDown3 = 0x800360B4; // type:func +BgCheck_EntityRaycastDown4 = 0x80036118; // type:func +BgCheck_EntityRaycastDown5 = 0x80036180; // type:func +BgCheck_EntityRaycastDown6 = 0x800361D8; // type:func +BgCheck_EntityRaycastDown7 = 0x8003623C; // type:func +BgCheck_AnyRaycastDown1 = 0x800362A4; // type:func +BgCheck_AnyRaycastDown2 = 0x80036358; // type:func +BgCheck_CameraRaycastDown2 = 0x80036410; // type:func +BgCheck_EntityRaycastDownWalls = 0x80036474; // type:func +BgCheck_EntityRaycastDown9 = 0x800364DC; // type:func +BgCheck_CheckWallImpl = 0x80036540; // type:func +BgCheck_EntitySphVsWall1 = 0x80036B7C; // type:func +BgCheck_EntitySphVsWall2 = 0x80036BE0; // type:func +BgCheck_EntitySphVsWall3 = 0x80036C44; // type:func +BgCheck_EntitySphVsWall4 = 0x80036CAC; // type:func +BgCheck_CheckCeilingImpl = 0x80036D18; // type:func +BgCheck_AnyCheckCeiling = 0x80036E38; // type:func +BgCheck_EntityCheckCeiling = 0x80036E84; // type:func +BgCheck_CheckLineImpl = 0x80036ED4; // type:func +BgCheck_GetBccFlags = 0x800373B4; // type:func +BgCheck_CameraLineTest1 = 0x800373FC; // type:func +BgCheck_CameraLineTest2 = 0x80037488; // type:func +BgCheck_EntityLineTest1 = 0x80037514; // type:func +BgCheck_EntityLineTest2 = 0x800375A0; // type:func +BgCheck_EntityLineTest3 = 0x80037630; // type:func +BgCheck_ProjectileLineTest = 0x800376BC; // type:func +BgCheck_AnyLineTest1 = 0x80037748; // type:func +BgCheck_AnyLineTest2 = 0x8003778C; // type:func +BgCheck_AnyLineTest3 = 0x80037818; // type:func +BgCheck_SphVsFirstPolyImpl = 0x800378A4; // type:func +BgCheck_SphVsFirstPoly = 0x80037968; // type:func +BgCheck_SphVsFirstWall = 0x800379AC; // type:func +SSNodeList_Initialize = 0x800379F4; // type:func +SSNodeList_Alloc = 0x80037A0C; // type:func +SSNodeList_GetNextNode = 0x80037A7C; // type:func +SSNodeList_GetNextNodeIdx = 0x80037AB8; // type:func +ScaleRotPos_Initialize = 0x80037ACC; // type:func +ScaleRotPos_SetValue = 0x80037B0C; // type:func +ScaleRotPos_Equals = 0x80037B5C; // type:func +DynaLookup_ResetLists = 0x80037C30; // type:func +DynaLookup_Reset = 0x80037C70; // type:func +DynaLookup_ResetVtxStartIndex = 0x80037C90; // type:func +BgActor_Initialize = 0x80037C9C; // type:func +BgActor_SetActor = 0x80037CFC; // type:func +BgActor_IsTransformUnchanged = 0x80037DB4; // type:func +DynaPoly_NullPolyList = 0x80037DDC; // type:func +DynaPoly_AllocPolyList = 0x80037DE8; // type:func +DynaPoly_NullVtxList = 0x80037E24; // type:func +DynaPoly_AllocVtxList = 0x80037E30; // type:func +DynaPoly_SetBgActorPrevTransform = 0x80037E78; // type:func +DynaPoly_IsBgIdBgActor = 0x80037EC4; // type:func +DynaPoly_Init = 0x80037EE4; // type:func +DynaPoly_Alloc = 0x80037F30; // type:func +DynaPoly_SetBgActor = 0x80038004; // type:func +DynaPoly_GetActor = 0x800380C4; // type:func +DynaPoly_DisableCollision = 0x80038138; // type:func +DynaPoly_EnableCollision = 0x80038190; // type:func +DynaPoly_DisableCeilingCollision = 0x800381E8; // type:func +DynaPoly_EnableCeilingCollision = 0x80038240; // type:func +DynaPoly_DeleteBgActor = 0x80038298; // type:func +DynaPoly_InvalidateLookup = 0x80038320; // type:func +DynaPoly_AddBgActorToLookup = 0x80038338; // type:func +DynaPoly_UnsetAllInteractFlags = 0x80038C84; // type:func +DynaPoly_UpdateContext = 0x80038D1C; // type:func +DynaPoly_UpdateBgActorTransforms = 0x80038E88; // type:func +BgCheck_RaycastDownDynaList = 0x80038F18; // type:func +BgCheck_RaycastDownDyna = 0x80039100; // type:func +BgCheck_SphVsDynaWallInBgActor = 0x800395A8; // type:func +BgCheck_SphVsDynaWall = 0x80039C6C; // type:func +BgCheck_CheckDynaCeilingList = 0x80039EA8; // type:func +BgCheck_CheckDynaCeiling = 0x8003A104; // type:func +BgCheck_CheckLineAgainstBgActorSSList = 0x8003A268; // type:func +BgCheck_CheckLineAgainstBgActor = 0x8003A3EC; // type:func +BgCheck_CheckLineAgainstDyna = 0x8003A508; // type:func +BgCheck_SphVsFirstDynaPolyList = 0x8003A6C0; // type:func +BgCheck_SphVsFirstDynaPolyInBgActor = 0x8003A7D8; // type:func +BgCheck_SphVsFirstDynaPoly = 0x8003A918; // type:func +CollisionHeader_SegmentedToVirtual = 0x8003AA70; // type:func +CollisionHeader_GetVirtual = 0x8003AB54; // type:func +func_800418D0 = 0x8003ABA8; // type:func +BgCheck_ResetPolyCheckTbl = 0x8003AC50; // type:func +SurfaceType_GetData = 0x8003AC88; // type:func +SurfaceType_GetBgCamIndex = 0x8003AD00; // type:func +BgCheck_GetBgCamSettingImpl = 0x8003AD24; // type:func +BgCheck_GetBgCamSetting = 0x8003AD6C; // type:func +BgCheck_GetBgCamCountImpl = 0x8003AE00; // type:func +BgCheck_GetBgCamCount = 0x8003AE5C; // type:func +BgCheck_GetBgCamFuncDataImpl = 0x8003AEF0; // type:func +BgCheck_GetBgCamFuncData = 0x8003AF78; // type:func +SurfaceType_GetExitIndex = 0x8003B00C; // type:func +SurfaceType_GetFloorType = 0x8003B034; // type:func +func_80041D70 = 0x8003B05C; // type:func +SurfaceType_GetWallType = 0x8003B084; // type:func +SurfaceType_GetWallFlags = 0x8003B0AC; // type:func +SurfaceType_CheckWallFlag0 = 0x8003B0DC; // type:func +SurfaceType_CheckWallFlag1 = 0x8003B110; // type:func +SurfaceType_CheckWallFlag2 = 0x8003B144; // type:func +SurfaceType_GetFloorProperty2 = 0x8003B178; // type:func +SurfaceType_GetFloorProperty = 0x8003B1A0; // type:func +SurfaceType_IsSoft = 0x8003B1C8; // type:func +SurfaceType_IsHorseBlocked = 0x8003B1F0; // type:func +SurfaceType_GetMaterial = 0x8003B218; // type:func +SurfaceType_GetSfxOffset = 0x8003B23C; // type:func +SurfaceType_GetFloorEffect = 0x8003B284; // type:func +SurfaceType_GetLightSetting = 0x8003B2AC; // type:func +SurfaceType_GetEcho = 0x8003B2D4; // type:func +SurfaceType_CanHookshot = 0x8003B2FC; // type:func +SurfaceType_IsIgnoredByEntities = 0x8003B324; // type:func +SurfaceType_IsIgnoredByProjectiles = 0x8003B360; // type:func +SurfaceType_IsFloorConveyor = 0x8003B39C; // type:func +SurfaceType_GetConveyorSpeed = 0x8003B3D8; // type:func +SurfaceType_GetConveyorDirection = 0x8003B400; // type:func +func_80042108 = 0x8003B428; // type:func +WaterBox_GetSurface1 = 0x8003B45C; // type:func +WaterBox_GetSurfaceImpl = 0x8003B568; // type:func +WaterBox_GetSurface2 = 0x8003B6C0; // type:func +WaterBox_GetBgCamIndex = 0x8003B85C; // type:func +WaterBox_GetBgCamSetting = 0x8003B870; // type:func +WaterBox_GetLightIndex = 0x8003B8C8; // type:func +func_800425B0 = 0x8003B8E0; // type:func +func_80042708 = 0x8003BA38; // type:func +func_800427B4 = 0x8003BAE8; // type:func +DynaPolyActor_UpdateCarriedActorPos = 0x8003BBA0; // type:func +DynaPolyActor_UpdateCarriedActorRotY = 0x8003BCDC; // type:func +func_80043334 = 0x8003BD70; // type:func +DynaPolyActor_TransformCarriedActor = 0x8003BDE0; // type:func +DynaPolyActor_Init = 0x8003BEC0; // type:func +DynaPolyActor_UnsetAllInteractFlags = 0x8003BEE4; // type:func +DynaPolyActor_SetActorOnTop = 0x8003BEF0; // type:func +DynaPolyActor_SetPlayerOnTop = 0x8003BF04; // type:func +DynaPoly_SetPlayerOnTop = 0x8003BF18; // type:func +DynaPolyActor_SetPlayerAbove = 0x8003BF48; // type:func +DynaPoly_SetPlayerAbove = 0x8003BF5C; // type:func +DynaPolyActor_SetSwitchPressed = 0x8003BF8C; // type:func +DynaPolyActor_IsActorOnTop = 0x8003BFA0; // type:func +DynaPolyActor_IsPlayerOnTop = 0x8003BFC4; // type:func +DynaPolyActor_IsPlayerAbove = 0x8003BFE8; // type:func +DynaPolyActor_IsSwitchPressed = 0x8003C00C; // type:func +func_800435D8 = 0x8003C030; // type:func +Camera_InterpolateCurve = 0x8003C250; // type:func +Camera_LERPCeilF = 0x8003C2FC; // type:func +Camera_LERPFloorF = 0x8003C340; // type:func +Camera_LERPCeilS = 0x8003C384; // type:func +Camera_LERPFloorS = 0x8003C418; // type:func +Camera_LERPCeilVec3f = 0x8003C4AC; // type:func +func_80043ABC = 0x8003C530; // type:func +func_80043B60 = 0x8003C570; // type:func +Camera_Vec3sToVec3f = 0x8003C5A0; // type:func +Camera_AddVecGeoToVec3f = 0x8003C608; // type:func +Camera_Vec3fTranslateByUnitVector = 0x8003C688; // type:func +Camera_BGCheckInfo = 0x8003C6F4; // type:func +Camera_BGCheck = 0x8003C91C; // type:func +func_80043F94 = 0x8003C978; // type:func +func_80044340 = 0x8003CD30; // type:func +Camera_CheckOOB = 0x8003CD8C; // type:func +Camera_GetFloorYNorm = 0x8003CE28; // type:func +Camera_GetFloorY = 0x8003CF0C; // type:func +Camera_GetFloorYLayer = 0x8003CF68; // type:func +Camera_GetBgCamSetting = 0x8003D12C; // type:func +Camera_GetBgCamFuncData = 0x8003D160; // type:func +Camera_GetBgCamIndex = 0x8003D190; // type:func +Camera_GetBgCamFuncDataUnderPlayer = 0x8003D210; // type:func +Camera_GetWaterBoxBgCamIndex = 0x8003D2C0; // type:func +Camera_GetWaterSurface = 0x8003D3A0; // type:func +Camera_XZAngle = 0x8003D468; // type:func +Camera_GetPitchAdjFromFloorHeightDiffs = 0x8003D4D0; // type:func +Camera_CalcUpFromPitchYawRoll = 0x8003D7FC; // type:func +Camera_ClampLERPScale = 0x8003DA38; // type:func +Camera_CopyDataToRegs = 0x8003DA90; // type:func +Camera_UpdateInterface = 0x8003DAA0; // type:func +Camera_BGCheckCorner = 0x8003DBAC; // type:func +func_80045508 = 0x8003DC14; // type:func +Camera_CalcSlopeYAdj = 0x8003DE24; // type:func +Camera_CalcAtDefault = 0x8003DEB8; // type:func +func_800458D4 = 0x8003DFD0; // type:func +func_80045B08 = 0x8003E188; // type:func +Camera_CalcAtForParallel = 0x8003E2E8; // type:func +Camera_CalcAtForLockOn = 0x8003E64C; // type:func +Camera_CalcAtForHorse = 0x8003EB04; // type:func +Camera_LERPClampDist = 0x8003ECC0; // type:func +Camera_ClampDist = 0x8003ED78; // type:func +Camera_CalcDefaultPitch = 0x8003EE8C; // type:func +Camera_CalcDefaultYaw = 0x8003EFEC; // type:func +func_80046E20 = 0x8003F140; // type:func +Camera_Noop = 0x8003F664; // type:func +Camera_Normal1 = 0x8003F674; // type:func +Camera_Normal2 = 0x800400CC; // type:func +Camera_Normal3 = 0x8004085C; // type:func +Camera_Normal4 = 0x80040F04; // type:func +Camera_Normal0 = 0x80040F24; // type:func +Camera_Parallel1 = 0x80040F44; // type:func +Camera_Parallel2 = 0x800417D0; // type:func +Camera_Parallel3 = 0x800417F0; // type:func +Camera_Parallel4 = 0x80041854; // type:func +Camera_Parallel0 = 0x80041874; // type:func +Camera_Jump1 = 0x80041894; // type:func +Camera_Jump2 = 0x80041ED4; // type:func +Camera_Jump3 = 0x800427C0; // type:func +Camera_Jump4 = 0x80042F2C; // type:func +Camera_Jump0 = 0x80042F4C; // type:func +Camera_Battle1 = 0x80042F6C; // type:func +Camera_Battle2 = 0x80043CA8; // type:func +Camera_Battle3 = 0x80043CC8; // type:func +Camera_Battle4 = 0x80043CE8; // type:func +Camera_Battle0 = 0x80044040; // type:func +Camera_KeepOn1 = 0x80044060; // type:func +Camera_KeepOn2 = 0x80044DB0; // type:func +Camera_KeepOn3 = 0x80044DD0; // type:func +Camera_KeepOn4 = 0x800457C8; // type:func +Camera_KeepOn0 = 0x800465E0; // type:func +Camera_Fixed1 = 0x80046880; // type:func +Camera_Fixed2 = 0x80046B6C; // type:func +Camera_Fixed3 = 0x80046F20; // type:func +Camera_Fixed4 = 0x80047120; // type:func +Camera_Fixed0 = 0x800474AC; // type:func +Camera_Subj1 = 0x800474CC; // type:func +Camera_Subj2 = 0x800474EC; // type:func +Camera_Subj3 = 0x8004750C; // type:func +Camera_Subj4 = 0x80047B10; // type:func +Camera_Subj0 = 0x80048144; // type:func +Camera_Data0 = 0x80048164; // type:func +Camera_Data1 = 0x80048184; // type:func +Camera_Data2 = 0x800481A4; // type:func +Camera_Data3 = 0x800481C4; // type:func +Camera_Data4 = 0x800481E4; // type:func +Camera_Unique1 = 0x800484D0; // type:func +Camera_Unique2 = 0x80048954; // type:func +Camera_Unique3 = 0x80048D0C; // type:func +Camera_Unique0 = 0x800491BC; // type:func +Camera_Unique4 = 0x800496D8; // type:func +Camera_Unique5 = 0x800496F8; // type:func +Camera_Unique6 = 0x80049718; // type:func +Camera_Unique7 = 0x80049848; // type:func +Camera_Unique8 = 0x80049A4C; // type:func +Camera_Unique9 = 0x80049A6C; // type:func +Camera_Vec3fCopy = 0x8004AEC8; // type:func +Camera_RotateAroundPoint = 0x8004AEE8; // type:func +Camera_Demo1 = 0x8004AF44; // type:func +Camera_Demo2 = 0x8004B11C; // type:func +Camera_Demo3 = 0x8004B13C; // type:func +Camera_Demo4 = 0x8004BBD8; // type:func +Camera_Demo5 = 0x8004BBF8; // type:func +Camera_Demo6 = 0x8004C5D0; // type:func +Camera_Demo7 = 0x8004C874; // type:func +Camera_Demo8 = 0x8004C8A8; // type:func +Camera_Demo9 = 0x8004C8C8; // type:func +Camera_Demo0 = 0x8004CCE8; // type:func +Camera_Special0 = 0x8004CD08; // type:func +Camera_Special1 = 0x8004CE50; // type:func +Camera_Special2 = 0x8004CE70; // type:func +Camera_Special3 = 0x8004CE90; // type:func +Camera_Special4 = 0x8004CEB0; // type:func +Camera_Special5 = 0x8004D054; // type:func +Camera_Special7 = 0x8004D3F8; // type:func +Camera_Special6 = 0x8004D744; // type:func +Camera_Special8 = 0x8004DBB4; // type:func +Camera_Special9 = 0x8004DBD4; // type:func +Camera_Create = 0x8004E2BC; // type:func +Camera_Destroy = 0x8004E30C; // type:func +Camera_Init = 0x8004E334; // type:func +func_80057FC4 = 0x8004E554; // type:func +Camera_Stub80058140 = 0x8004E6A8; // type:func +Camera_InitDataUsingPlayer = 0x8004E6B4; // type:func +Camera_ChangeStatus = 0x8004E8B0; // type:func +Camera_UpdateWater = 0x8004E8CC; // type:func +Camera_UpdateHotRoom = 0x8004ECE8; // type:func +Camera_UpdateDistortion = 0x8004ED28; // type:func +Camera_Update = 0x8004F088; // type:func +Camera_Finish = 0x8004F8B8; // type:func +Camera_SetNewModeStateFlags = 0x8004FA24; // type:func +Camera_RequestModeImpl = 0x8004FA48; // type:func +Camera_RequestMode = 0x8004FDAC; // type:func +Camera_CheckValidMode = 0x8004FDD8; // type:func +Camera_RequestSettingImpl = 0x8004FE44; // type:func +Camera_RequestSetting = 0x80050038; // type:func +Camera_RequestBgCam = 0x80050064; // type:func +Camera_GetInputDir = 0x80050138; // type:func +Camera_GetInputDirPitch = 0x8005015C; // type:func +Camera_GetInputDirYaw = 0x80050184; // type:func +Camera_GetCamDir = 0x800501AC; // type:func +Camera_GetCamDirPitch = 0x800501D0; // type:func +Camera_GetCamDirYaw = 0x800501F8; // type:func +Camera_RequestQuake = 0x80050220; // type:func +Camera_SetViewParam = 0x80050294; // type:func +Camera_UnsetViewFlag = 0x80050428; // type:func +Camera_OverwriteStateFlags = 0x80050450; // type:func +Camera_ResetAnim = 0x8005046C; // type:func +Camera_SetCSParams = 0x8005047C; // type:func +Camera_SetStateFlag = 0x80050510; // type:func +Camera_UnsetStateFlag = 0x80050534; // type:func +Camera_ChangeDoorCam = 0x8005055C; // type:func +Camera_Copy = 0x8005065C; // type:func +Camera_IsDebugCamEnabled = 0x800507A4; // type:func +Camera_GetQuakeOffset = 0x800507B0; // type:func +Camera_SetCameraData = 0x800507D4; // type:func +func_8005B198 = 0x80050820; // type:func +Camera_SetFinishedFlag = 0x80050830; // type:func +DamageTable_Get = 0x80050880; // type:func +DamageTable_Clear = 0x800508AC; // type:func +Collider_InitBase = 0x800508E0; // type:func +Collider_DestroyBase = 0x80050928; // type:func +Collider_SetBaseToActor = 0x8005093C; // type:func +Collider_SetBaseType1 = 0x8005097C; // type:func +Collider_SetBase = 0x800509C0; // type:func +Collider_ResetATBase = 0x80050A04; // type:func +Collider_ResetACBase = 0x80050A20; // type:func +Collider_ResetOCBase = 0x80050A3C; // type:func +Collider_InitElementDamageInfoAT = 0x80050A64; // type:func +Collider_DestroyElementDamageInfoAT = 0x80050A8C; // type:func +Collider_SetElementDamageInfoAT = 0x80050AA0; // type:func +Collider_ResetATElement_Unk = 0x80050AC8; // type:func +Collider_InitElementDamageInfoAC = 0x80050AD8; // type:func +Collider_DestroyElementDamageInfoAC = 0x80050B08; // type:func +Collider_SetElementDamageInfoAC = 0x80050B1C; // type:func +Collider_InitElement = 0x80050B44; // type:func +Collider_DestroyElement = 0x80050BC4; // type:func +Collider_SetElement = 0x80050C04; // type:func +Collider_ResetATElement = 0x80050C7C; // type:func +Collider_ResetACElement = 0x80050CB4; // type:func +Collider_ResetOCElement = 0x80050CEC; // type:func +Collider_InitJntSphElementDim = 0x80050D04; // type:func +Collider_DestroyJntSphElementDim = 0x80050D4C; // type:func +Collider_SetJntSphElementDim = 0x80050D60; // type:func +Collider_InitJntSphElement = 0x80050DB8; // type:func +Collider_DestroyJntSphElement = 0x80050DF8; // type:func +Collider_SetJntSphElement = 0x80050E38; // type:func +Collider_ResetJntSphElementAT = 0x80050E88; // type:func +Collider_ResetJntSphElementAC = 0x80050EAC; // type:func +Collider_ResetJntSphElementOC = 0x80050ED0; // type:func +Collider_InitJntSph = 0x80050EF4; // type:func +Collider_FreeJntSph = 0x80050F20; // type:func +Collider_DestroyJntSph = 0x80050FC0; // type:func +Collider_SetJntSphToActor = 0x80051050; // type:func +Collider_SetJntSphAllocType1 = 0x8005112C; // type:func +Collider_SetJntSphAlloc = 0x80051208; // type:func +Collider_SetJntSph = 0x800512E4; // type:func +Collider_ResetJntSphAT = 0x80051398; // type:func +Collider_ResetJntSphAC = 0x80051424; // type:func +Collider_ResetJntSphOC = 0x800514B0; // type:func +Collider_InitCylinderDim = 0x8005153C; // type:func +Collider_DestroyCylinderDim = 0x80051598; // type:func +Collider_SetCylinderDim = 0x800515AC; // type:func +Collider_InitCylinder = 0x800515EC; // type:func +Collider_DestroyCylinder = 0x8005163C; // type:func +Collider_SetCylinderToActor = 0x8005168C; // type:func +Collider_SetCylinderType1 = 0x800516F4; // type:func +Collider_SetCylinder = 0x8005175C; // type:func +Collider_ResetCylinderAT = 0x800517C4; // type:func +Collider_ResetCylinderAC = 0x80051804; // type:func +Collider_ResetCylinderOC = 0x80051844; // type:func +Collider_InitTrisElementDim = 0x80051884; // type:func +Collider_DestroyTrisElementDim = 0x800518D0; // type:func +Collider_SetTrisElementDim = 0x800518E4; // type:func +Collider_InitTrisElement = 0x80051998; // type:func +Collider_DestroyTrisElement = 0x800519D8; // type:func +Collider_SetTrisElement = 0x80051A18; // type:func +Collider_ResetTrisElementAT = 0x80051A68; // type:func +Collider_ResetTrisElementAC = 0x80051A8C; // type:func +Collider_ResetTrisElementOC = 0x80051AB0; // type:func +Collider_InitTris = 0x80051AD4; // type:func +Collider_FreeTris = 0x80051B00; // type:func +Collider_DestroyTris = 0x80051BB8; // type:func +Collider_SetTrisAllocType1 = 0x80051C5C; // type:func +Collider_SetTrisAlloc = 0x80051D5C; // type:func +Collider_SetTris = 0x80051E5C; // type:func +Collider_ResetTrisAT = 0x80051F28; // type:func +Collider_ResetTrisAC = 0x80051FC8; // type:func +Collider_ResetTrisOC = 0x80052068; // type:func +Collider_InitQuadDim = 0x80052108; // type:func +Collider_DestroyQuadDim = 0x80052154; // type:func +Collider_ResetQuadACDist = 0x80052168; // type:func +Collider_SetQuadMidpoints = 0x80052184; // type:func +Collider_SetQuadDim = 0x80052240; // type:func +Collider_InitQuad = 0x800522C8; // type:func +Collider_DestroyQuad = 0x80052318; // type:func +Collider_SetQuadType1 = 0x80052368; // type:func +Collider_SetQuad = 0x800523D0; // type:func +Collider_ResetQuadAT = 0x80052438; // type:func +Collider_ResetQuadAC = 0x80052488; // type:func +Collider_ResetQuadOC = 0x800524C8; // type:func +Collider_QuadSetNearestAC = 0x80052508; // type:func +Collider_InitLine = 0x800525B8; // type:func +Collider_DestroyLine = 0x80052618; // type:func +Collider_SetLinePoints = 0x8005262C; // type:func +Collider_SetLine = 0x80052670; // type:func +Collider_ResetLineOC = 0x8005269C; // type:func +CollisionCheck_InitContext = 0x800526B8; // type:func +CollisionCheck_DestroyContext = 0x800526D8; // type:func +CollisionCheck_ClearContext = 0x800526E8; // type:func +CollisionCheck_EnableSAC = 0x80052790; // type:func +CollisionCheck_DisableSAC = 0x800527A8; // type:func +CollisionCheck_SetAT = 0x800527C0; // type:func +CollisionCheck_SetAT_SAC = 0x800528A0; // type:func +CollisionCheck_SetAC = 0x800529B0; // type:func +CollisionCheck_SetAC_SAC = 0x80052A90; // type:func +CollisionCheck_SetOC = 0x80052BA0; // type:func +CollisionCheck_SetOC_SAC = 0x80052C80; // type:func +CollisionCheck_SetOCLine = 0x80052D90; // type:func +CollisionCheck_IsElementNotAT = 0x80052E1C; // type:func +CollisionCheck_IsElementNotAC = 0x80052E40; // type:func +CollisionCheck_NoSharedFlags = 0x80052E64; // type:func +CollisionCheck_NoBlood = 0x80052E8C; // type:func +CollisionCheck_BlueBlood = 0x80052EA0; // type:func +CollisionCheck_GreenBlood = 0x8005300C; // type:func +CollisionCheck_WaterBurst = 0x80053178; // type:func +CollisionCheck_RedBlood = 0x800531B4; // type:func +CollisionCheck_RedBloodUnused = 0x800531D8; // type:func +CollisionCheck_HitSolid = 0x800531FC; // type:func +CollisionCheck_SwordHitAudio = 0x8005340C; // type:func +CollisionCheck_HitEffects = 0x80053518; // type:func +CollisionCheck_SetBounce = 0x80053718; // type:func +CollisionCheck_SetATvsAC = 0x80053738; // type:func +CollisionCheck_ATJntSphVsACJntSph = 0x800538E0; // type:func +CollisionCheck_ATJntSphVsACCyl = 0x80053B8C; // type:func +CollisionCheck_ATCylVsACJntSph = 0x80053E00; // type:func +CollisionCheck_ATJntSphVsACTris = 0x800540A0; // type:func +CollisionCheck_ATTrisVsACJntSph = 0x800542C0; // type:func +CollisionCheck_ATJntSphVsACQuad = 0x800544D4; // type:func +CollisionCheck_ATQuadVsACJntSph = 0x800546F4; // type:func +CollisionCheck_ATCylVsACCyl = 0x80054958; // type:func +CollisionCheck_ATCylVsACTris = 0x80054B2C; // type:func +CollisionCheck_ATTrisVsACCyl = 0x80054CF0; // type:func +CollisionCheck_ATCylVsACQuad = 0x80054EB0; // type:func +CollisionCheck_ATQuadVsACCyl = 0x80055124; // type:func +CollisionCheck_ATTrisVsACTris = 0x800553D0; // type:func +CollisionCheck_ATTrisVsACQuad = 0x80055624; // type:func +CollisionCheck_ATQuadVsACTris = 0x800558B4; // type:func +CollisionCheck_ATQuadVsACQuad = 0x80055B4C; // type:func +CollisionCheck_SetJntSphHitFX = 0x80055DDC; // type:func +CollisionCheck_SetCylHitFX = 0x80055EBC; // type:func +CollisionCheck_SetTrisHitFX = 0x80055F54; // type:func +CollisionCheck_SetQuadHitFX = 0x8005603C; // type:func +CollisionCheck_SetHitEffects = 0x800560D4; // type:func +CollisionCheck_AC = 0x800561A8; // type:func +CollisionCheck_AT = 0x800562D0; // type:func +CollisionCheck_GetMassType = 0x800563A0; // type:func +CollisionCheck_SetOCvsOC = 0x800563DC; // type:func +CollisionCheck_OC_JntSphVsJntSph = 0x8005670C; // type:func +CollisionCheck_OC_JntSphVsCyl = 0x800568DC; // type:func +CollisionCheck_OC_CylVsJntSph = 0x80056A3C; // type:func +CollisionCheck_OC_CylVsCyl = 0x80056A68; // type:func +CollisionCheck_SkipOC = 0x80056B38; // type:func +CollisionCheck_Incompatible = 0x80056B5C; // type:func +CollisionCheck_OC = 0x80056BDC; // type:func +CollisionCheck_InitInfo = 0x80056D6C; // type:func +CollisionCheck_ResetDamage = 0x80056DB4; // type:func +CollisionCheck_SetInfoNoDamageTable = 0x80056DE0; // type:func +CollisionCheck_SetInfo = 0x80056E08; // type:func +CollisionCheck_SetInfo2 = 0x80056E34; // type:func +CollisionCheck_SetInfoGetDamageTable = 0x80056E68; // type:func +CollisionCheck_ApplyDamage = 0x80056EA0; // type:func +CollisionCheck_ApplyDamageJntSph = 0x80057060; // type:func +CollisionCheck_ApplyDamageCyl = 0x80057108; // type:func +CollisionCheck_ApplyDamageTris = 0x80057128; // type:func +CollisionCheck_ApplyDamageQuad = 0x800571BC; // type:func +CollisionCheck_Damage = 0x800571DC; // type:func +CollisionCheck_LineOC_JntSph = 0x8005729C; // type:func +CollisionCheck_LineOC_Cyl = 0x800573B4; // type:func +CollisionCheck_LineOC = 0x8005742C; // type:func +CollisionCheck_LineOCCheckAll = 0x80057574; // type:func +CollisionCheck_LineOCCheck = 0x80057598; // type:func +Collider_UpdateCylinder = 0x800575C4; // type:func +Collider_SetCylinderPosition = 0x80057608; // type:func +Collider_SetQuadVertices = 0x80057628; // type:func +Collider_SetTrisVertices = 0x80057698; // type:func +Collider_SetTrisDim = 0x80057758; // type:func +Collider_UpdateSpheres = 0x800577A8; // type:func +CollisionCheck_SpawnRedBlood = 0x8005792C; // type:func +CollisionCheck_SpawnWaterDroplets = 0x80057A8C; // type:func +CollisionCheck_SpawnShieldParticles = 0x80057BE8; // type:func +CollisionCheck_SpawnShieldParticlesMetal = 0x80057C7C; // type:func +CollisionCheck_SpawnShieldParticlesMetalSfx = 0x80057CC8; // type:func +CollisionCheck_SpawnShieldParticlesMetal2 = 0x80057D14; // type:func +CollisionCheck_SpawnShieldParticlesWood = 0x80057D34; // type:func +CollisionCheck_CylSideVsLineSeg = 0x80057DF4; // type:func +CollisionCheck_GetSwordDamage = 0x800584F8; // type:func +SaveContext_Init = 0x80058560; // type:func +Regs_Init = 0x80058610; // type:func +DebugCamera_ScreenText = 0x800586A0; // type:func +DebugCamera_ScreenTextColored = 0x800586B4; // type:func +DebugCamera_DrawScreenText = 0x80058770; // type:func +Debug_DrawText = 0x80058854; // type:func +DebugDisplay_Init = 0x80058920; // type:func +DebugDisplay_AddObject = 0x80058930; // type:func +DebugDisplay_DrawObjects = 0x80058A0C; // type:func +DebugDisplay_DrawSpriteI8 = 0x80058A9C; // type:func +DebugDisplay_DrawPolygon = 0x80058C80; // type:func +Cutscene_InitContext = 0x80058DE0; // type:func +Cutscene_StartManual = 0x80058DF8; // type:func +Cutscene_StopManual = 0x80058E10; // type:func +Cutscene_UpdateManual = 0x80058E34; // type:func +Cutscene_UpdateScripted = 0x80058E80; // type:func +CutsceneHandler_DoNothing = 0x80058F34; // type:func +Cutscene_StepTimer = 0x80058F44; // type:func +CutsceneHandler_StartManual = 0x80058F7C; // type:func +CutsceneHandler_StartScript = 0x80058FDC; // type:func +CutsceneCmd_Misc = 0x80059048; // type:func +CutsceneCmd_SetLightSetting = 0x800597E4; // type:func +CutsceneCmd_StartSequence = 0x80059824; // type:func +CutsceneCmd_StopSequence = 0x80059860; // type:func +CutsceneCmd_FadeOutSequence = 0x8005989C; // type:func +CutsceneCmd_RumbleController = 0x8005991C; // type:func +CutsceneCmd_SetTime = 0x80059960; // type:func +CutsceneCmd_Destination = 0x80059A04; // type:func +CutsceneCmd_Transition = 0x8005B724; // type:func +CutsceneCmd_UpdateCamEyeSpline = 0x8005C104; // type:func +CutsceneCmd_UpdateCamAtSpline = 0x8005C258; // type:func +CutsceneCmd_SetCamEye = 0x8005C3B4; // type:func +CutsceneCmd_SetCamAt = 0x8005C590; // type:func +CutsceneCmd_Text = 0x8005C738; // type:func +Cutscene_ProcessScript = 0x8005CA0C; // type:func +CutsceneHandler_RunScript = 0x8005D3DC; // type:func +CutsceneHandler_StopManual = 0x8005D420; // type:func +CutsceneHandler_StopScript = 0x8005D460; // type:func +Cutscene_SetupScripted = 0x8005D568; // type:func +func_80069048 = 0x8005D6E8; // type:func +func_8006907C = 0x8005D720; // type:func +Cutscene_HandleEntranceTriggers = 0x8005D744; // type:func +Cutscene_HandleConditionalTriggers = 0x8005D864; // type:func +Cutscene_SetScript = 0x8005DA6C; // type:func +MemCpy = 0x8005DAC0; // type:func +MemSet = 0x8005DAF0; // type:func +GetItem_Draw = 0x8005DB50; // type:func +GetItem_DrawMaskOrBombchu = 0x8005DB94; // type:func +GetItem_DrawSoldOut = 0x8005DC30; // type:func +GetItem_DrawBlueFire = 0x8005DCD8; // type:func +GetItem_DrawPoes = 0x8005DE7C; // type:func +GetItem_DrawFairy = 0x8005E078; // type:func +GetItem_DrawMirrorShield = 0x8005E254; // type:func +GetItem_DrawSkullToken = 0x8005E3CC; // type:func +GetItem_DrawEggOrMedallion = 0x8005E534; // type:func +GetItem_DrawCompass = 0x8005E5EC; // type:func +GetItem_DrawPotion = 0x8005E6F4; // type:func +GetItem_DrawGoronSword = 0x8005E8C8; // type:func +GetItem_DrawDekuNuts = 0x8005E9D0; // type:func +GetItem_DrawRecoveryHeart = 0x8005EAE4; // type:func +GetItem_DrawFish = 0x8005EBFC; // type:func +GetItem_DrawOpa0 = 0x8005ED04; // type:func +GetItem_DrawOpa0Xlu1 = 0x8005EDA0; // type:func +GetItem_DrawXlu01 = 0x8005EEA4; // type:func +GetItem_DrawOpa10Xlu2 = 0x8005EF5C; // type:func +GetItem_DrawMagicArrow = 0x8005F078; // type:func +GetItem_DrawMagicSpell = 0x8005F194; // type:func +GetItem_DrawOpa1023 = 0x8005F2E4; // type:func +GetItem_DrawOpa10Xlu32 = 0x8005F3CC; // type:func +GetItem_DrawSmallRupee = 0x8005F500; // type:func +GetItem_DrawScale = 0x8005F650; // type:func +GetItem_DrawBulletBag = 0x8005F7B0; // type:func +GetItem_DrawWallet = 0x8005F8FC; // type:func +SfxSource_InitAll = 0x8005FA50; // type:func +SfxSource_UpdateAll = 0x8005FA80; // type:func +SfxSource_PlaySfxAtFixedWorldPos = 0x8005FB28; // type:func +QuestHint_CheckCondition = 0x8005FC10; // type:func +QuestHint_CheckConditionChain = 0x8005FE8C; // type:func +QuestHint_CheckRandomCondition = 0x8005FF20; // type:func +QuestHint_GetTextIdFromScript = 0x80060100; // type:func +QuestHint_GetSariaTextId = 0x80060244; // type:func +QuestHint_GetNaviTextId = 0x800602AC; // type:func +MaskReaction_GetTextId = 0x800602F0; // type:func +CutsceneFlags_UnsetAll = 0x80060340; // type:func +CutsceneFlags_Set = 0x80060370; // type:func +CutsceneFlags_Unset = 0x800603DC; // type:func +CutsceneFlags_Get = 0x8006044C; // type:func +Curve_CubicHermiteSpline = 0x800604C0; // type:func +Curve_Interpolate = 0x80060558; // type:func +SkelCurve_Clear = 0x80060700; // type:func +SkelCurve_Init = 0x80060730; // type:func +SkelCurve_Destroy = 0x800607E0; // type:func +SkelCurve_SetAnim = 0x80060810; // type:func +SkelCurve_Update = 0x80060848; // type:func +SkelCurve_DrawLimb = 0x80060B38; // type:func +SkelCurve_Draw = 0x80060EC4; // type:func +Horse_CanSpawn = 0x80060F10; // type:func +Horse_ResetHorseData = 0x80060FC4; // type:func +Horse_FixLakeHyliaPosition = 0x80061000; // type:func +Horse_SetupInGameplay = 0x80061040; // type:func +Horse_SetupInCutscene = 0x800614D8; // type:func +Horse_InitPlayerHorse = 0x80061A4C; // type:func +Horse_RotateToPoint = 0x80061B5C; // type:func +Jpeg_ScheduleDecoderTask = 0x80061BF0; // type:func +Jpeg_CopyToZbuffer = 0x80061D2C; // type:func +Jpeg_GetUnalignedU16 = 0x80061E64; // type:func +Jpeg_ParseMarkers = 0x80061EB0; // type:func +Jpeg_Decode = 0x8006207C; // type:func +KaleidoSetup_Update = 0x800623B0; // type:func +KaleidoSetup_Init = 0x8006261C; // type:func +KaleidoSetup_Destroy = 0x80062770; // type:func +Font_LoadCharWide = 0x80062780; // type:func +Font_LoadChar = 0x800627D0; // type:func +Font_LoadMessageBoxIcon = 0x80062848; // type:func +Font_LoadOrderedFont = 0x8006287C; // type:func +Environment_ZBufValToFixedPoint = 0x80062980; // type:func +Environment_GetPixelDepth = 0x800629B8; // type:func +Environment_GraphCallback = 0x800629E4; // type:func +Environment_Init = 0x80062A28; // type:func +Environment_SmoothStepToU8 = 0x80062EF8; // type:func +Environment_SmoothStepToS8 = 0x80063030; // type:func +Environment_LerpWeight = 0x80063170; // type:func +Environment_LerpWeightAccelDecel = 0x800631F4; // type:func +Environment_UpdateStorm = 0x800633B4; // type:func +Environment_UpdateSkybox = 0x800634A8; // type:func +Environment_EnableUnderwaterLights = 0x80063D94; // type:func +Environment_DisableUnderwaterLights = 0x80063E0C; // type:func +Environment_Update = 0x80063E84; // type:func +Environment_DrawSunAndMoon = 0x80065CE0; // type:func +Environment_DrawSunLensFlare = 0x8006653C; // type:func +Environment_DrawLensFlare = 0x80066610; // type:func +Environment_RandCentered = 0x80067268; // type:func +Environment_DrawRain = 0x80067290; // type:func +Environment_ChangeLightSetting = 0x80067838; // type:func +Environment_DrawSkyboxFilters = 0x800678BC; // type:func +Environment_DrawLightningFlash = 0x80067ADC; // type:func +Environment_UpdateLightningStrike = 0x80067B74; // type:func +Environment_AddLightningBolts = 0x80067E7C; // type:func +Environment_DrawLightning = 0x80067EE4; // type:func +Environment_PlaySceneSequence = 0x80068328; // type:func +Environment_PlayTimeBasedSequence = 0x80068518; // type:func +Environment_DrawCustomLensFlare = 0x80068830; // type:func +Environment_InitGameOverLights = 0x800688DC; // type:func +Environment_FadeInGameOverLights = 0x80068AC4; // type:func +Environment_FadeOutGameOverLights = 0x80068D78; // type:func +Environment_UpdateRain = 0x80069094; // type:func +Environment_FillScreen = 0x800690FC; // type:func +Environment_DrawSandstorm = 0x800692F4; // type:func +Environment_AdjustLights = 0x80069D40; // type:func +Environment_GetBgsDayCount = 0x80069F6C; // type:func +Environment_ClearBgsDayCount = 0x80069F7C; // type:func +Environment_GetTotalDays = 0x80069F8C; // type:func +Environment_ForcePlaySequence = 0x80069F9C; // type:func +Environment_IsForcedSequenceDisabled = 0x80069FB4; // type:func +Environment_PlayStormNatureAmbience = 0x80069FDC; // type:func +Environment_StopStormNatureAmbience = 0x8006A03C; // type:func +Environment_WarpSongLeave = 0x8006A09C; // type:func +Lib_MemSet = 0x8006A190; // type:func +Math_CosS = 0x8006A1E4; // type:func +Math_SinS = 0x8006A224; // type:func +Math_ScaledStepToS = 0x8006A264; // type:func +Math_StepToS = 0x8006A334; // type:func +Math_StepToF = 0x8006A3BC; // type:func +Math_StepUntilAngleS = 0x8006A450; // type:func +Math_StepUntilS = 0x8006A4B8; // type:func +Math_StepToAngleS = 0x8006A518; // type:func +Math_StepUntilF = 0x8006A5DC; // type:func +Math_AsymStepToF = 0x8006A62C; // type:func +Lib_GetControlStickData = 0x8006A6D4; // type:func +Rand_S16Offset = 0x8006A750; // type:func +Rand_S16OffsetStride = 0x8006A7A4; // type:func +Math_Vec3f_Copy = 0x8006A80C; // type:func +Math_Vec3s_ToVec3f = 0x8006A82C; // type:func +Math_Vec3f_Sum = 0x8006A870; // type:func +Math_Vec3f_Diff = 0x8006A8A8; // type:func +Math_Vec3s_DiffToVec3f = 0x8006A8E0; // type:func +Math_Vec3f_Scale = 0x8006A93C; // type:func +Math_Vec3f_DistXYZ = 0x8006A978; // type:func +Math_Vec3f_DistXYZAndStoreDiff = 0x8006A9BC; // type:func +Math_Vec3f_DistXZ = 0x8006AA18; // type:func +Math_Vec3f_DiffY = 0x8006AA4C; // type:func +Math_Vec3f_Yaw = 0x8006AA60; // type:func +Math_Vec3f_Pitch = 0x8006AA94; // type:func +Actor_ProcessInitChain = 0x8006AADC; // type:func +IChain_Apply_u8 = 0x8006AB54; // type:func +IChain_Apply_s8 = 0x8006AB70; // type:func +IChain_Apply_u16 = 0x8006AB8C; // type:func +IChain_Apply_s16 = 0x8006ABA8; // type:func +IChain_Apply_u32 = 0x8006ABC4; // type:func +IChain_Apply_s32 = 0x8006ABE0; // type:func +IChain_Apply_f32 = 0x8006ABFC; // type:func +IChain_Apply_f32div1000 = 0x8006AC20; // type:func +IChain_Apply_Vec3f = 0x8006AC50; // type:func +IChain_Apply_Vec3fdiv1000 = 0x8006AC7C; // type:func +IChain_Apply_Vec3s = 0x8006ACB4; // type:func +Math_SmoothStepToF = 0x8006ACD8; // type:func +Math_ApproachF = 0x8006ADE0; // type:func +Math_ApproachZeroF = 0x8006AE50; // type:func +Math_SmoothStepToDegF = 0x8006AEA4; // type:func +Math_SmoothStepToS = 0x8006B068; // type:func +Math_ApproachS = 0x8006B184; // type:func +Color_RGBA8_Copy = 0x8006B228; // type:func +Sfx_PlaySfxCentered = 0x8006B250; // type:func +Sfx_PlaySfxCentered2 = 0x8006B298; // type:func +Sfx_PlaySfxAtPos = 0x8006B2E0; // type:func +Health_InitMeter = 0x8006B330; // type:func +Health_UpdateMeter = 0x8006B40C; // type:func +func_80078E18 = 0x8006B7F0; // type:func +func_80078E34 = 0x8006B810; // type:func +func_80078E84 = 0x8006B860; // type:func +Health_DrawMeter = 0x8006B8F8; // type:func +Health_UpdateBeatingHeart = 0x8006C570; // type:func +Health_IsCritical = 0x8006C65C; // type:func +Lights_PointSetInfo = 0x8006C6D0; // type:func +Lights_PointNoGlowSetInfo = 0x8006C72C; // type:func +Lights_PointGlowSetInfo = 0x8006C790; // type:func +Lights_PointSetColorAndRadius = 0x8006C7F8; // type:func +Lights_DirectionalSetInfo = 0x8006C82C; // type:func +Lights_Reset = 0x8006C884; // type:func +Lights_Draw = 0x8006C8C0; // type:func +Lights_FindSlot = 0x8006CA04; // type:func +Lights_BindPoint = 0x8006CA34; // type:func +Lights_BindDirectional = 0x8006CD90; // type:func +Lights_BindAll = 0x8006CDF8; // type:func +Lights_FindBufSlot = 0x8006CE94; // type:func +Lights_FreeNode = 0x8006CF20; // type:func +LightContext_Init = 0x8006CF98; // type:func +LightContext_SetAmbientColor = 0x8006D004; // type:func +LightContext_SetFog = 0x8006D030; // type:func +LightContext_NewLights = 0x8006D06C; // type:func +LightContext_InitList = 0x8006D0A4; // type:func +LightContext_DestroyList = 0x8006D0B4; // type:func +LightContext_InsertLight = 0x8006D110; // type:func +LightContext_RemoveLight = 0x8006D170; // type:func +Lights_NewAndDraw = 0x8006D1D4; // type:func +Lights_New = 0x8006D31C; // type:func +Lights_GlowCheck = 0x8006D364; // type:func +Lights_DrawGlow = 0x8006D568; // type:func +ZeldaArena_Malloc = 0x8006D770; // type:func +ZeldaArena_MallocR = 0x8006D798; // type:func +ZeldaArena_Realloc = 0x8006D7C0; // type:func +ZeldaArena_Free = 0x8006D7F0; // type:func +ZeldaArena_Calloc = 0x8006D818; // type:func +ZeldaArena_GetSizes = 0x8006D870; // type:func +ZeldaArena_Check = 0x8006D8A8; // type:func +ZeldaArena_Init = 0x8006D8CC; // type:func +ZeldaArena_Cleanup = 0x8006D8FC; // type:func +ZeldaArena_IsInitialized = 0x8006D920; // type:func +MapMark_Init = 0x8006D950; // type:func +MapMark_ClearPointers = 0x8006D9FC; // type:func +MapMark_DrawForDungeon = 0x8006DA18; // type:func +MapMark_Draw = 0x8006DF08; // type:func +PreNmiBuff_Init = 0x8006DF50; // type:func +PreNmiBuff_SetReset = 0x8006DFC8; // type:func +PreNmiBuff_IsResetting = 0x8006DFFC; // type:func +Sched_FlushTaskQueue = 0x8006E010; // type:func +OLib_Vec3fDist = 0x8006E090; // type:func +OLib_Vec3fDistOutDiff = 0x8006E0D4; // type:func +OLib_Vec3fDistXZ = 0x8006E130; // type:func +OLib_ClampMinDist = 0x8006E164; // type:func +OLib_ClampMaxDist = 0x8006E1B4; // type:func +OLib_Vec3fDistNormalize = 0x8006E204; // type:func +OLib_VecSphToVec3f = 0x8006E2B4; // type:func +OLib_VecGeoToVec3f = 0x8006E360; // type:func +OLib_Vec3fToVecSph = 0x8006E3A4; // type:func +OLib_Vec3fToVecGeo = 0x8006E4F8; // type:func +OLib_Vec3fDiffToVecSph = 0x8006E540; // type:func +OLib_Vec3fDiffToVecGeo = 0x8006E594; // type:func +OLib_Vec3fDiffRad = 0x8006E5E8; // type:func +OLib_Vec3fDiffDegF = 0x8006E678; // type:func +OLib_Vec3fDiffBinAng = 0x8006E6E0; // type:func +OnePointCutscene_AddVecGeoToVec3f = 0x8006E780; // type:func +OnePointCutscene_Vec3fYaw = 0x8006E800; // type:func +OnePointCutscene_Vec3sToVec3f = 0x8006E868; // type:func +OnePointCutscene_BgCheckLineTest = 0x8006E8AC; // type:func +OnePointCutscene_RaycastDown = 0x8006E8FC; // type:func +OnePointCutscene_SetCsCamPoints = 0x8006E924; // type:func +OnePointCutscene_SetInfo = 0x8006E958; // type:func +OnePointCutscene_SetAsChild = 0x80072094; // type:func +OnePointCutscene_RemoveCamera = 0x800720DC; // type:func +OnePointCutscene_Init = 0x800721B0; // type:func +OnePointCutscene_EndCutscene = 0x80072468; // type:func +OnePointCutscene_Attention = 0x800724C4; // type:func +OnePointCutscene_AttentionSetSfx = 0x80072630; // type:func +OnePointCutscene_EnableAttention = 0x80072684; // type:func +OnePointCutscene_DisableAttention = 0x80072694; // type:func +OnePointCutscene_CheckForCategory = 0x800726A8; // type:func +OnePointCutscene_Noop = 0x80072708; // type:func +Map_SavePlayerInitialInfo = 0x80072720; // type:func +Map_SetPaletteData = 0x80072780; // type:func +Map_SetFloorPalettesData = 0x800727FC; // type:func +Map_InitData = 0x800729B4; // type:func +Map_InitRoomData = 0x80072C70; // type:func +Map_Destroy = 0x80072D4C; // type:func +Map_Init = 0x80072D74; // type:func +Minimap_DrawCompassIcons = 0x80072FFC; // type:func +Minimap_Draw = 0x80073450; // type:func +Map_GetFloorTextIndexOffset = 0x80073F6C; // type:func +Map_Update = 0x80073F94; // type:func +Interface_ChangeHudVisibilityMode = 0x800742C0; // type:func +Interface_RaiseButtonAlphas = 0x800742F0; // type:func +Interface_DimButtonAlphas = 0x80074434; // type:func +Interface_UpdateHudAlphas = 0x800744F8; // type:func +func_80083108 = 0x80074BF4; // type:func +Interface_SetSceneRestrictions = 0x800759A0; // type:func +Gfx_TextureIA8 = 0x80075AF0; // type:func +Gfx_TextureI8 = 0x80075D08; // type:func +Inventory_SwapAgeEquipment = 0x80075F20; // type:func +Interface_InitHorsebackArchery = 0x8007620C; // type:func +func_800849EC = 0x8007624C; // type:func +Interface_LoadItemIcon1 = 0x800762C8; // type:func +Interface_LoadItemIcon2 = 0x80076368; // type:func +func_80084BF4 = 0x80076408; // type:func +Item_Give = 0x800764FC; // type:func +Item_CheckObtainability = 0x80077A34; // type:func +Inventory_DeleteItem = 0x80077E30; // type:func +Inventory_ReplaceItem = 0x80077EC0; // type:func +Inventory_HasEmptyBottle = 0x80077F68; // type:func +Inventory_HasSpecificBottle = 0x80077FA4; // type:func +Inventory_UpdateBottleItem = 0x80077FE0; // type:func +Inventory_ConsumeFairy = 0x80078094; // type:func +func_80086D5C = 0x8007817C; // type:func +Interface_LoadActionLabel = 0x800781B0; // type:func +Interface_SetDoAction = 0x80078304; // type:func +Interface_SetNaviCall = 0x8007837C; // type:func +Interface_LoadActionLabelB = 0x8007846C; // type:func +Health_ChangeBy = 0x80078534; // type:func +Health_GiveHearts = 0x80078620; // type:func +Rupees_ChangeBy = 0x80078640; // type:func +Inventory_ChangeAmmo = 0x80078660; // type:func +Magic_Fill = 0x8007891C; // type:func +Magic_Reset = 0x8007895C; // type:func +Magic_RequestChange = 0x80078998; // type:func +Magic_Update = 0x80078BB0; // type:func +Magic_DrawMeter = 0x80079470; // type:func +Interface_SetSubTimer = 0x80079C6C; // type:func +Interface_SetSubTimerToFinalSecond = 0x80079CB4; // type:func +Interface_SetTimer = 0x80079CF0; // type:func +Interface_DrawActionLabel = 0x80079D38; // type:func +Interface_DrawItemButtons = 0x80079E3C; // type:func +Interface_DrawItemIconTexture = 0x8007ACD4; // type:func +Interface_DrawAmmoCount = 0x8007AED0; // type:func +Interface_DrawActionButton = 0x8007B374; // type:func +Interface_InitVertices = 0x8007B578; // type:func +func_8008A8B8 = 0x8007B870; // type:func +func_8008A994 = 0x8007B954; // type:func +Interface_Draw = 0x8007B99C; // type:func +Interface_Update = 0x8007E538; // type:func +Path_GetByIndex = 0x8007F020; // type:func +Path_OrientAndGetDistSq = 0x8007F064; // type:func +Path_CopyLastPoint = 0x8007F150; // type:func +FrameAdvance_Init = 0x8007F1F0; // type:func +FrameAdvance_Update = 0x8007F200; // type:func +Player_SetBootData = 0x8007F2A0; // type:func +Player_InBlockingCsMode = 0x8007F42C; // type:func +Player_InCsMode = 0x8007F4DC; // type:func +Player_CheckHostileLockOn = 0x8007F518; // type:func +Player_IsChildWithHylianShield = 0x8007F528; // type:func +Player_ActionToModelGroup = 0x8007F550; // type:func +Player_SetModelsForHoldingShield = 0x8007F59C; // type:func +Player_SetModels = 0x8007F688; // type:func +Player_SetModelGroup = 0x8007F760; // type:func +func_8008EC70 = 0x8007F7CC; // type:func +Player_SetEquipmentData = 0x8007F804; // type:func +Player_UpdateBottleHeld = 0x8007F8F4; // type:func +Player_ReleaseLockOn = 0x8007F948; // type:func +Player_ClearZTargeting = 0x8007F964; // type:func +Player_SetAutoLockOnActor = 0x8007FA08; // type:func +func_8008EF30 = 0x8007FA8C; // type:func +func_8008EF44 = 0x8007FAA4; // type:func +Player_IsBurningStickInRange = 0x8007FAC0; // type:func +Player_GetStrength = 0x8007FB98; // type:func +Player_GetMask = 0x8007FBE4; // type:func +Player_UnsetMask = 0x8007FBF4; // type:func +Player_HasMirrorShieldEquipped = 0x8007FC04; // type:func +Player_HasMirrorShieldSetToDraw = 0x8007FC1C; // type:func +Player_ActionToMagicSpell = 0x8007FC48; // type:func +Player_HoldsHookshot = 0x8007FC74; // type:func +func_8008F128 = 0x8007FC98; // type:func +Player_ActionToMeleeWeapon = 0x8007FCCC; // type:func +Player_GetMeleeWeaponHeld = 0x8007FCF4; // type:func +Player_HoldsTwoHandedWeapon = 0x8007FD18; // type:func +Player_HoldsBrokenKnife = 0x8007FD44; // type:func +Player_ActionToBottle = 0x8007FD9C; // type:func +Player_GetBottleHeld = 0x8007FDC8; // type:func +Player_ActionToExplosive = 0x8007FDE8; // type:func +Player_GetExplosiveHeld = 0x8007FE14; // type:func +func_8008F2BC = 0x8007FE34; // type:func +Player_GetEnvironmentalHazard = 0x8007FE70; // type:func +Player_DrawImpl = 0x8007FFE8; // type:func +func_8008F87C = 0x800803AC; // type:func +Player_OverrideLimbDrawGameplayCommon = 0x800807F8; // type:func +Player_OverrideLimbDrawGameplayDefault = 0x80080B4C; // type:func +Player_OverrideLimbDrawGameplayFirstPerson = 0x80080E38; // type:func +Player_OverrideLimbDrawGameplayCrawling = 0x80080F88; // type:func +func_80090480 = 0x80080FCC; // type:func +Player_UpdateShieldCollider = 0x80081154; // type:func +func_800906D4 = 0x80081228; // type:func +Player_DrawGetItemImpl = 0x80081338; // type:func +Player_DrawGetItem = 0x800814CC; // type:func +func_80090A28 = 0x80081544; // type:func +Player_DrawHookshotReticle = 0x80081618; // type:func +Player_PostLimbDrawGameplay = 0x800817FC; // type:func +Player_InitPauseDrawData = 0x80082164; // type:func +Player_OverrideLimbDrawPause = 0x80082290; // type:func +Player_DrawPauseImpl = 0x80082434; // type:func +Player_DrawPause = 0x80082B38; // type:func +func_80092320 = 0x80082D10; // type:func +PreNMI_Update = 0x80082D24; // type:func +PreNMI_Draw = 0x80082D6C; // type:func +PreNMI_Main = 0x80082E28; // type:func +PreNMI_Destroy = 0x80082E5C; // type:func +PreNMI_Init = 0x80082E68; // type:func +Quake_AddVecGeoToVec3f = 0x80082EB0; // type:func +Quake_UpdateShakeInfo = 0x80082F30; // type:func +Quake_CallbackType1 = 0x80083158; // type:func +Quake_CallbackType5 = 0x800831E0; // type:func +Quake_CallbackType6 = 0x80083254; // type:func +Quake_CallbackType3 = 0x800832D8; // type:func +Quake_CallbackType2 = 0x80083370; // type:func +Quake_CallbackType4 = 0x800833E0; // type:func +Quake_GetFreeIndex = 0x80083478; // type:func +Quake_RequestImpl = 0x800834DC; // type:func +Quake_Remove = 0x80083594; // type:func +Quake_GetRequest = 0x800835BC; // type:func +Quake_SetValue = 0x80083618; // type:func +Quake_SetSpeed = 0x80083748; // type:func +Quake_SetDuration = 0x80083790; // type:func +Quake_GetTimeLeft = 0x800837E0; // type:func +Quake_SetPerturbations = 0x80083818; // type:func +Quake_SetOrientation = 0x80083880; // type:func +Quake_Init = 0x800838E8; // type:func +Quake_Request = 0x8008393C; // type:func +Quake_RemoveRequest = 0x80083960; // type:func +Quake_Update = 0x800839A8; // type:func +Gfx_SetFog = 0x80083D20; // type:func +Gfx_SetFogWithSync = 0x80083E9C; // type:func +Gfx_SetFog2 = 0x8008402C; // type:func +Gfx_SetupDLImpl = 0x80084060; // type:func +Gfx_SetupDL = 0x8008409C; // type:func +Gfx_SetupDLAtPtr = 0x800840BC; // type:func +Gfx_SetupDL_57 = 0x800840E8; // type:func +Gfx_SetupDL_57b = 0x80084110; // type:func +Gfx_SetupDL_52NoCD = 0x80084138; // type:func +Gfx_SetupDL_58Opa = 0x8008417C; // type:func +Gfx_SetupDL_57Opa = 0x800841A4; // type:func +Gfx_SetupDL_50Opa = 0x800841CC; // type:func +Gfx_SetupDL_51Opa = 0x800841F4; // type:func +Gfx_SetupDL_52Xlu = 0x8008421C; // type:func +Gfx_SetupDL_53Opa = 0x80084244; // type:func +Gfx_SetupDL_54Opa = 0x8008426C; // type:func +Gfx_SetupDL_55Xlu = 0x80084294; // type:func +Gfx_SetupDL_26Opa = 0x800842BC; // type:func +Gfx_SetupDL_25Xlu2 = 0x800842E4; // type:func +func_80093C80 = 0x8008430C; // type:func +Gfx_SetupDL_25Opa = 0x80084378; // type:func +Gfx_SetupDL_25Xlu = 0x800843A0; // type:func +Gfx_SetupDL_31Opa = 0x800843C8; // type:func +Gfx_SetupDL_32Opa = 0x800843F0; // type:func +Gfx_SetupDL_33Opa = 0x80084418; // type:func +Gfx_SetupDL_64 = 0x80084440; // type:func +Gfx_SetupDL_34 = 0x80084468; // type:func +Gfx_SetupDL_34Opa = 0x80084490; // type:func +Gfx_SetupDL_35Opa = 0x800844BC; // type:func +Gfx_SetupDL_44Xlu = 0x800844E4; // type:func +Gfx_SetupDL_36Opa = 0x8008450C; // type:func +Gfx_SetupDL_28 = 0x80084534; // type:func +Gfx_SetupDL_28Opa = 0x8008455C; // type:func +Gfx_SetupDL_43Opa = 0x80084584; // type:func +Gfx_SetupDL_45Opa = 0x800845AC; // type:func +Gfx_SetupDL_46Overlay = 0x800845D4; // type:func +Gfx_SetupDL_38Xlu = 0x800845FC; // type:func +Gfx_SetupDL_4Xlu = 0x80084624; // type:func +Gfx_SetupDL_37Opa = 0x8008464C; // type:func +Gfx_SetupDL_2Opa = 0x80084674; // type:func +Gfx_SetupDL_39 = 0x8008469C; // type:func +Gfx_SetupDL_39Opa = 0x800846C4; // type:func +Gfx_SetupDL_39Overlay = 0x800846F0; // type:func +Gfx_SetupDL_39Ptr = 0x8008471C; // type:func +Gfx_SetupDL_40Opa = 0x80084748; // type:func +Gfx_SetupDL_41Opa = 0x80084770; // type:func +Gfx_SetupDL_47Xlu = 0x80084798; // type:func +Gfx_SetupDL_66 = 0x800847C0; // type:func +Gfx_SetupDL_67 = 0x800847E8; // type:func +Gfx_SetupDL_68NoCD = 0x80084810; // type:func +Gfx_SetupDL_69NoCD = 0x80084854; // type:func +func_800947AC = 0x80084898; // type:func +Gfx_SetupDL_70 = 0x800848DC; // type:func +Gfx_SetupDL_20NoCD = 0x80084904; // type:func +Gfx_SetupDL_42Opa = 0x80084948; // type:func +Gfx_SetupDL_42Overlay = 0x80084970; // type:func +Gfx_SetupDL_48Opa = 0x80084998; // type:func +Gfx_SetupDL_49Xlu = 0x800849C0; // type:func +Gfx_SetupDL_27Xlu = 0x800849E8; // type:func +Gfx_SetupDL_60NoCDXlu = 0x80084A10; // type:func +Gfx_SetupDL_61Xlu = 0x80084A58; // type:func +Gfx_SetupDL_56Opa = 0x80084A80; // type:func +Gfx_SetupDL_56Ptr = 0x80084AA8; // type:func +Gfx_SetupDL_59Opa = 0x80084AD4; // type:func +Gfx_BranchTexScroll = 0x80084AFC; // type:func +func_80094E54 = 0x80084BA0; // type:func +func_80094E78 = 0x80084BC4; // type:func +Gfx_TexScroll = 0x80084BE8; // type:func +Gfx_TwoTexScroll = 0x80084C6C; // type:func +Gfx_TwoTexScrollEnvColor = 0x80084D8C; // type:func +Gfx_EnvColor = 0x80084EEC; // type:func +Gfx_SetupFrame = 0x80084F44; // type:func +func_80095974 = 0x800854FC; // type:func +func_80095AA0 = 0x800855E0; // type:func +Room_DrawNormal = 0x800855F8; // type:func +Room_DrawCullable = 0x80085814; // type:func +Room_DecodeJpeg = 0x80085CDC; // type:func +Room_DrawBackground2D = 0x80085D64; // type:func +Room_DrawImageSingle = 0x80086060; // type:func +Room_GetImageMultiBgEntry = 0x80086430; // type:func +Room_DrawImageMulti = 0x8008651C; // type:func +Room_DrawImage = 0x800868EC; // type:func +Room_Init = 0x80086954; // type:func +Room_SetupFirstRoom = 0x8008696C; // type:func +Room_RequestNewRoom = 0x80086B08; // type:func +Room_ProcessRoomRequest = 0x80086C40; // type:func +Room_Draw = 0x80086CE4; // type:func +Room_FinishRoomChange = 0x80086D34; // type:func +Sample_HandleStateChange = 0x80086DD0; // type:func +Sample_Draw = 0x80086E04; // type:func +Sample_Main = 0x80086FF0; // type:func +Sample_Destroy = 0x8008701C; // type:func +Sample_SetupView = 0x80087028; // type:func +Sample_LoadTitleStatic = 0x800870E0; // type:func +Sample_Init = 0x80087140; // type:func +Inventory_ChangeEquipment = 0x800871D0; // type:func +Inventory_DeleteEquipment = 0x80087228; // type:func +Inventory_ChangeUpgrade = 0x80087334; // type:func +Object_SpawnPersistent = 0x80087390; // type:func +Object_InitContext = 0x80087474; // type:func +Object_UpdateEntries = 0x800875D0; // type:func +Object_GetSlot = 0x800876C8; // type:func +Object_IsLoaded = 0x80087728; // type:func +func_800981B8 = 0x80087758; // type:func +func_800982FC = 0x800877E0; // type:func +Scene_ExecuteCommands = 0x80087840; // type:func +Scene_CommandPlayerEntryList = 0x800878C4; // type:func +Scene_CommandActorEntryList = 0x800879A0; // type:func +Scene_CommandUnused2 = 0x800879F8; // type:func +Scene_CommandCollisionHeader = 0x80087A40; // type:func +Scene_CommandRoomList = 0x80087B70; // type:func +Scene_CommandSpawnList = 0x80087BC8; // type:func +Scene_CommandSpecialFiles = 0x80087C10; // type:func +Scene_CommandRoomBehavior = 0x80087CD8; // type:func +Scene_CommandRoomShape = 0x80087D30; // type:func +Scene_CommandObjectList = 0x80087D78; // type:func +Scene_CommandLightList = 0x80087F2C; // type:func +Scene_CommandPathList = 0x80087FDC; // type:func +Scene_CommandTransitionActorEntryList = 0x80088024; // type:func +Scene_ResetTransitionActorList = 0x8008807C; // type:func +Scene_CommandLightSettingsList = 0x8008808C; // type:func +Scene_CommandSkyboxSettings = 0x800880E4; // type:func +Scene_CommandSkyboxDisables = 0x80088128; // type:func +Scene_CommandTimeSettings = 0x80088150; // type:func +Scene_CommandWindSettings = 0x80088464; // type:func +Scene_CommandExitList = 0x800884C8; // type:func +Scene_CommandUndefined9 = 0x80088510; // type:func +Scene_CommandSoundSettings = 0x80088520; // type:func +Scene_CommandEchoSettings = 0x8008856C; // type:func +Scene_CommandAlternateHeaderList = 0x80088584; // type:func +Scene_CommandCutsceneData = 0x80088680; // type:func +Scene_CommandMiscSettings = 0x800886C0; // type:func +Scene_SetTransitionForNextEntrance = 0x80088784; // type:func +Scene_DrawConfigDefault = 0x80088840; // type:func +Scene_DrawConfigDekuTree = 0x80088880; // type:func +Scene_DrawConfigDekuTreeBoss = 0x800889C8; // type:func +Scene_DrawConfigDodongosCavern = 0x80088AAC; // type:func +Scene_DrawConfigTempleOfTime = 0x80088DD4; // type:func +Scene_DrawConfigGrottos = 0x800895EC; // type:func +Scene_DrawConfigChamberOfTheSages = 0x800898FC; // type:func +Scene_DrawConfigGreatFairyFountain = 0x80089B20; // type:func +Scene_DrawConfigGraveExitLightShining = 0x80089CB8; // type:func +Scene_DrawConfigFairysFountain = 0x80089D90; // type:func +Scene_DrawConfigShadowTempleAndWell = 0x80089EF4; // type:func +Scene_DrawConfigThievesHideout = 0x8008A080; // type:func +Scene_DrawConfigWaterTemple = 0x8008A168; // type:func +Scene_DrawConfigWaterTempleBoss = 0x8008A8D8; // type:func +Scene_DrawConfigShootingGallery = 0x8008A9F8; // type:func +Scene_DrawConfigCastleCourtyardGuards = 0x8008AAAC; // type:func +Scene_DrawConfigOutsideGanonsCastle = 0x8008AC24; // type:func +func_8009BEEC = 0x8008AEC0; // type:func +Scene_DrawConfigGanonsTowerCollapseExterior = 0x8008B080; // type:func +Scene_DrawConfigIceCavern = 0x8008B38C; // type:func +Scene_DrawConfigRoyalFamilysTomb = 0x8008B57C; // type:func +Scene_DrawConfigLakesideLaboratory = 0x8008B800; // type:func +Scene_DrawConfigCalmWater = 0x8008B9E0; // type:func +Scene_DrawConfigGerudoTrainingGround = 0x8008BAE8; // type:func +Gfx_TwoTexScrollPrimColor = 0x8008BCD8; // type:func +Scene_DrawConfigFishingPond = 0x8008BE38; // type:func +Scene_DrawConfigBombchuBowlingAlley = 0x8008BF64; // type:func +Scene_DrawConfigLonLonBuildings = 0x8008C168; // type:func +Scene_DrawConfigMarketGuardHouse = 0x8008C238; // type:func +Scene_DrawConfigPotionShopGranny = 0x8008C368; // type:func +Scene_DrawConfigForestTemple = 0x8008C4E0; // type:func +Scene_DrawConfigSpiritTemple = 0x8008C6D0; // type:func +Scene_DrawConfigHyruleField = 0x8008C740; // type:func +Scene_DrawConfigKakarikoVillage = 0x8008CA3C; // type:func +Scene_DrawConfigZorasRiver = 0x8008CB0C; // type:func +Scene_DrawConfigKokiriForest = 0x8008CD24; // type:func +Scene_DrawConfigLakeHylia = 0x8008D188; // type:func +Scene_DrawConfigZorasDomain = 0x8008D348; // type:func +Scene_DrawConfigZorasFountain = 0x8008D4A4; // type:func +Scene_DrawConfigGerudoValley = 0x8008D694; // type:func +Scene_DrawConfigLostWoods = 0x8008D9D0; // type:func +Scene_DrawConfigDesertColossus = 0x8008DBCC; // type:func +Scene_DrawConfigGerudosFortress = 0x8008DCD8; // type:func +Scene_DrawConfigHauntedWasteland = 0x8008DD48; // type:func +Scene_DrawConfigHyruleCastle = 0x8008DEC0; // type:func +Scene_DrawConfigDeathMountainTrail = 0x8008E064; // type:func +Scene_DrawConfigDeathMountainCrater = 0x8008E228; // type:func +Scene_DrawConfigGoronCity = 0x8008E3F4; // type:func +Scene_DrawConfigLonLonRanch = 0x8008E564; // type:func +Scene_DrawConfigFireTemple = 0x8008E634; // type:func +Scene_DrawConfigJabuJabu = 0x8008E7D8; // type:func +Scene_DrawConfigInsideGanonsCastle = 0x8008EC84; // type:func +Scene_DrawConfigInsideGanonsCastleCollapse = 0x8008EE88; // type:func +Scene_DrawConfigGanonsTowerCollapseInterior = 0x8008EEA8; // type:func +Scene_DrawConfigBesitu = 0x8008EEC8; // type:func +Scene_Draw = 0x8008F000; // type:func +SkelAnime_DrawLimbLod = 0x8008F040; // type:func +SkelAnime_DrawLod = 0x8008F2A8; // type:func +SkelAnime_DrawFlexLimbLod = 0x8008F498; // type:func +SkelAnime_DrawFlexLod = 0x8008F728; // type:func +SkelAnime_DrawLimbOpa = 0x8008F9A0; // type:func +SkelAnime_DrawOpa = 0x8008FBEC; // type:func +SkelAnime_DrawFlexLimbOpa = 0x8008FDCC; // type:func +SkelAnime_DrawFlexOpa = 0x80090044; // type:func +SkelAnime_GetFrameData = 0x800902A8; // type:func +Animation_GetLength = 0x80090410; // type:func +Animation_GetLastFrame = 0x8009044C; // type:func +SkelAnime_DrawLimb = 0x80090494; // type:func +SkelAnime_Draw = 0x800906D4; // type:func +SkelAnime_DrawFlexLimb = 0x800908C4; // type:func +SkelAnime_DrawFlex = 0x80090B54; // type:func +SkelAnime_GetFrameDataLegacy = 0x80090DBC; // type:func +Animation_GetLimbCountLegacy = 0x800911C0; // type:func +Animation_GetLengthLegacy = 0x800911FC; // type:func +Animation_GetLastFrameLegacy = 0x80091238; // type:func +SkelAnime_InterpFrameTable = 0x80091280; // type:func +AnimTaskQueue_Reset = 0x80091700; // type:func +AnimTaskQueue_SetNextGroup = 0x8009170C; // type:func +AnimTaskQueue_DisableTransformTasksForGroup = 0x8009172C; // type:func +AnimTaskQueue_NewTask = 0x80091754; // type:func +AnimTaskQueue_AddLoadPlayerFrame = 0x8009178C; // type:func +AnimTaskQueue_AddCopy = 0x80091888; // type:func +AnimTaskQueue_AddInterp = 0x800918F0; // type:func +AnimTaskQueue_AddCopyUsingMap = 0x80091960; // type:func +AnimTaskQueue_AddCopyUsingMapInverted = 0x800919D0; // type:func +AnimTaskQueue_AddActorMovement = 0x80091A40; // type:func +AnimTask_LoadPlayerFrame = 0x80091A9C; // type:func +AnimTask_Copy = 0x80091ACC; // type:func +AnimTask_Interp = 0x80091B3C; // type:func +AnimTask_CopyUsingMap = 0x80091B98; // type:func +AnimTask_CopyUsingMapInverted = 0x80091C18; // type:func +AnimTask_ActorMovement = 0x80091C9C; // type:func +AnimTaskQueue_Update = 0x80091D30; // type:func +SkelAnime_InitLink = 0x80091DD0; // type:func +LinkAnimation_SetUpdateFunction = 0x80091F34; // type:func +LinkAnimation_Update = 0x80091F6C; // type:func +LinkAnimation_Morph = 0x80091F90; // type:func +LinkAnimation_AnimateFrame = 0x8009204C; // type:func +LinkAnimation_Loop = 0x80092128; // type:func +LinkAnimation_Once = 0x800921C8; // type:func +Animation_SetMorph = 0x800922A4; // type:func +LinkAnimation_Change = 0x800922C8; // type:func +LinkAnimation_PlayOnce = 0x80092440; // type:func +LinkAnimation_PlayOnceSetSpeed = 0x800924A0; // type:func +LinkAnimation_PlayLoop = 0x80092504; // type:func +LinkAnimation_PlayLoopSetSpeed = 0x80092560; // type:func +LinkAnimation_CopyJointToMorph = 0x800925C0; // type:func +LinkAnimation_CopyMorphToJoint = 0x800925F0; // type:func +LinkAnimation_LoadToMorph = 0x80092620; // type:func +LinkAnimation_LoadToJoint = 0x80092664; // type:func +LinkAnimation_InterpJointMorph = 0x800926A8; // type:func +LinkAnimation_BlendToJoint = 0x800926E0; // type:func +LinkAnimation_BlendToMorph = 0x80092780; // type:func +LinkAnimation_EndLoop = 0x80092820; // type:func +Animation_OnFrameImpl = 0x80092844; // type:func +LinkAnimation_OnFrame = 0x800928FC; // type:func +SkelAnime_Init = 0x8009294C; // type:func +SkelAnime_InitFlex = 0x80092A50; // type:func +SkelAnime_InitSkin = 0x80092B5C; // type:func +SkelAnime_SetUpdate = 0x80092C3C; // type:func +SkelAnime_Update = 0x80092C88; // type:func +SkelAnime_Morph = 0x80092CAC; // type:func +SkelAnime_MorphTaper = 0x80092D6C; // type:func +SkelAnime_AnimateFrame = 0x80092EF4; // type:func +SkelAnime_LoopFull = 0x8009303C; // type:func +SkelAnime_LoopPartial = 0x800930DC; // type:func +SkelAnime_Once = 0x80093184; // type:func +Animation_ChangeImpl = 0x80093288; // type:func +Animation_Change = 0x80093444; // type:func +Animation_PlayOnce = 0x8009348C; // type:func +Animation_MorphToPlayOnce = 0x800934E4; // type:func +Animation_PlayOnceSetSpeed = 0x80093540; // type:func +Animation_PlayLoop = 0x8009359C; // type:func +Animation_MorphToLoop = 0x800935F0; // type:func +Animation_PlayLoopSetSpeed = 0x80093628; // type:func +Animation_EndLoop = 0x80093680; // type:func +Animation_Reverse = 0x800936AC; // type:func +SkelAnime_CopyFrameTableTrue = 0x800936D0; // type:func +SkelAnime_CopyFrameTableFalse = 0x80093738; // type:func +SkelAnime_UpdateTranslation = 0x800937A4; // type:func +Animation_OnFrame = 0x80093970; // type:func +SkelAnime_Free = 0x80093998; // type:func +SkelAnime_CopyFrameTable = 0x800939E4; // type:func +Skin_UpdateVertices = 0x80093A30; // type:func +Skin_ApplyLimbModifications = 0x80093BFC; // type:func +Skin_DrawAnimatedLimb = 0x80094068; // type:func +Skin_DrawLimb = 0x80094144; // type:func +Skin_DrawImpl = 0x8009426C; // type:func +func_800A6330 = 0x80094498; // type:func +func_800A6360 = 0x800944C8; // type:func +func_800A6394 = 0x800944FC; // type:func +func_800A63CC = 0x80094534; // type:func +Skin_GetLimbPos = 0x80094570; // type:func +Skin_InitAnimatedLimb = 0x800945D0; // type:func +Skin_Init = 0x800947AC; // type:func +Skin_Free = 0x8009497C; // type:func +func_800A698C = 0x80094A50; // type:func +Skin_ApplyAnimTransformations = 0x80094B8C; // type:func +SkinMatrix_Vec3fMtxFMultXYZW = 0x80094EE0; // type:func +SkinMatrix_Vec3fMtxFMultXYZ = 0x80094FC8; // type:func +SkinMatrix_MtxFMtxFMult = 0x80095078; // type:func +SkinMatrix_GetClear = 0x800953D4; // type:func +SkinMatrix_Clear = 0x800953E8; // type:func +SkinMatrix_MtxFCopy = 0x80095440; // type:func +SkinMatrix_Invert = 0x800954C8; // type:func +SkinMatrix_SetScale = 0x80095768; // type:func +SkinMatrix_SetRotateZYX = 0x800957CC; // type:func +SkinMatrix_SetRotateYXZ = 0x8009595C; // type:func +SkinMatrix_SetTranslate = 0x80095AEC; // type:func +SkinMatrix_SetTranslateRotateZYXScale = 0x80095B50; // type:func +SkinMatrix_SetTranslateRotateYXZScale = 0x80095BD4; // type:func +SkinMatrix_SetTranslateRotateZYX = 0x80095C58; // type:func +SkinMatrix_Vec3fToVec3s = 0x80095CB8; // type:func +SkinMatrix_Vec3sToVec3f = 0x80095CFC; // type:func +SkinMatrix_MtxFToMtx = 0x80095D40; // type:func +SkinMatrix_MtxFToNewMtx = 0x80095F58; // type:func +SkinMatrix_SetRotateAxis = 0x80095FA0; // type:func +func_800A8030 = 0x80096110; // type:func +Sram_InitNewSave = 0x800962D0; // type:func +Sram_InitDebugSave = 0x80096420; // type:func +Sram_OpenSave = 0x800965E8; // type:func +Sram_WriteSave = 0x80096934; // type:func +Sram_VerifyAndLoadAllSaves = 0x80096A78; // type:func +Sram_InitSave = 0x80096F04; // type:func +Sram_EraseSave = 0x800971CC; // type:func +Sram_CopySave = 0x800972E0; // type:func +Sram_WriteSramHeader = 0x80097504; // type:func +Sram_InitSram = 0x80097530; // type:func +Sram_Alloc = 0x800975F4; // type:func +Sram_Init = 0x80097624; // type:func +SsSram_Init = 0x80097630; // type:func +SsSram_Dma = 0x80097708; // type:func +SsSram_ReadWrite = 0x80097794; // type:func +Rumble_Update = 0x80097800; // type:func +Rumble_Override = 0x8009783C; // type:func +Rumble_Request = 0x800978D8; // type:func +Rumble_Init = 0x80097994; // type:func +Rumble_Destroy = 0x800979D0; // type:func +Rumble_Controller1HasRumblePak = 0x80097A28; // type:func +Rumble_Reset = 0x80097A40; // type:func +Rumble_ClearRequests = 0x80097A54; // type:func +Rumble_SetUpdateEnabled = 0x80097A64; // type:func +View_ViewportToVp = 0x80097A80; // type:func +View_New = 0x80097AEC; // type:func +View_Free = 0x80097B38; // type:func +View_Init = 0x80097B58; // type:func +View_LookAt = 0x80097C18; // type:func +View_LookAtUnsafe = 0x80097CB4; // type:func +View_SetScale = 0x80097D04; // type:func +View_GetScale = 0x80097D24; // type:func +View_SetPerspective = 0x80097D34; // type:func +View_GetPerspective = 0x80097D64; // type:func +View_SetOrtho = 0x80097D84; // type:func +View_GetOrtho = 0x80097DC0; // type:func +View_SetViewport = 0x80097DE0; // type:func +View_GetViewport = 0x80097E14; // type:func +View_ApplyLetterbox = 0x80097E3C; // type:func +View_SetDistortionOrientation = 0x80097F7C; // type:func +View_SetDistortionScale = 0x80097FA0; // type:func +View_SetDistortionSpeed = 0x80097FC4; // type:func +View_InitDistortion = 0x80097FD8; // type:func +View_ClearDistortion = 0x8009803C; // type:func +View_SetDistortion = 0x80098070; // type:func +View_StepDistortion = 0x800980C4; // type:func +View_Apply = 0x8009827C; // type:func +View_ApplyPerspective = 0x800982C8; // type:func +View_ApplyOrtho = 0x800985BC; // type:func +View_ApplyOrthoToOverlay = 0x80098768; // type:func +View_ApplyPerspectiveToOverlay = 0x8009899C; // type:func +View_UpdateViewingMatrix = 0x80098CEC; // type:func +View_ApplyTo = 0x80098D58; // type:func +ViMode_LogPrint = 0x80099180; // type:func +ViMode_Configure = 0x8009918C; // type:func +ViMode_Save = 0x80099734; // type:func +ViMode_Load = 0x80099814; // type:func +ViMode_Init = 0x8009989C; // type:func +ViMode_Destroy = 0x80099904; // type:func +ViMode_ConfigureFeatures = 0x80099910; // type:func +ViMode_Update = 0x80099974; // type:func +VisCvg_Init = 0x80099CF0; // type:func +VisCvg_Destroy = 0x80099D14; // type:func +VisCvg_Draw = 0x80099D20; // type:func +VisMono_Init = 0x80099E90; // type:func +VisMono_Destroy = 0x80099EE0; // type:func +VisMono_DesaturateTLUT = 0x80099F04; // type:func +VisMono_DesaturateDList = 0x8009A218; // type:func +VisMono_Draw = 0x8009A448; // type:func +VisMono_DrawOld = 0x8009A63C; // type:func +VisZBuf_Init = 0x8009A6B0; // type:func +VisZBuf_Destroy = 0x8009A6E4; // type:func +VisZBuf_Draw = 0x8009A6F0; // type:func +Skybox_CalculateFace256 = 0x8009A940; // type:func +Skybox_CalculateFace128 = 0x8009B050; // type:func +Skybox_Calculate256 = 0x8009BD58; // type:func +Skybox_Calculate128 = 0x8009BF08; // type:func +Skybox_Setup = 0x8009BFA8; // type:func +Skybox_Init = 0x8009D0FC; // type:func +Skybox_UpdateMatrix = 0x8009D210; // type:func +Skybox_Draw = 0x8009D298; // type:func +Skybox_Update = 0x8009D8E0; // type:func +PlayerCall_InitFuncPtrs = 0x8009D8F0; // type:func +PlayerCall_Init = 0x8009D958; // type:func +PlayerCall_Destroy = 0x8009D9A0; // type:func +PlayerCall_Update = 0x8009D9E0; // type:func +PlayerCall_Draw = 0x8009DA20; // type:func +TransitionTile_InitGraphics = 0x8009DA60; // type:func +TransitionTile_InitVtxData = 0x8009DE2C; // type:func +TransitionTile_Destroy = 0x8009DEEC; // type:func +TransitionTile_Init = 0x8009DF78; // type:func +TransitionTile_SetVtx = 0x8009E0F0; // type:func +TransitionTile_Draw = 0x8009E204; // type:func +TransitionTile_Suck = 0x8009E330; // type:func +TransitionTile_Update = 0x8009E464; // type:func +func_800B23F0 = 0x8009E470; // type:func +TransitionTriforce_Start = 0x8009E480; // type:func +TransitionTriforce_Init = 0x8009E4B8; // type:func +TransitionTriforce_Destroy = 0x8009E558; // type:func +TransitionTriforce_Update = 0x8009E564; // type:func +TransitionTriforce_SetColor = 0x8009E678; // type:func +TransitionTriforce_SetType = 0x8009E684; // type:func +TransitionTriforce_SetState = 0x8009E690; // type:func +TransitionTriforce_Draw = 0x8009E69C; // type:func +TransitionTriforce_IsDone = 0x8009E9AC; // type:func +TransitionWipe_Start = 0x8009EA40; // type:func +TransitionWipe_Init = 0x8009EAF8; // type:func +TransitionWipe_Destroy = 0x8009EB24; // type:func +TransitionWipe_Update = 0x8009EB30; // type:func +TransitionWipe_Draw = 0x8009EC10; // type:func +TransitionWipe_IsDone = 0x8009EE4C; // type:func +TransitionWipe_SetType = 0x8009EE58; // type:func +TransitionWipe_SetColor = 0x8009EE98; // type:func +TransitionWipe_SetUnkColor = 0x8009EEA4; // type:func +TransitionCircle_Start = 0x8009EEB0; // type:func +TransitionCircle_Init = 0x8009F09C; // type:func +TransitionCircle_Destroy = 0x8009F0C8; // type:func +TransitionCircle_Update = 0x8009F0D4; // type:func +TransitionCircle_Draw = 0x8009F258; // type:func +TransitionCircle_IsDone = 0x8009F4F4; // type:func +TransitionCircle_SetType = 0x8009F500; // type:func +TransitionCircle_SetColor = 0x8009F558; // type:func +TransitionCircle_SetUnkColor = 0x8009F564; // type:func +TransitionFade_Start = 0x8009F570; // type:func +TransitionFade_Init = 0x8009F5CC; // type:func +TransitionFade_Destroy = 0x8009F5F8; // type:func +TransitionFade_Update = 0x8009F604; // type:func +TransitionFade_Draw = 0x8009F794; // type:func +TransitionFade_IsDone = 0x8009F860; // type:func +TransitionFade_SetColor = 0x8009F86C; // type:func +TransitionFade_SetType = 0x8009F878; // type:func +Letterbox_SetSizeTarget = 0x8009F8D0; // type:func +Letterbox_GetSizeTarget = 0x8009F8E0; // type:func +Letterbox_SetSize = 0x8009F8F0; // type:func +Letterbox_GetSize = 0x8009F900; // type:func +Letterbox_Init = 0x8009F910; // type:func +Letterbox_Destroy = 0x8009F930; // type:func +Letterbox_Update = 0x8009F940; // type:func +func_800BB0A0 = 0x8009FA40; // type:func +func_800BB2B4 = 0x8009FC54; // type:func +KaleidoManager_LoadOvl = 0x8009FF10; // type:func +KaleidoManager_ClearOvl = 0x8009FF6C; // type:func +KaleidoManager_Init = 0x8009FFBC; // type:func +KaleidoManager_Destroy = 0x800A002C; // type:func +KaleidoManager_GetRamAddr = 0x800A006C; // type:func +KaleidoScopeCall_LoadPlayer = 0x800A0140; // type:func +KaleidoScopeCall_Init = 0x800A018C; // type:func +KaleidoScopeCall_Destroy = 0x800A01D8; // type:func +KaleidoScopeCall_Update = 0x800A01F8; // type:func +KaleidoScopeCall_Draw = 0x800A0398; // type:func +Play_RequestViewpointBgCam = 0x800A0420; // type:func +Play_SetViewpoint = 0x800A0460; // type:func +Play_CheckViewpoint = 0x800A050C; // type:func +Play_SetShopBrowsingViewpoint = 0x800A0534; // type:func +Play_SetupTransition = 0x800A0560; // type:func +func_800BC88C = 0x800A080C; // type:func +Play_SetFog = 0x800A0824; // type:func +Play_Destroy = 0x800A0870; // type:func +Play_Init = 0x800A09DC; // type:func +Play_Update = 0x800A1158; // type:func +Play_DrawOverlayElements = 0x800A224C; // type:func +Play_Draw = 0x800A22E4; // type:func +Play_Main = 0x800A2D28; // type:func +Play_InCsMode = 0x800A2D68; // type:func +func_800BFCB8 = 0x800A2D9C; // type:func +Play_LoadFile = 0x800A2F48; // type:func +Play_InitEnvironment = 0x800A2FA4; // type:func +Play_InitScene = 0x800A2FEC; // type:func +Play_SpawnScene = 0x800A30F0; // type:func +Play_GetScreenPos = 0x800A3198; // type:func +Play_CreateSubCamera = 0x800A325C; // type:func +Play_GetActiveCamId = 0x800A330C; // type:func +Play_ChangeCameraStatus = 0x800A3318; // type:func +Play_ClearCamera = 0x800A3388; // type:func +Play_ClearAllSubCameras = 0x800A33F0; // type:func +Play_GetCamera = 0x800A345C; // type:func +Play_SetCameraAtEye = 0x800A3494; // type:func +Play_SetCameraAtEyeUp = 0x800A35A4; // type:func +Play_SetCameraFov = 0x800A36C8; // type:func +Play_SetCameraRoll = 0x800A3710; // type:func +Play_CopyCamera = 0x800A375C; // type:func +Play_InitCameraDataUsingPlayer = 0x800A37D8; // type:func +Play_RequestCameraSetting = 0x800A3848; // type:func +Play_ReturnToMainCam = 0x800A3884; // type:func +Play_GetCameraUID = 0x800A3960; // type:func +func_800C09D8 = 0x800A3994; // type:func +Play_SaveSceneFlags = 0x800A3A00; // type:func +Play_SetRespawnData = 0x800A3A48; // type:func +Play_SetupRespawnPoint = 0x800A3AB8; // type:func +Play_TriggerVoidOut = 0x800A3B24; // type:func +Play_LoadToLastEntrance = 0x800A3B7C; // type:func +Play_TriggerRespawn = 0x800A3C50; // type:func +Play_CamIsNotFixed = 0x800A3C84; // type:func +FrameAdvance_IsEnabled = 0x800A3CF4; // type:func +func_800C0D34 = 0x800A3D04; // type:func +func_800C0DB4 = 0x800A3D84; // type:func +PreRender_SetValuesSave = 0x800A3E40; // type:func +PreRender_Init = 0x800A3E7C; // type:func +PreRender_SetValues = 0x800A3EB0; // type:func +PreRender_Destroy = 0x800A3EE4; // type:func +PreRender_CopyImage = 0x800A3F08; // type:func +PreRender_CopyImageRegionImpl = 0x800A41D0; // type:func +func_800C170C = 0x800A4618; // type:func +func_800C1AE8 = 0x800A4994; // type:func +PreRender_CoverageRgba16ToI8 = 0x800A49D0; // type:func +PreRender_SaveZBuffer = 0x800A4CE8; // type:func +PreRender_SaveFramebuffer = 0x800A4D20; // type:func +PreRender_FetchFbufCoverage = 0x800A4D58; // type:func +PreRender_DrawCoverage = 0x800A4E70; // type:func +PreRender_RestoreZBuffer = 0x800A4EB4; // type:func +func_800C213C = 0x800A4ED8; // type:func +PreRender_RestoreFramebuffer = 0x800A5208; // type:func +PreRender_CopyImageRegion = 0x800A522C; // type:func +PreRender_AntiAliasFilter = 0x800A524C; // type:func +PreRender_DivotFilter = 0x800A5D0C; // type:func +PreRender_ApplyFilters = 0x800A5E60; // type:func +THGA_Init = 0x800A5F30; // type:func +THGA_Destroy = 0x800A5F50; // type:func +THGA_IsCrash = 0x800A5F70; // type:func +THGA_Reset = 0x800A5F90; // type:func +THGA_GetRemaining = 0x800A5FB0; // type:func +THGA_GetHead = 0x800A5FD0; // type:func +THGA_SetHead = 0x800A5FF0; // type:func +THGA_GetTail = 0x800A6010; // type:func +THGA_AllocDisplayList = 0x800A6030; // type:func +THGA_AllocGfx = 0x800A6054; // type:func +THGA_AllocGfx2 = 0x800A6074; // type:func +THGA_AllocTail = 0x800A6094; // type:func +THGA_AllocMtxArray = 0x800A60B4; // type:func +THGA_AllocMtx = 0x800A60D8; // type:func +THGA_AllocVtxArray = 0x800A60F8; // type:func +THGA_AllocVtx = 0x800A611C; // type:func +THA_GetHead = 0x800A6140; // type:func +THA_SetHead = 0x800A614C; // type:func +THA_GetTail = 0x800A6158; // type:func +THA_AllocHead = 0x800A6164; // type:func +THA_AllocHeadByte = 0x800A6178; // type:func +THA_AllocTail = 0x800A6198; // type:func +THA_AllocTailAlign16 = 0x800A6228; // type:func +THA_AllocTailAlign = 0x800A6248; // type:func +THA_GetRemaining = 0x800A6264; // type:func +THA_IsCrash = 0x800A6278; // type:func +THA_Reset = 0x800A629C; // type:func +THA_Init = 0x800A62B8; // type:func +THA_Destroy = 0x800A62DC; // type:func +AudioMgr_StopAllSfx = 0x800A6300; // type:func +AudioMgr_NotifyTaskDone = 0x800A6350; // type:func +AudioMgr_HandleRetrace = 0x800A6388; // type:func +AudioMgr_HandlePreNMI = 0x800A6510; // type:func +AudioMgr_ThreadEntry = 0x800A6534; // type:func +AudioMgr_WaitForInit = 0x800A6664; // type:func +AudioMgr_Init = 0x800A6690; // type:func +Setup_InitImpl = 0x800A6760; // type:func +Setup_Destroy = 0x800A679C; // type:func +Setup_Init = 0x800A67A8; // type:func +GameState_SetFBFilter = 0x800A67D0; // type:func +func_800C4344 = 0x800A6924; // type:func +GameState_Draw = 0x800A6930; // type:func +GameState_SetFrameBuffer = 0x800A6A28; // type:func +func_800C49F4 = 0x800A6B0C; // type:func +GameState_ReqPadData = 0x800A6B84; // type:func +GameState_Update = 0x800A6BB4; // type:func +GameState_InitArena = 0x800A6C30; // type:func +GameState_Realloc = 0x800A6CA0; // type:func +GameState_Init = 0x800A6D60; // type:func +GameState_Destroy = 0x800A6E58; // type:func +GameState_GetInit = 0x800A6F08; // type:func +GameState_GetSize = 0x800A6F14; // type:func +GameState_IsRunning = 0x800A6F20; // type:func +GameState_GetArenaSize = 0x800A6F2C; // type:func +GameAlloc_Log = 0x800A6F50; // type:func +GameAlloc_Malloc = 0x800A6F70; // type:func +GameAlloc_Free = 0x800A6FDC; // type:func +GameAlloc_Cleanup = 0x800A7028; // type:func +GameAlloc_Init = 0x800A7078; // type:func +Graph_InitTHGA = 0x800A7090; // type:func +Graph_GetNextGameState = 0x800A71A8; // type:func +Graph_Init = 0x800A7258; // type:func +Graph_Destroy = 0x800A72C8; // type:func +Graph_TaskSet00 = 0x800A72D4; // type:func +Graph_Update = 0x800A7618; // type:func +Graph_ThreadEntry = 0x800A78CC; // type:func +Graph_Alloc = 0x800A79C4; // type:func +Graph_Alloc2 = 0x800A79F8; // type:func +Gfx_Open = 0x800A7A30; // type:func +Gfx_Close = 0x800A7A3C; // type:func +Gfx_Alloc = 0x800A7A54; // type:func +ListAlloc_Init = 0x800A7A90; // type:func +ListAlloc_Alloc = 0x800A7AA4; // type:func +ListAlloc_Free = 0x800A7B10; // type:func +ListAlloc_FreeAll = 0x800A7B90; // type:func +Main = 0x800A7BE0; // type:func +PadMgr_AcquireSerialEventQueue = 0x800A7F40; // type:func +PadMgr_ReleaseSerialEventQueue = 0x800A7F70; // type:func +PadMgr_LockPadData = 0x800A7F98; // type:func +PadMgr_UnlockPadData = 0x800A7FC4; // type:func +PadMgr_UpdateRumble = 0x800A7FF0; // type:func +PadMgr_RumbleStop = 0x800A8240; // type:func +PadMgr_RumbleReset = 0x800A82D8; // type:func +PadMgr_RumbleSetSingle = 0x800A82E8; // type:func +PadMgr_RumbleSet = 0x800A8300; // type:func +PadMgr_UpdateInputs = 0x800A8330; // type:func +PadMgr_HandleRetrace = 0x800A8510; // type:func +PadMgr_HandlePreNMI = 0x800A86A8; // type:func +PadMgr_RequestPadData = 0x800A86CC; // type:func +PadMgr_ThreadEntry = 0x800A8848; // type:func +PadMgr_Init = 0x800A8944; // type:func +Sched_SwapFrameBufferImpl = 0x800A8A40; // type:func +Sched_SwapFrameBuffer = 0x800A8AB0; // type:func +Sched_HandlePreNMI = 0x800A8B00; // type:func +Sched_HandleNMI = 0x800A8B0C; // type:func +Sched_QueueTask = 0x800A8B30; // type:func +Sched_Yield = 0x800A8B9C; // type:func +Sched_GfxTaskFramebufferValid = 0x800A8BD0; // type:func +Sched_Schedule = 0x800A8C94; // type:func +Sched_SetNextFramebufferFromTask = 0x800A8DC8; // type:func +Sched_TaskComplete = 0x800A8E14; // type:func +Sched_RunTask = 0x800A8E8C; // type:func +Sched_HandleNotification = 0x800A8FF0; // type:func +Sched_HandleRetrace = 0x800A90E0; // type:func +Sched_HandleRSPDone = 0x800A91B8; // type:func +Sched_HandleRDPDone = 0x800A93CC; // type:func +Sched_Notify = 0x800A9494; // type:func +Sched_ThreadEntry = 0x800A94B8; // type:func +Sched_Init = 0x800A95EC; // type:func +SpeedMeter_InitImpl = 0x800A96C0; // type:func +SpeedMeter_Init = 0x800A96D0; // type:func +SpeedMeter_Destroy = 0x800A96F4; // type:func +SpeedMeter_DrawTimeEntries = 0x800A9700; // type:func +SpeedMeter_InitAllocEntry = 0x800A9BC4; // type:func +SpeedMeter_DrawAllocEntry = 0x800A9C08; // type:func +SpeedMeter_DrawAllocEntries = 0x800A9E5C; // type:func +SysCfb_Init = 0x800AA100; // type:func +SysCfb_Reset = 0x800AA1C8; // type:func +SysCfb_GetFbPtr = 0x800AA1E8; // type:func +SysCfb_GetFbEnd = 0x800AA210; // type:func +Math_FactorialF = 0x800AA220; // type:func +Math_Factorial = 0x800AA320; // type:func +Math_PowF = 0x800AA3E4; // type:func +Math_SinF = 0x800AA40C; // type:func +Math_CosF = 0x800AA460; // type:func +Math3D_PlaneVsLineSegClosestPoint = 0x800AA4C0; // type:func +Math3D_LineVsLineClosestTwoPoints = 0x800AA5E0; // type:func +Math3D_LineClosestToPoint = 0x800AA88C; // type:func +Math3D_FindPointOnPlaneIntersect = 0x800AA978; // type:func +Math3D_PlaneVsPlaneNewLine = 0x800AA9D8; // type:func +Math3D_PlaneVsPlaneVsLineClosestPoint = 0x800AABB8; // type:func +Math3D_PointOnInfiniteLine = 0x800AAC34; // type:func +Math3D_LineSplitRatio = 0x800AAC80; // type:func +Math3D_Cos = 0x800AACCC; // type:func +Math3D_CosOut = 0x800AACF0; // type:func +Math3D_Vec3fReflect = 0x800AADA8; // type:func +Math3D_PointInSquare2D = 0x800AAE7C; // type:func +Math3D_CirSquareVsTriSquare = 0x800AAEE0; // type:func +Math3D_SphCubeVsTriCube = 0x800AB020; // type:func +Math3D_Dist1DSq = 0x800AB244; // type:func +Math3D_Dist1D = 0x800AB25C; // type:func +Math3D_Dist2DSq = 0x800AB280; // type:func +Math3D_Dist2D = 0x800AB2C4; // type:func +Math3D_Vec3fMagnitudeSq = 0x800AB2F4; // type:func +Math3D_Vec3fMagnitude = 0x800AB320; // type:func +Math3D_Vec3fDistSq = 0x800AB348; // type:func +Math3D_Vec3f_DistXYZ = 0x800AB370; // type:func +Math3D_DistXYZ16toF = 0x800AB390; // type:func +Math3D_Vec3fDiff_CrossZ = 0x800AB408; // type:func +Math3D_Vec3fDiff_CrossX = 0x800AB448; // type:func +Math3D_Vec3fDiff_CrossY = 0x800AB488; // type:func +Math3D_Vec3f_Cross = 0x800AB4C8; // type:func +Math3D_SurfaceNorm = 0x800AB53C; // type:func +Math3D_PointRelativeToCubeFaces = 0x800AB5A4; // type:func +Math3D_PointRelativeToCubeEdges = 0x800AB650; // type:func +Math3D_PointRelativeToCubeVertices = 0x800AB800; // type:func +Math3D_LineVsCube = 0x800AB97C; // type:func +Math3D_LineVsCubeShort = 0x800AC3F4; // type:func +Math3D_RotateXZPlane = 0x800AC560; // type:func +Math3D_DefPlane = 0x800AC5EC; // type:func +Math3D_Planef = 0x800AC700; // type:func +Math3D_Plane = 0x800AC740; // type:func +Math3D_UDistPlaneToPos = 0x800AC77C; // type:func +Math3D_DistPlaneToPos = 0x800AC7B4; // type:func +Math3D_TriChkPointParaYImpl = 0x800AC838; // type:func +Math3D_TriChkPointParaYDeterminate = 0x800ACB54; // type:func +Math3D_TriChkPointParaYSlopedY = 0x800ACB9C; // type:func +Math3D_TriChkPointParaYIntersectDist = 0x800ACBEC; // type:func +Math3D_TriChkPointParaYIntersectInsideTri = 0x800ACC9C; // type:func +Math3D_TriChkPointParaY = 0x800ACD48; // type:func +Math3D_TriChkLineSegParaYIntersect = 0x800ACDC4; // type:func +Math3D_TriChkPointParaYDist = 0x800ACF38; // type:func +Math3D_TriChkPointParaXImpl = 0x800ACFAC; // type:func +Math3D_TriChkPointParaXDeterminate = 0x800AD2C8; // type:func +Math3D_TriChkPointParaXIntersect = 0x800AD310; // type:func +Math3D_TriChkPointParaX = 0x800AD3C4; // type:func +Math3D_TriChkLineSegParaXIntersect = 0x800AD440; // type:func +Math3D_TriChkPointParaXDist = 0x800AD5C8; // type:func +Math3D_TriChkPointParaZImpl = 0x800AD63C; // type:func +Math3D_TriChkPointParaZDeterminate = 0x800AD984; // type:func +Math3D_TriChkPointParaZIntersect = 0x800AD9CC; // type:func +Math3D_TriChkPointParaZ = 0x800ADA80; // type:func +Math3D_TriChkLineSegParaZIntersect = 0x800ADAFC; // type:func +Math3D_TriChkLineSegParaZDist = 0x800ADC88; // type:func +Math3D_LineSegFindPlaneIntersect = 0x800ADCFC; // type:func +Math3D_LineSegVsPlane = 0x800ADDD8; // type:func +Math3D_TriLineIntersect = 0x800ADEE0; // type:func +Math3D_TriNorm = 0x800AE044; // type:func +Math3D_PointInSph = 0x800AE0F4; // type:func +Math3D_PointDistSqToLine2D = 0x800AE144; // type:func +Math3D_LineVsSph = 0x800AE28C; // type:func +Math3D_GetSphVsTriIntersectPoint = 0x800AE494; // type:func +Math3D_TriVsSphIntersect = 0x800AE5D4; // type:func +Math3D_PointInCyl = 0x800AE9F4; // type:func +Math3D_CylVsLineSeg = 0x800AEAB0; // type:func +Math3D_CylTriVsIntersect = 0x800AF478; // type:func +Math3D_CylVsTri = 0x800AF8F8; // type:func +Math3D_SphVsSph = 0x800AF918; // type:func +Math3D_SphVsSphOverlap = 0x800AF938; // type:func +Math3D_SphVsSphOverlapCenterDist = 0x800AF958; // type:func +Math3D_SphVsCylOverlap = 0x800AFA30; // type:func +Math3D_SphVsCylOverlapCenterDist = 0x800AFA50; // type:func +Math3D_CylVsCylOverlap = 0x800AFBC0; // type:func +Math3D_CylVsCylOverlapCenterDist = 0x800AFBE0; // type:func +Math3D_TriVsTriIntersect = 0x800AFDB0; // type:func +Math3D_XZInSphere = 0x800B0130; // type:func +Math3D_XYInSphere = 0x800B01A4; // type:func +Math3D_YZInSphere = 0x800B0218; // type:func +Math_GetAtan2Tbl = 0x800B0290; // type:func +Math_Atan2S = 0x800B0308; // type:func +Math_Atan2F = 0x800B0480; // type:func +Matrix_Init = 0x800B04C0; // type:func +Matrix_Push = 0x800B04FC; // type:func +Matrix_Pop = 0x800B0534; // type:func +Matrix_Get = 0x800B0550; // type:func +Matrix_Put = 0x800B0574; // type:func +Matrix_GetCurrent = 0x800B059C; // type:func +Matrix_Mult = 0x800B05AC; // type:func +Matrix_Translate = 0x800B0604; // type:func +Matrix_Scale = 0x800B070C; // type:func +Matrix_RotateX = 0x800B07F0; // type:func +Matrix_RotateY = 0x800B09A4; // type:func +Matrix_RotateZ = 0x800B0B5C; // type:func +Matrix_RotateZYX = 0x800B0D10; // type:func +Matrix_TranslateRotateZYX = 0x800B0FCC; // type:func +Matrix_SetTranslateRotateYXZ = 0x800B1320; // type:func +Matrix_MtxFToMtx = 0x800B14CC; // type:func +Matrix_ToMtx = 0x800B16E8; // type:func +Matrix_Finalize = 0x800B1710; // type:func +Matrix_MtxFToNewMtx = 0x800B173C; // type:func +Matrix_MultVec3f = 0x800B1768; // type:func +Matrix_MtxFCopy = 0x800B1820; // type:func +Matrix_MtxToMtxF = 0x800B1928; // type:func +Matrix_MultVec3fExt = 0x800B1B7C; // type:func +Matrix_Transpose = 0x800B1C2C; // type:func +Matrix_ReplaceRotation = 0x800B1C64; // type:func +Matrix_MtxFToYXZRotS = 0x800B1D60; // type:func +Matrix_MtxFToZYXRotS = 0x800B1EF8; // type:func +Matrix_RotateAxis = 0x800B2090; // type:func +Matrix_SetTranslateUniformScaleMtxF = 0x800B24F8; // type:func +Matrix_SetTranslateUniformScaleMtx = 0x800B2560; // type:func +Matrix_SetTranslateUniformScaleMtx2 = 0x800B25B0; // type:func +Matrix_SetTranslateScaleMtx1 = 0x800B26A0; // type:func +Matrix_SetTranslateScaleMtx2 = 0x800B27C0; // type:func +SysUcode_GetUCodeBoot = 0x800B28C0; // type:func +SysUcode_GetUCodeBootSize = 0x800B28D0; // type:func +SysUcode_GetUCode = 0x800B28EC; // type:func +SysUcode_GetUCodeData = 0x800B28FC; // type:func +RumbleMgr_Update = 0x800B2910; // type:func +RumbleMgr_Init = 0x800B2C20; // type:func +RumbleMgr_Destroy = 0x800B2C58; // type:func +func_800D31A0 = 0x800B2C70; // type:func +IrqMgr_AddClient = 0x800B2CA0; // type:func +IrqMgr_RemoveClient = 0x800B2D2C; // type:func +IrqMgr_SendMesgToClients = 0x800B2DB8; // type:func +IrqMgr_JamMesgToClients = 0x800B2E1C; // type:func +IrqMgr_HandlePreNMI = 0x800B2E80; // type:func +IrqMgr_CheckStacks = 0x800B2F18; // type:func +IrqMgr_HandlePreNMI450 = 0x800B2F38; // type:func +IrqMgr_HandlePreNMI480 = 0x800B2FB4; // type:func +IrqMgr_HandlePreNMI500 = 0x800B3048; // type:func +IrqMgr_HandleRetrace = 0x800B306C; // type:func +IrqMgr_ThreadEntry = 0x800B3124; // type:func +IrqMgr_Init = 0x800B31F8; // type:func +Fault_SleepImpl = 0x800B32C0; // type:func +Fault_ClientProcessThread = 0x800B3330; // type:func +Fault_ClientRunTask = 0x800B33A4; // type:func +Fault_ProcessClient = 0x800B3528; // type:func +Fault_AddClient = 0x800B357C; // type:func +Fault_RemoveClient = 0x800B3660; // type:func +Fault_AddAddrConvClient = 0x800B3758; // type:func +Fault_RemoveAddrConvClient = 0x800B3830; // type:func +Fault_ConvertAddress = 0x800B3928; // type:func +Fault_Sleep = 0x800B39DC; // type:func +Fault_PadCallback = 0x800B3A18; // type:func +Fault_UpdatePadImpl = 0x800B3A54; // type:func +Fault_WaitForInputImpl = 0x800B3AA0; // type:func +Fault_WaitForInput = 0x800B3BEC; // type:func +Fault_DrawRec = 0x800B3C38; // type:func +Fault_FillScreenBlack = 0x800B3C98; // type:func +Fault_FillScreenRed = 0x800B3CEC; // type:func +Fault_DrawCornerRec = 0x800B3D40; // type:func +Fault_PrintFReg = 0x800B3D94; // type:func +Fault_LogFReg = 0x800B3E40; // type:func +Fault_PrintFPCSR = 0x800B3EF0; // type:func +Fault_LogFPCSR = 0x800B3F94; // type:func +Fault_PrintThreadContext = 0x800B402C; // type:func +Fault_LogThreadContext = 0x800B4348; // type:func +Fault_FindFaultedThread = 0x800B4644; // type:func +Fault_Wait5Seconds = 0x800B46CC; // type:func +Fault_WaitForButtonCombo = 0x800B475C; // type:func +Fault_DrawMemDumpContents = 0x800B4A28; // type:func +Fault_DrawMemDump = 0x800B4B94; // type:func +Fault_WalkStack = 0x800B4D98; // type:func +Fault_DrawStackTrace = 0x800B4F28; // type:func +Fault_LogStackTrace = 0x800B50A8; // type:func +Fault_ResumeThread = 0x800B5218; // type:func +Fault_DisplayFrameBuffer = 0x800B5294; // type:func +Fault_ProcessClients = 0x800B5354; // type:func +Fault_UpdatePad = 0x800B5434; // type:func +Fault_ThreadEntry = 0x800B5470; // type:func +Fault_SetFrameBuffer = 0x800B57D0; // type:func +Fault_Init = 0x800B5824; // type:func +Fault_HungupFaultClient = 0x800B5958; // type:func +Fault_AddHungupAndCrashImpl = 0x800B5A54; // type:func +Fault_AddHungupAndCrash = 0x800B5AAC; // type:func +Fault_SetOsSyncPrintfEnabled = 0x800B5B10; // type:func +Fault_DrawRecImpl = 0x800B5B20; // type:func +Fault_DrawChar = 0x800B5C3C; // type:func +Fault_ColorToPrintColor = 0x800B5DAC; // type:func +Fault_UpdatePrintColor = 0x800B5E5C; // type:func +Fault_SetForeColor = 0x800B5EFC; // type:func +Fault_SetBackColor = 0x800B5F44; // type:func +Fault_SetFontColor = 0x800B5F8C; // type:func +Fault_SetCharPad = 0x800B5FD4; // type:func +Fault_SetCursor = 0x800B6004; // type:func +Fault_FillScreen = 0x800B60FC; // type:func +Fault_PrintCallback = 0x800B618C; // type:func +Fault_VPrintf = 0x800B6398; // type:func +Fault_Printf = 0x800B63E8; // type:func +Fault_DrawText = 0x800B6438; // type:func +Fault_SetDrawerFB = 0x800B6488; // type:func +Fault_SetInputCallback = 0x800B64B4; // type:func +Fault_WritebackFBDCache = 0x800B64C4; // type:func +Fault_InitDrawer = 0x800B6520; // type:func +Kanji_OffsetFromShiftJIS = 0x800B6590; // type:func +AudioSynth_InitNextRingBuf = 0x800B7080; // type:func +func_800DB03C = 0x800B73FC; // type:func +AudioSynth_Update = 0x800B7484; // type:func +func_800DB2C0 = 0x800B7680; // type:func +AudioSynth_LoadRingBuffer1AtTemp = 0x800B76F0; // type:func +AudioSynth_SaveRingBuffer1AtTemp = 0x800B7798; // type:func +AudioSynth_LeakReverb = 0x800B7840; // type:func +func_800DB4E4 = 0x800B78A4; // type:func +func_800DB680 = 0x800B7A40; // type:func +func_800DB828 = 0x800B7BE8; // type:func +AudioSynth_FilterReverb = 0x800B7E00; // type:func +AudioSynth_MaybeMixRingBuffer1 = 0x800B7EA8; // type:func +func_800DBB94 = 0x800B7F54; // type:func +AudioSynth_ClearBuffer = 0x800B7F5C; // type:func +func_800DBBBC = 0x800B7F7C; // type:func +func_800DBBC4 = 0x800B7F84; // type:func +func_800DBBCC = 0x800B7F8C; // type:func +AudioSynth_Mix = 0x800B7F94; // type:func +func_800DBC08 = 0x800B7FC8; // type:func +func_800DBC10 = 0x800B7FD0; // type:func +func_800DBC18 = 0x800B7FD8; // type:func +AudioSynth_SetBuffer = 0x800B7FE0; // type:func +func_800DBC54 = 0x800B8014; // type:func +func_800DBC5C = 0x800B801C; // type:func +AudioSynth_DMemMove = 0x800B8024; // type:func +func_800DBC90 = 0x800B8050; // type:func +func_800DBC98 = 0x800B8058; // type:func +func_800DBCA0 = 0x800B8060; // type:func +func_800DBCA8 = 0x800B8068; // type:func +AudioSynth_InterL = 0x800B8070; // type:func +AudioSynth_EnvSetup1 = 0x800B8094; // type:func +func_800DBD08 = 0x800B80C8; // type:func +AudioSynth_LoadBuffer = 0x800B80D0; // type:func +AudioSynth_SaveBuffer = 0x800B80F8; // type:func +AudioSynth_EnvSetup2 = 0x800B8120; // type:func +func_800DBD7C = 0x800B813C; // type:func +func_800DBD84 = 0x800B8144; // type:func +func_800DBD8C = 0x800B814C; // type:func +AudioSynth_S8Dec = 0x800B8154; // type:func +AudioSynth_HiLoGain = 0x800B8170; // type:func +AudioSynth_UnkCmd19 = 0x800B81A4; // type:func +func_800DBE18 = 0x800B81D8; // type:func +func_800DBE20 = 0x800B81E0; // type:func +func_800DBE28 = 0x800B81E8; // type:func +func_800DBE30 = 0x800B81F0; // type:func +AudioSynth_UnkCmd3 = 0x800B81F8; // type:func +func_800DBE5C = 0x800B821C; // type:func +func_800DBE64 = 0x800B8224; // type:func +func_800DBE6C = 0x800B822C; // type:func +AudioSynth_LoadFilterBuffer = 0x800B8234; // type:func +AudioSynth_LoadFilterSize = 0x800B8258; // type:func +AudioSynth_LoadRingBuffer1 = 0x800B8270; // type:func +AudioSynth_LoadRingBuffer2 = 0x800B831C; // type:func +AudioSynth_LoadRingBufferPart = 0x800B83C8; // type:func +AudioSynth_SaveRingBufferPart = 0x800B8434; // type:func +AudioSynth_SaveBufferOffset = 0x800B84A0; // type:func +AudioSynth_MaybeLoadRingBuffer2 = 0x800B84E4; // type:func +AudioSynth_LoadReverbSamples = 0x800B8524; // type:func +AudioSynth_SaveReverbSamples = 0x800B8598; // type:func +AudioSynth_SaveRingBuffer2 = 0x800B869C; // type:func +AudioSynth_DoOneAudioUpdate = 0x800B8744; // type:func +AudioSynth_ProcessNote = 0x800B8CD0; // type:func +AudioSynth_FinalResample = 0x800B99EC; // type:func +AudioSynth_ProcessEnvelope = 0x800B9A8C; // type:func +AudioSynth_LoadWaveSamples = 0x800B9DB4; // type:func +AudioSynth_ApplyHaasEffect = 0x800B9F24; // type:func +AudioHeap_CalculateAdsrDecay = 0x800BA1E0; // type:func +AudioHeap_InitAdsrDecayTable = 0x800BA1FC; // type:func +AudioHeap_ResetLoadStatus = 0x800BA340; // type:func +AudioHeap_DiscardFont = 0x800BA408; // type:func +AudioHeap_ReleaseNotesForFont = 0x800BA4EC; // type:func +AudioHeap_DiscardSequence = 0x800BA574; // type:func +AudioHeap_WritebackDCache = 0x800BA5F8; // type:func +AudioHeap_AllocZeroedAttemptExternal = 0x800BA618; // type:func +AudioHeap_AllocAttemptExternal = 0x800BA670; // type:func +AudioHeap_AllocDmaMemory = 0x800BA6C8; // type:func +AudioHeap_AllocDmaMemoryZeroed = 0x800BA704; // type:func +AudioHeap_AllocZeroed = 0x800BA740; // type:func +AudioHeap_Alloc = 0x800BA79C; // type:func +AudioHeap_InitPool = 0x800BA7F4; // type:func +AudioHeap_InitPersistentCache = 0x800BA81C; // type:func +AudioHeap_InitTemporaryCache = 0x800BA830; // type:func +AudioHeap_ResetPool = 0x800BA860; // type:func +AudioHeap_PopPersistentCache = 0x800BA870; // type:func +AudioHeap_InitMainPools = 0x800BA9B0; // type:func +AudioHeap_InitSessionPools = 0x800BAA10; // type:func +AudioHeap_InitCachePools = 0x800BAA94; // type:func +AudioHeap_InitPersistentPoolsAndCaches = 0x800BAB18; // type:func +AudioHeap_InitTemporaryPoolsAndCaches = 0x800BABDC; // type:func +AudioHeap_AllocCached = 0x800BACA0; // type:func +AudioHeap_SearchCaches = 0x800BB434; // type:func +AudioHeap_SearchRegularCaches = 0x800BB48C; // type:func +func_800DF1D8 = 0x800BB598; // type:func +AudioHeap_ClearFilter = 0x800BB96C; // type:func +AudioHeap_LoadLowPassFilter = 0x800BB99C; // type:func +AudioHeap_LoadHighPassFilter = 0x800BB9F0; // type:func +AudioHeap_LoadFilter = 0x800BBA48; // type:func +AudioHeap_UpdateReverb = 0x800BBB7C; // type:func +AudioHeap_UpdateReverbs = 0x800BBB84; // type:func +AudioHeap_ClearCurrentAiBuffer = 0x800BBC48; // type:func +AudioHeap_ResetStep = 0x800BBCB4; // type:func +AudioHeap_Init = 0x800BBFB8; // type:func +AudioHeap_SearchPermanentCache = 0x800BC8A8; // type:func +AudioHeap_AllocPermanent = 0x800BC900; // type:func +AudioHeap_AllocSampleCache = 0x800BC984; // type:func +AudioHeap_InitSampleCaches = 0x800BC9F4; // type:func +AudioHeap_AllocTemporarySampleCacheEntry = 0x800BCA8C; // type:func +AudioHeap_UnapplySampleCacheForFont = 0x800BCD24; // type:func +AudioHeap_DiscardSampleCacheEntry = 0x800BCE98; // type:func +AudioHeap_UnapplySampleCache = 0x800BCF74; // type:func +AudioHeap_AllocPersistentSampleCacheEntry = 0x800BCFB8; // type:func +AudioHeap_DiscardSampleCacheForFont = 0x800BD040; // type:func +AudioHeap_DiscardSampleCaches = 0x800BD07C; // type:func +AudioHeap_ChangeStorage = 0x800BD1CC; // type:func +AudioHeap_DiscardSampleBank = 0x800BD22C; // type:func +AudioHeap_ApplySampleBankCache = 0x800BD250; // type:func +AudioHeap_ApplySampleBankCacheInternal = 0x800BD274; // type:func +AudioHeap_DiscardSampleBanks = 0x800BD508; // type:func +AudioLoad_DecreaseSampleDmaTtls = 0x800BD5B0; // type:func +AudioLoad_DmaSampleData = 0x800BD69C; // type:func +AudioLoad_InitSampleDmaBuffers = 0x800BD9D8; // type:func +AudioLoad_IsFontLoadComplete = 0x800BDC70; // type:func +AudioLoad_IsSeqLoadComplete = 0x800BDCE8; // type:func +AudioLoad_IsSampleLoadComplete = 0x800BDD60; // type:func +AudioLoad_SetFontLoadStatus = 0x800BDDD8; // type:func +AudioLoad_SetSeqLoadStatus = 0x800BDE08; // type:func +AudioLoad_SetSampleFontLoadStatusAndApplyCaches = 0x800BDE38; // type:func +AudioLoad_SetSampleFontLoadStatus = 0x800BDE98; // type:func +AudioLoad_InitTable = 0x800BDEC8; // type:func +AudioLoad_SyncLoadSeqFonts = 0x800BDF28; // type:func +AudioLoad_SyncLoadSeqParts = 0x800BDFD8; // type:func +AudioLoad_SyncLoadSample = 0x800BE038; // type:func +AudioLoad_SyncLoadInstrument = 0x800BE124; // type:func +AudioLoad_AsyncLoad = 0x800BE1F4; // type:func +AudioLoad_AsyncLoadSeq = 0x800BE22C; // type:func +AudioLoad_AsyncLoadSampleBank = 0x800BE270; // type:func +AudioLoad_AsyncLoadFont = 0x800BE2B4; // type:func +AudioLoad_GetFontsForSequence = 0x800BE2F8; // type:func +AudioLoad_DiscardSeqFonts = 0x800BE33C; // type:func +AudioLoad_DiscardFont = 0x800BE3EC; // type:func +AudioLoad_SyncInitSeqPlayer = 0x800BE494; // type:func +AudioLoad_SyncInitSeqPlayerSkipTicks = 0x800BE4E4; // type:func +AudioLoad_SyncInitSeqPlayerInternal = 0x800BE53C; // type:func +AudioLoad_SyncLoadSeq = 0x800BE684; // type:func +AudioLoad_GetSampleBank = 0x800BE6D8; // type:func +AudioLoad_TrySyncLoadSampleBank = 0x800BE6F8; // type:func +AudioLoad_SyncLoadFont = 0x800BE814; // type:func +AudioLoad_SyncLoad = 0x800BE918; // type:func +AudioLoad_GetRealTableIndex = 0x800BEB28; // type:func +AudioLoad_SearchCaches = 0x800BEB64; // type:func +AudioLoad_GetLoadTable = 0x800BEBB8; // type:func +AudioLoad_RelocateFont = 0x800BEBFC; // type:func +AudioLoad_SyncDma = 0x800BEE68; // type:func +AudioLoad_SyncDmaUnkMedium = 0x800BEF8C; // type:func +AudioLoad_Dma = 0x800BEFA0; // type:func +AudioLoad_Unused1 = 0x800BF078; // type:func +AudioLoad_SyncLoadSimple = 0x800BF080; // type:func +AudioLoad_AsyncLoadInner = 0x800BF0A0; // type:func +AudioLoad_ProcessLoads = 0x800BF3AC; // type:func +AudioLoad_SetDmaHandler = 0x800BF3DC; // type:func +AudioLoad_SetUnusedHandler = 0x800BF3E8; // type:func +AudioLoad_InitSoundFont = 0x800BF3F4; // type:func +AudioLoad_Init = 0x800BF454; // type:func +AudioLoad_InitSlowLoads = 0x800BF7C0; // type:func +AudioLoad_SlowLoadSample = 0x800BF7D4; // type:func +AudioLoad_GetFontSample = 0x800BF9A0; // type:func +AudioLoad_Unused2 = 0x800BFA30; // type:func +AudioLoad_FinishSlowLoad = 0x800BFA38; // type:func +AudioLoad_ProcessSlowLoads = 0x800BFAAC; // type:func +AudioLoad_DmaSlowCopy = 0x800BFC34; // type:func +AudioLoad_DmaSlowCopyUnkMedium = 0x800BFCB8; // type:func +AudioLoad_SlowLoadSeq = 0x800BFCCC; // type:func +AudioLoad_InitAsyncLoads = 0x800BFDD4; // type:func +AudioLoad_StartAsyncLoadUnkMedium = 0x800BFE04; // type:func +AudioLoad_StartAsyncLoad = 0x800BFE88; // type:func +AudioLoad_ProcessAsyncLoads = 0x800BFFAC; // type:func +AudioLoad_ProcessAsyncLoadUnkMedium = 0x800C00D0; // type:func +AudioLoad_FinishAsyncLoad = 0x800C00DC; // type:func +AudioLoad_ProcessAsyncLoad = 0x800C0218; // type:func +AudioLoad_AsyncDma = 0x800C0374; // type:func +AudioLoad_AsyncDmaUnkMedium = 0x800C0404; // type:func +AudioLoad_RelocateSample = 0x800C0418; // type:func +AudioLoad_RelocateFontAndPreloadSamples = 0x800C0558; // type:func +AudioLoad_ProcessSamplePreloads = 0x800C0950; // type:func +AudioLoad_AddToSampleSet = 0x800C0B04; // type:func +AudioLoad_GetSamplesForFont = 0x800C0B4C; // type:func +AudioLoad_AddUsedSample = 0x800C0C80; // type:func +AudioLoad_PreloadSamplesForFont = 0x800C0CD8; // type:func +AudioLoad_LoadPermanentSamples = 0x800C1154; // type:func +AudioLoad_Unused3 = 0x800C1294; // type:func +AudioLoad_Unused4 = 0x800C129C; // type:func +AudioLoad_Unused5 = 0x800C12A4; // type:func +AudioLoad_ScriptLoad = 0x800C12AC; // type:func +AudioLoad_ProcessScriptLoads = 0x800C1318; // type:func +AudioLoad_InitScriptLoads = 0x800C1370; // type:func +AudioThread_Update = 0x800C13A0; // type:func +AudioThread_UpdateImpl = 0x800C13C0; // type:func +AudioThread_ProcessGlobalCmd = 0x800C1944; // type:func +AudioThread_SetFadeOutTimer = 0x800C1D18; // type:func +AudioThread_SetFadeInTimer = 0x800C1D6C; // type:func +AudioThread_InitMesgQueuesImpl = 0x800C1DB4; // type:func +AudioThread_QueueCmd = 0x800C1E4C; // type:func +AudioThread_QueueCmdF32 = 0x800C1E98; // type:func +AudioThread_QueueCmdS32 = 0x800C1EBC; // type:func +AudioThread_QueueCmdS8 = 0x800C1EE0; // type:func +AudioThread_QueueCmdU16 = 0x800C1F10; // type:func +AudioThread_ScheduleProcessCmds = 0x800C1F40; // type:func +AudioThread_ResetCmdQueue = 0x800C1FD0; // type:func +AudioThread_ProcessCmd = 0x800C1FE8; // type:func +AudioThread_ProcessCmds = 0x800C212C; // type:func +func_800E5E20 = 0x800C21E0; // type:func +AudioThread_GetFontsForSequence = 0x800C2244; // type:func +Audio_GetSampleBankIdsOfFont = 0x800C2264; // type:func +func_800E5EDC = 0x800C229C; // type:func +func_800E5F34 = 0x800C22F4; // type:func +AudioThread_ResetAudioHeap = 0x800C2348; // type:func +AudioThread_PreNMIInternal = 0x800C23E4; // type:func +AudioThread_GetChannelIO = 0x800C2430; // type:func +AudioThread_GetSeqPlayerIO = 0x800C2484; // type:func +AudioThread_InitExternalPool = 0x800C24AC; // type:func +AudioThread_ResetExternalPool = 0x800C24DC; // type:func +AudioThread_ProcessSeqPlayerCmd = 0x800C24E8; // type:func +AudioThread_ProcessChannelCmd = 0x800C26C0; // type:func +AudioThread_Noop1Cmd = 0x800C2870; // type:func +AudioThread_Noop1CmdZeroed = 0x800C28B8; // type:func +AudioThread_Noop2Cmd = 0x800C28DC; // type:func +AudioThread_WaitForAudioTask = 0x800C2910; // type:func +func_800E6590 = 0x800C2950; // type:func +func_800E6680 = 0x800C2A40; // type:func +func_800E66A0 = 0x800C2A60; // type:func +func_800E66C0 = 0x800C2A80; // type:func +AudioThread_NextRandom = 0x800C2B80; // type:func +AudioThread_InitMesgQueues = 0x800C2BD8; // type:func +Audio_InvalDCache = 0x800C2C00; // type:func +Audio_WritebackDCache = 0x800C2C40; // type:func +osAiSetNextBuffer = 0x800C2C80; // type:func +Audio_InitNoteSub = 0x800C2D00; // type:func +Audio_NoteSetResamplingRate = 0x800C3178; // type:func +Audio_NoteInit = 0x800C3228; // type:func +Audio_NoteDisable = 0x800C32E8; // type:func +Audio_ProcessNotes = 0x800C334C; // type:func +Audio_GetInstrumentTunedSample = 0x800C381C; // type:func +Audio_GetInstrumentInner = 0x800C3858; // type:func +Audio_GetDrum = 0x800C392C; // type:func +Audio_GetSoundEffect = 0x800C3A10; // type:func +Audio_SetFontInstrument = 0x800C3B04; // type:func +Audio_SeqLayerDecayRelease = 0x800C3C48; // type:func +Audio_SeqLayerNoteDecay = 0x800C3F20; // type:func +Audio_SeqLayerNoteRelease = 0x800C3F40; // type:func +Audio_BuildSyntheticWave = 0x800C3F60; // type:func +Audio_InitSyntheticWave = 0x800C4064; // type:func +Audio_InitNoteList = 0x800C40BC; // type:func +Audio_InitNoteLists = 0x800C40CC; // type:func +Audio_InitNoteFreeList = 0x800C411C; // type:func +Audio_NotePoolClear = 0x800C41C0; // type:func +Audio_NotePoolFill = 0x800C4320; // type:func +Audio_AudioListPushFront = 0x800C445C; // type:func +Audio_AudioListRemove = 0x800C449C; // type:func +Audio_FindNodeWithPrioLessThan = 0x800C44C8; // type:func +Audio_NoteInitForLayer = 0x800C4548; // type:func +func_800E82C0 = 0x800C4680; // type:func +Audio_NoteReleaseAndTakeOwnership = 0x800C46B4; // type:func +Audio_AllocNoteFromDisabled = 0x800C46E0; // type:func +Audio_AllocNoteFromDecaying = 0x800C472C; // type:func +Audio_AllocNoteFromActive = 0x800C477C; // type:func +Audio_AllocNote = 0x800C4874; // type:func +Audio_NoteInitAll = 0x800C4B48; // type:func +Audio_SequenceChannelProcessSound = 0x800C4C80; // type:func +Audio_SequencePlayerProcessSound = 0x800C4E48; // type:func +Audio_GetPortamentoFreqScale = 0x800C4F94; // type:func +Audio_GetVibratoPitchChange = 0x800C4FF0; // type:func +Audio_GetVibratoFreqScale = 0x800C5028; // type:func +Audio_NoteVibratoUpdate = 0x800C5264; // type:func +Audio_NoteVibratoInit = 0x800C52C0; // type:func +Audio_NotePortamentoInit = 0x800C5378; // type:func +Audio_AdsrInit = 0x800C53A4; // type:func +Audio_AdsrUpdate = 0x800C53C4; // type:func +AudioSeq_GetScriptControlFlowArgument = 0x800C5700; // type:func +AudioSeq_HandleScriptFlowControl = 0x800C5768; // type:func +AudioSeq_InitSequenceChannel = 0x800C5944; // type:func +AudioSeq_SeqChannelSetLayer = 0x800C5A98; // type:func +AudioSeq_SeqLayerDisable = 0x800C5BBC; // type:func +AudioSeq_SeqLayerFree = 0x800C5C38; // type:func +AudioSeq_SequenceChannelDisable = 0x800C5C88; // type:func +AudioSeq_SequencePlayerSetupChannels = 0x800C5CF4; // type:func +AudioSeq_SequencePlayerDisableChannels = 0x800C5DEC; // type:func +AudioSeq_SequenceChannelEnable = 0x800C5E6C; // type:func +AudioSeq_SequencePlayerDisableAsFinished = 0x800C5F04; // type:func +AudioSeq_SequencePlayerDisable = 0x800C5F2C; // type:func +AudioSeq_AudioListPushBack = 0x800C5FE8; // type:func +AudioSeq_AudioListPopBack = 0x800C6028; // type:func +AudioSeq_InitLayerFreelist = 0x800C6068; // type:func +AudioSeq_ScriptReadU8 = 0x800C6108; // type:func +AudioSeq_ScriptReadS16 = 0x800C611C; // type:func +AudioSeq_ScriptReadCompressedU16 = 0x800C6154; // type:func +AudioSeq_SeqLayerProcessScript = 0x800C6194; // type:func +AudioSeq_SeqLayerProcessScriptStep1 = 0x800C6298; // type:func +AudioSeq_SeqLayerProcessScriptStep5 = 0x800C6324; // type:func +AudioSeq_SeqLayerProcessScriptStep2 = 0x800C6480; // type:func +AudioSeq_SeqLayerProcessScriptStep4 = 0x800C6800; // type:func +AudioSeq_SeqLayerProcessScriptStep3 = 0x800C6EA0; // type:func +AudioSeq_SetChannelPriorities = 0x800C72B4; // type:func +AudioSeq_GetInstrument = 0x800C72E4; // type:func +AudioSeq_SetInstrument = 0x800C7358; // type:func +AudioSeq_SequenceChannelSetVolume = 0x800C7404; // type:func +AudioSeq_SequenceChannelProcessScript = 0x800C7428; // type:func +AudioSeq_SequencePlayerProcessSequence = 0x800C8118; // type:func +AudioSeq_ProcessSequences = 0x800C8924; // type:func +AudioSeq_SkipForwardSequence = 0x800C89D8; // type:func +AudioSeq_ResetSequencePlayer = 0x800C8A28; // type:func +AudioSeq_InitSequencePlayerChannels = 0x800C8AF4; // type:func +AudioSeq_InitSequencePlayer = 0x800C8BCC; // type:func +AudioSeq_InitSequencePlayers = 0x800C8C9C; // type:func +AudioOcarina_SetCustomButtonMapping = 0x800C8D20; // type:func +AudioOcarina_ReadControllerInput = 0x800C8DC0; // type:func +AudioOcarina_BendPitchTwoSemitones = 0x800C8E20; // type:func +AudioOcarina_GetPlayingState = 0x800C8EB0; // type:func +AudioOcarina_MapNoteToButton = 0x800C8EF4; // type:func +AudioOcarina_MapNotesToScarecrowButtons = 0x800C8F3C; // type:func +AudioOcarina_Start = 0x800C8FC4; // type:func +AudioOcarina_CheckIfStartedSong = 0x800C917C; // type:func +AudioOcarina_CheckSongsWithMusicStaff = 0x800C91B8; // type:func +AudioOcarina_CheckSongsWithoutMusicStaff = 0x800C95C0; // type:func +AudioOcarina_PlayControllerInput = 0x800C9818; // type:func +AudioOcarina_EnableInput = 0x800C9C08; // type:func +AudioOcarina_SetInstrument = 0x800C9C18; // type:func +AudioOcarina_SetPlaybackSong = 0x800C9CFC; // type:func +AudioOcarina_PlaybackSong = 0x800C9DFC; // type:func +AudioOcarina_SetRecordingSong = 0x800CA128; // type:func +AudioOcarina_SetRecordingState = 0x800CA530; // type:func +AudioOcarina_UpdateRecordingStaff = 0x800CA65C; // type:func +AudioOcarina_UpdatePlayingStaff = 0x800CA694; // type:func +AudioOcarina_UpdatePlaybackStaff = 0x800CA6D8; // type:func +AudioOcarina_GetRecordingStaff = 0x800CA788; // type:func +AudioOcarina_GetPlayingStaff = 0x800CA794; // type:func +AudioOcarina_GetPlaybackStaff = 0x800CA7B8; // type:func +AudioOcarina_RecordSong = 0x800CA7C4; // type:func +AudioOcarina_MemoryGameInit = 0x800CA93C; // type:func +AudioOcarina_MemoryGameNextNote = 0x800CA9AC; // type:func +AudioOcarina_Update = 0x800CAAB4; // type:func +AudioOcarina_PlayLongScarecrowSong = 0x800CABE4; // type:func +AudioOcarina_ResetStaffs = 0x800CACF0; // type:func +AudioDebug_Draw = 0x800CAD3C; // type:func +AudioDebug_ScrPrt = 0x800CAD44; // type:func +Audio_Update = 0x800CAD50; // type:func +func_800F3138 = 0x800CADF4; // type:func +func_800F3140 = 0x800CADFC; // type:func +func_800F314C = 0x800CAE08; // type:func +Audio_ComputeSfxVolume = 0x800CAE44; // type:func +Audio_ComputeSfxReverb = 0x800CAFAC; // type:func +Audio_ComputeSfxPanSigned = 0x800CB124; // type:func +Audio_ComputeSfxFreqScale = 0x800CB2A8; // type:func +func_800F37B8 = 0x800CB474; // type:func +func_800F3990 = 0x800CB64C; // type:func +Audio_SetSfxProperties = 0x800CB6C4; // type:func +Audio_ResetSfxChannelState = 0x800CBB9C; // type:func +Audio_PlayCutsceneEffectsSequence = 0x800CBC04; // type:func +func_800F3F84 = 0x800CBC4C; // type:func +func_800F4010 = 0x800CBCD8; // type:func +func_800F4138 = 0x800CBDF8; // type:func +func_800F4190 = 0x800CBE50; // type:func +Audio_PlaySfxRandom = 0x800CBEA0; // type:func +func_800F4254 = 0x800CBF14; // type:func +func_800F436C = 0x800CC02C; // type:func +func_800F4414 = 0x800CC0D4; // type:func +func_800F44EC = 0x800CC1AC; // type:func +func_800F4524 = 0x800CC1E4; // type:func +func_800F4578 = 0x800CC238; // type:func +func_800F45D0 = 0x800CC290; // type:func +Audio_PlaySfxRiver = 0x800CC2F4; // type:func +Audio_PlaySfxWaterfall = 0x800CC3A0; // type:func +Audio_StepFreqLerp = 0x800CC444; // type:func +Audio_SetBgmVolumeOffDuringFanfare = 0x800CC47C; // type:func +Audio_SetBgmVolumeOnDuringFanfare = 0x800CC4BC; // type:func +Audio_SetMainBgmVolume = 0x800CC4FC; // type:func +Audio_SetGanonsTowerBgmVolumeLevel = 0x800CC530; // type:func +Audio_SetGanonsTowerBgmVolume = 0x800CC5DC; // type:func +Audio_LowerMainBgmVolume = 0x800CC714; // type:func +Audio_UpdateRiverSoundVolumes = 0x800CC730; // type:func +Audio_PlaySfxIncreasinglyTransposed = 0x800CC818; // type:func +Audio_ResetIncreasingTranspose = 0x800CC8A8; // type:func +Audio_PlaySfxTransposed = 0x800CC8B4; // type:func +func_800F4C58 = 0x800CC918; // type:func +func_800F4E30 = 0x800CCAF0; // type:func +Audio_ClearSariaBgm = 0x800CCD8C; // type:func +Audio_ClearSariaBgmAtPos = 0x800CCDAC; // type:func +Audio_SplitBgmChannels = 0x800CCDCC; // type:func +Audio_PlaySariaBgm = 0x800CCF60; // type:func +Audio_ClearSariaBgm2 = 0x800CD1C4; // type:func +Audio_PlayMorningSceneSequence = 0x800CD1D0; // type:func +Audio_PlaySceneSequence = 0x800CD210; // type:func +Audio_UpdateSceneSequenceResumePoint = 0x800CD368; // type:func +Audio_PlayWindmillBgm = 0x800CD3D8; // type:func +Audio_SetMainBgmTempoFreqAfterFanfare = 0x800CD40C; // type:func +Audio_SetFastTempoForTimedMinigame = 0x800CD5D8; // type:func +Audio_PlaySequenceInCutscene = 0x800CD61C; // type:func +Audio_StopSequenceInCutscene = 0x800CD6A8; // type:func +Audio_IsSequencePlaying = 0x800CD718; // type:func +func_800F5ACC = 0x800CD78C; // type:func +func_800F5B58 = 0x800CD800; // type:func +func_800F5BF0 = 0x800CD898; // type:func +func_800F5C2C = 0x800CD8D4; // type:func +Audio_PlayFanfare = 0x800CD90C; // type:func +Audio_UpdateFanfare = 0x800CD9A0; // type:func +Audio_PlaySequenceWithSeqPlayerIO = 0x800CDAC0; // type:func +Audio_SetSequenceMode = 0x800CDB38; // type:func +Audio_SetBgmEnemyVolume = 0x800CDDB4; // type:func +Audio_UpdateMalonSinging = 0x800CDF08; // type:func +func_800F64E0 = 0x800CE16C; // type:func +Audio_ToggleMalonSinging = 0x800CE210; // type:func +Audio_SetEnvReverb = 0x800CE34C; // type:func +Audio_SetCodeReverb = 0x800CE368; // type:func +func_800F6700 = 0x800CE38C; // type:func +Audio_SetBaseFilter = 0x800CE42C; // type:func +Audio_SetExtraFilter = 0x800CE4B4; // type:func +Audio_SetCutsceneFlag = 0x800CE548; // type:func +Audio_PlaySfxGeneralIfNotInCutscene = 0x800CE560; // type:func +Audio_PlaySfxIfNotInCutscene = 0x800CE5A8; // type:func +func_800F6964 = 0x800CE5F0; // type:func +Audio_StopBgmAndFanfare = 0x800CE73C; // type:func +func_800F6B3C = 0x800CE7C8; // type:func +Audio_DisableAllSeq = 0x800CE7F4; // type:func +func_800F6BB8 = 0x800CE844; // type:func +func_800F6BDC = 0x800CE868; // type:func +Audio_PreNMI = 0x800CE8A0; // type:func +func_800F6C34 = 0x800CE8C0; // type:func +Audio_SetNatureAmbienceChannelIO = 0x800CE9E4; // type:func +Audio_StartNatureAmbienceSequence = 0x800CEAF8; // type:func +Audio_PlayNatureAmbienceSequence = 0x800CEBFC; // type:func +Audio_Init = 0x800CED40; // type:func +Audio_InitSound = 0x800CED64; // type:func +func_800F7170 = 0x800CEDB8; // type:func +func_800F71BC = 0x800CEE04; // type:func +func_800F7208 = 0x800CEE50; // type:func +Audio_SetSfxBanksMute = 0x800CEEB0; // type:func +Audio_QueueSeqCmdMute = 0x800CEF08; // type:func +Audio_ClearBGMMute = 0x800CEF6C; // type:func +Audio_PlaySfxGeneral = 0x800CEFDC; // type:func +Audio_RemoveMatchingSfxRequests = 0x800CF05C; // type:func +Audio_ProcessSfxRequest = 0x800CF1FC; // type:func +Audio_RemoveSfxBankEntry = 0x800CF698; // type:func +Audio_ChooseActiveSfx = 0x800CF830; // type:func +Audio_PlayActiveSfx = 0x800CFF70; // type:func +Audio_StopSfxByBank = 0x800D0290; // type:func +Audio_RemoveSfxFromBankByPos = 0x800D0374; // type:func +Audio_StopSfxByPosAndBank = 0x800D0490; // type:func +Audio_StopSfxByPos = 0x800D04D8; // type:func +Audio_StopSfxByPosAndId = 0x800D0534; // type:func +Audio_StopSfxByTokenAndId = 0x800D0690; // type:func +Audio_StopSfxById = 0x800D07F4; // type:func +Audio_ProcessSfxRequests = 0x800D092C; // type:func +Audio_SetUnusedBankLerp = 0x800D0990; // type:func +Audio_StepUnusedBankLerp = 0x800D0A24; // type:func +func_800F8F88 = 0x800D0A78; // type:func +Audio_IsSfxPlaying = 0x800D0AE4; // type:func +Audio_ResetSfx = 0x800D0B4C; // type:func +Audio_StartSequence = 0x800D0D10; // type:func +Audio_StopSequence = 0x800D0E94; // type:func +Audio_ProcessSeqCmd = 0x800D0F1C; // type:func +Audio_QueueSeqCmd = 0x800D19E0; // type:func +Audio_ProcessSeqCmds = 0x800D1A08; // type:func +Audio_GetActiveSeqId = 0x800D1A88; // type:func +Audio_IsSeqCmdNotQueued = 0x800D1AF0; // type:func +Audio_ResetSequenceRequests = 0x800D1B48; // type:func +Audio_ReplaceSeqCmdSetupOpVolRestore = 0x800D1B60; // type:func +Audio_SetVolumeScale = 0x800D1C14; // type:func +Audio_UpdateActiveSequences = 0x800D1DB0; // type:func +func_800FAD34 = 0x800D2708; // type:func +Audio_ResetActiveSequences = 0x800D27CC; // type:func +Audio_ResetActiveSequencesAndVolume = 0x800D2888; // type:func +func_800FC800 = 0x800D2930; // type:func +func_800FC83C = 0x800D2960; // type:func +func_800FC868 = 0x800D298C; // type:func +func_800FC8D8 = 0x800D29FC; // type:func +func_800FC948 = 0x800D2A6C; // type:func +func_800FCA18 = 0x800D2B3C; // type:func +func_800FCB34 = 0x800D2BD8; // type:func +SystemHeap_Init = 0x800D2C48; // type:func +LogUtils_HungupThread = 0x800D2C70; // type:func +LogUtils_ResetHungup = 0x800D2CA4; // type:func +GfxPrint_Setup = 0x800D2CD0; // type:func +GfxPrint_SetColor = 0x800D311C; // type:func +GfxPrint_SetPosPx = 0x800D3168; // type:func +GfxPrint_SetPos = 0x800D318C; // type:func +GfxPrint_SetBasePosPx = 0x800D31B4; // type:func +GfxPrint_PrintCharImpl = 0x800D31C8; // type:func +GfxPrint_PrintChar = 0x800D365C; // type:func +GfxPrint_PrintStringWithSize = 0x800D381C; // type:func +GfxPrint_PrintString = 0x800D3878; // type:func +GfxPrint_Callback = 0x800D38D0; // type:func +GfxPrint_Init = 0x800D38FC; // type:func +GfxPrint_Destroy = 0x800D3984; // type:func +GfxPrint_Open = 0x800D398C; // type:func +GfxPrint_Close = 0x800D39C0; // type:func +GfxPrint_VPrintf = 0x800D39F0; // type:func +GfxPrint_Printf = 0x800D3A10; // type:func +Overlay_Relocate = 0x800D3A40; // type:func +Overlay_AllocateAndLoad = 0x800D3C80; // type:func +Overlay_Load = 0x800D3CE0; // type:func +PadSetup_Init = 0x800D3DB0; // type:func +PadUtils_Init = 0x800D3EF0; // type:func +func_800FCB70 = 0x800D3F10; // type:func +PadUtils_ResetPressRel = 0x800D3F18; // type:func +PadUtils_CheckCurExact = 0x800D3F24; // type:func +PadUtils_CheckCur = 0x800D3F3C; // type:func +PadUtils_CheckPressed = 0x800D3F58; // type:func +PadUtils_CheckReleased = 0x800D3F74; // type:func +PadUtils_GetCurButton = 0x800D3F90; // type:func +PadUtils_GetPressButton = 0x800D3F98; // type:func +PadUtils_GetCurX = 0x800D3FA0; // type:func +PadUtils_GetCurY = 0x800D3FA8; // type:func +PadUtils_SetRelXY = 0x800D3FB0; // type:func +PadUtils_GetRelXImpl = 0x800D3FBC; // type:func +PadUtils_GetRelYImpl = 0x800D3FC4; // type:func +PadUtils_GetRelX = 0x800D3FCC; // type:func +PadUtils_GetRelY = 0x800D3FEC; // type:func +PadUtils_UpdateRelXY = 0x800D400C; // type:func +RcpUtils_PrintRegisterStatus = 0x800D40E0; // type:func +RcpUtils_Reset = 0x800D4108; // type:func +ArenaImpl_LockInit = 0x800D4140; // type:func +ArenaImpl_Lock = 0x800D416C; // type:func +ArenaImpl_Unlock = 0x800D4194; // type:func +ArenaImpl_GetLastBlock = 0x800D41BC; // type:func +__osMallocInit = 0x800D4220; // type:func +__osMallocAddBlock = 0x800D4270; // type:func +__osMallocCleanup = 0x800D4310; // type:func +__osMallocIsInitialized = 0x800D4330; // type:func +__osMalloc_NoLock = 0x800D4338; // type:func +__osMalloc = 0x800D4464; // type:func +__osMallocR = 0x800D44A4; // type:func +__osFree_NoLock = 0x800D4618; // type:func +__osFree = 0x800D4758; // type:func +__osRealloc = 0x800D4790; // type:func +ArenaImpl_GetSizes = 0x800D4B88; // type:func +ArenaImpl_FaultClient = 0x800D4C5C; // type:func +__osCheckArena = 0x800D4E30; // type:func +PrintUtils_VPrintf = 0x800D4EF0; // type:func +PrintUtils_Printf = 0x800D4F24; // type:func +SystemArena_Malloc = 0x800D4F50; // type:func +SystemArena_MallocR = 0x800D4F78; // type:func +SystemArena_Realloc = 0x800D4FA0; // type:func +SystemArena_Free = 0x800D4FD0; // type:func +SystemArena_Calloc = 0x800D4FF8; // type:func +SystemArena_GetSizes = 0x800D504C; // type:func +SystemArena_Check = 0x800D5084; // type:func +SystemArena_Init = 0x800D50A8; // type:func +SystemArena_Cleanup = 0x800D50D8; // type:func +SystemArena_IsInitialized = 0x800D50FC; // type:func +Math_FTanF = 0x800D5120; // type:func +Math_FFloorF = 0x800D5154; // type:func +Math_FCeilF = 0x800D5174; // type:func +Math_FRoundF = 0x800D5194; // type:func +Math_FTruncF = 0x800D51B4; // type:func +Math_FNearbyIntF = 0x800D51D4; // type:func +Math_FAtanTaylorQF = 0x800D51F4; // type:func +Math_FAtanTaylorF = 0x800D5240; // type:func +Math_FAtanContFracF = 0x800D5364; // type:func +Math_FAtanF = 0x800D54B0; // type:func +Math_FAtan2F = 0x800D54F0; // type:func +Math_FAsinF = 0x800D55D8; // type:func +Math_FAcosF = 0x800D5608; // type:func +floorf = 0x800D5630; // type:func +floor = 0x800D563C; // type:func +lfloorf = 0x800D5648; // type:func +lfloor = 0x800D5658; // type:func +ceilf = 0x800D5668; // type:func +ceil = 0x800D5674; // type:func +lceilf = 0x800D5680; // type:func +lceil = 0x800D5690; // type:func +truncf = 0x800D56A0; // type:func +trunc = 0x800D56AC; // type:func +ltruncf = 0x800D56B8; // type:func +ltrunc = 0x800D56C8; // type:func +nearbyintf = 0x800D56D8; // type:func +nearbyint = 0x800D56E4; // type:func +lnearbyintf = 0x800D56F0; // type:func +lnearbyint = 0x800D5700; // type:func +roundf = 0x800D5710; // type:func +round = 0x800D572C; // type:func +lroundf = 0x800D574C; // type:func +lround = 0x800D576C; // type:func +Rand_Next = 0x800D5790; // type:func +Rand_Seed = 0x800D57C0; // type:func +Rand_ZeroOne = 0x800D57CC; // type:func +Rand_Centered = 0x800D5820; // type:func +Rand_Seed_Variable = 0x800D5878; // type:func +Rand_Next_Variable = 0x800D5880; // type:func +Rand_ZeroOne_Variable = 0x800D58A8; // type:func +Rand_Centered_Variable = 0x800D58F4; // type:func +Sleep_Cycles = 0x800D5950; // type:func +Sleep_Nsec = 0x800D59BC; // type:func +Sleep_Usec = 0x800D5A0C; // type:func +Sleep_Msec = 0x800D5A5C; // type:func +Sleep_Sec = 0x800D5AB0; // type:func +proutSprintf = 0x800D5AF0; // type:func +vsprintf = 0x800D5B14; // type:func +sprintf = 0x800D5B64; // type:func +JpegUtils_ProcessQuantizationTable = 0x800D5BC0; // type:func +JpegUtils_ParseHuffmanCodesLengths = 0x800D5C28; // type:func +JpegUtils_GetHuffmanCodes = 0x800D5CAC; // type:func +JpegUtils_SetHuffmanTable = 0x800D5D18; // type:func +JpegUtils_ProcessHuffmanTableImpl = 0x800D5DC0; // type:func +JpegUtils_ProcessHuffmanTable = 0x800D5E7C; // type:func +JpegUtils_SetHuffmanTableOld = 0x800D5F54; // type:func +JpegUtils_ProcessHuffmanTableImplOld = 0x800D5FFC; // type:func +JpegDecoder_Decode = 0x800D60D0; // type:func +JpegDecoder_ProcessMcu = 0x800D62F8; // type:func +JpegDecoder_ParseNextSymbol = 0x800D6494; // type:func +JpegDecoder_ReadBits = 0x800D65D0; // type:func +osAiGetLength = 0x800D66C0; // type:func +osAiSetFrequency = 0x800D66D0; // type:func +alInit = 0x800D67D0; // type:func +alClose = 0x800D67FC; // type:func +alLink = 0x800D682C; // type:func +alUnlink = 0x800D684C; // type:func +alSynNew = 0x800D6880; // type:func +alAudioFrame = 0x800D6BA4; // type:func +__allocParam = 0x800D6D50; // type:func +__freeParam = 0x800D6D7C; // type:func +_collectPVoices = 0x800D6D94; // type:func +_freePVoice = 0x800D6DE4; // type:func +_timeToSamplesNoRound = 0x800D6E24; // type:func +_timeToSamples = 0x800D6E6C; // type:func +__nextSampleTime = 0x800D6E90; // type:func +alSynDelete = 0x800D6EF0; // type:func +alSynAllocFX = 0x800D6F00; // type:func +osWritebackDCacheAll = 0x800D6FA0; // type:func +osContStartQuery = 0x800D6FD0; // type:func +osContGetQuery = 0x800D7054; // type:func +osContStartReadData = 0x800D7080; // type:func +osContGetReadData = 0x800D7108; // type:func +__osPackReadData = 0x800D7244; // type:func +osContInit = 0x800D7300; // type:func +__osContGetInitData = 0x800D74A4; // type:func +__osPackRequestData = 0x800D7610; // type:func +osContSetCh = 0x800D76D0; // type:func +sqrtf = 0x800D7730; // type:func +cosf = 0x800D7740; // type:func +coss = 0x800D7870; // type:func +guLookAtF = 0x800D7890; // type:func +guLookAt = 0x800D7B54; // type:func +guLookAtHiliteF = 0x800D7BC0; // type:func +guLookAtHilite = 0x800D83B8; // type:func +guOrthoF = 0x800D8490; // type:func +guOrtho = 0x800D85AC; // type:func +guPerspectiveF = 0x800D8600; // type:func +guPerspective = 0x800D87A8; // type:func +guPositionF = 0x800D8800; // type:func +guPosition = 0x800D8988; // type:func +sinf = 0x800D89E0; // type:func +sins = 0x800D8B60; // type:func +guS2DInitBg = 0x800D8BB0; // type:func +__ull_rshift = 0x800D8CD0; // type:func +__ull_rem = 0x800D8D4C; // type:func +__ull_div = 0x800D8DB0; // type:func +__ll_lshift = 0x800D8E0C; // type:func +__ll_rem = 0x800D8E88; // type:func +__ll_div = 0x800D8EEC; // type:func +__ll_mul = 0x800D8F48; // type:func +__ull_divremi = 0x800D8FBC; // type:func +__ll_mod = 0x800D9060; // type:func +__ll_rshift = 0x800D91CC; // type:func +__d_to_ll = 0x800D9250; // type:func +__f_to_ll = 0x800D9294; // type:func +__d_to_ull = 0x800D92D8; // type:func +__f_to_ull = 0x800D931C; // type:func +__ll_to_d = 0x800D9360; // type:func +__ll_to_f = 0x800D93A4; // type:func +__ull_to_d = 0x800D93E8; // type:func +__ull_to_f = 0x800D94A4; // type:func +strchr = 0x800D9560; // type:func +strlen = 0x800D9590; // type:func +memcpy = 0x800D95B4; // type:func +_Printf = 0x800D95E0; // type:func +_Putfld = 0x800D9B1C; // type:func +osDpGetStatus = 0x800D9FC0; // type:func +osDpSetStatus = 0x800D9FD0; // type:func +__osSpGetStatus = 0x800D9FE0; // type:func +__osSpSetStatus = 0x800D9FF0; // type:func +_VirtualToPhysicalTask = 0x800DA000; // type:func +osSpTaskLoad = 0x800DA0DC; // type:func +osSpTaskStartGo = 0x800DA1E0; // type:func +osSpTaskYield = 0x800DA210; // type:func +osSpTaskYielded = 0x800DA230; // type:func +__osSiRawStartDma = 0x800DA280; // type:func +__osSiCreateAccessQueue = 0x800DA360; // type:func +__osSiGetAccess = 0x800DA3B4; // type:func +__osSiRelAccess = 0x800DA3F0; // type:func +osGetThreadId = 0x800DA420; // type:func +__osGetActiveQueue = 0x800DA470; // type:func +osSetTimer = 0x800DA4A0; // type:func +osStopTimer = 0x800DA660; // type:func +osViGetCurrentFramebuffer = 0x800DA780; // type:func +osViSetEvent = 0x800DA7C0; // type:func +guMtxIdent = 0x800DA820; // type:func +guMtxIdentF = 0x800DA880; // type:func +guMtxF2L = 0x800DA8E0; // type:func +guScale = 0x800DA960; // type:func +guTranslate = 0x800DAA00; // type:func +guRotateF = 0x800DAAD0; // type:func +guRotate = 0x800DAC1C; // type:func +__osGetCurrFaultedThread = 0x800DAC60; // type:func +skGetId = 0x800DAC90; // type:func +skLaunchSetup = 0x800DACAC; // type:func +skLaunch = 0x800DACC8; // type:func +skRecryptListValid = 0x800DACE4; // type:func +skRecryptBegin = 0x800DAD00; // type:func +skRecryptData = 0x800DAD1C; // type:func +skRecryptComputeState = 0x800DAD38; // type:func +skRecryptEnd = 0x800DAD54; // type:func +skSignHash = 0x800DAD70; // type:func +skVerifyHash = 0x800DAD8C; // type:func +skGetConsumption = 0x800DADA8; // type:func +skAdvanceTicketWindow = 0x800DADC4; // type:func +skSetLimit = 0x800DADE0; // type:func +skExit = 0x800DADFC; // type:func +skKeepAlive = 0x800DAE18; // type:func +skGetRandomKeyData = 0x800DAE34; // type:func +skDumpVirage = 0x800DAE50; // type:func +skTest2 = 0x800DAE6C; // type:func +skTest3 = 0x800DAE88; // type:func +skResetWindow = 0x800DAEA4; // type:func +skValidateRls = 0x800DAEC0; // type:func +strcmp = 0x800DAEE0; // type:func +memset = 0x800DAF30; // type:func +strncmp = 0x800DAF54; // type:func +__osMotorAccess = 0x800DAFD0; // type:func +osMotorInit = 0x800DAFD8; // type:func +osAfterPreNMI = 0x800DAFE0; // type:func +_init_lpfilter = 0x800DB020; // type:func +alFxNew = 0x800DB0D0; // type:func +alEnvmixerNew = 0x800DB4E4; // type:func +alLoadNew = 0x800DB594; // type:func +alResampleNew = 0x800DB644; // type:func +alAuxBusNew = 0x800DB6D0; // type:func +alMainBusNew = 0x800DB72C; // type:func +alSaveNew = 0x800DB788; // type:func +alAdpcmPull = 0x800DB7D0; // type:func +alRaw16Pull = 0x800DBBEC; // type:func +alLoadParam = 0x800DBF70; // type:func +_decodeChunk = 0x800DC0FC; // type:func +alAuxBusPull = 0x800DC260; // type:func +alAuxBusParam = 0x800DC33C; // type:func +alEnvmixerPull = 0x800DC370; // type:func +alEnvmixerParam = 0x800DC83C; // type:func +_pullSubFrame = 0x800DC904; // type:func +_frexpf = 0x800DCBC8; // type:func +_ldexpf = 0x800DCC7C; // type:func +_getRate = 0x800DCC9C; // type:func +_getVol = 0x800DCE5C; // type:func +alFilterNew = 0x800DCEE0; // type:func +alMainBusPull = 0x800DCF00; // type:func +alMainBusParam = 0x800DD044; // type:func +alResamplePull = 0x800DD070; // type:func +alResampleParam = 0x800DD248; // type:func +alFxPull = 0x800DD310; // type:func +alFxParam = 0x800DD660; // type:func +alFxParamHdl = 0x800DD674; // type:func +_loadOutputBuffer = 0x800DD850; // type:func +_loadBuffer = 0x800DDA54; // type:func +_saveBuffer = 0x800DDBC0; // type:func +_filterBuffer = 0x800DDD30; // type:func +_doModFunc = 0x800DDDE8; // type:func +alSavePull = 0x800DDE80; // type:func +alSaveParam = 0x800DDF2C; // type:func +alHeapDBAlloc = 0x800DDF60; // type:func +alCopy = 0x800DDFB0; // type:func +_Litob = 0x800DDFE0; // type:func +_Ldtob = 0x800DE210; // type:func +_Ldunscale = 0x800DE63C; // type:func +_Genld = 0x800DE6D8; // type:func +__osSpDeviceBusy = 0x800DEC10; // type:func +__osSpSetPc = 0x800DEC40; // type:func +__osSpRawStartDma = 0x800DEC70; // type:func +guNormalize = 0x800DED00; // type:func +ldiv = 0x800DED60; // type:func +lldiv = 0x800DEDDC; // type:func +fmodf = 0x800DEF20; // type:func +memmove = 0x800DEF60; // type:func +absf = 0x800DEFF0; // type:func +sqrt = 0x800DF000; // type:func +Message_ResetOcarinaNoteState = 0x800DF010; // type:func +Message_UpdateOcarinaMemoryGame = 0x800DF0F4; // type:func +Message_ShouldAdvance = 0x800DF1E4; // type:func +Message_ShouldAdvanceSilent = 0x800DF29C; // type:func +Message_CloseTextbox = 0x800DF2DC; // type:func +Message_HandleChoiceSelection = 0x800DF35C; // type:func +Message_DrawTextChar = 0x800DF528; // type:func +Message_GrowTextbox = 0x800DF85C; // type:func +Message_FindMessageJPN = 0x800DFA58; // type:func +Message_FindMessageNES = 0x800DFADC; // type:func +Message_FindCreditsMessage = 0x800DFB60; // type:func +Message_SetTextColor = 0x800DFBCC; // type:func +Message_DrawTextboxIcon = 0x800DFEAC; // type:func +Message_DrawItemIcon = 0x800E06E0; // type:func +Message_HandleOcarina = 0x800E0A4C; // type:func +Message_DrawTextWide = 0x800E0BE8; // type:func +Message_DrawText = 0x800E208C; // type:func +Message_LoadItemIcon = 0x800E33C4; // type:func +Message_Decode = 0x800E3520; // type:func +Message_OpenText = 0x800E5D2C; // type:func +Message_StartTextbox = 0x800E61B0; // type:func +Message_ContinueTextbox = 0x800E6240; // type:func +Message_StartOcarinaImpl = 0x800E6364; // type:func +Message_StartOcarina = 0x800E67C0; // type:func +Message_StartOcarinaSunsSongDisabled = 0x800E67E8; // type:func +Message_GetState = 0x800E6814; // type:func +Message_DrawTextBox = 0x800E691C; // type:func +Message_SetView = 0x800E6DBC; // type:func +Message_DrawMain = 0x800E6E04; // type:func +Message_Draw = 0x800E9F58; // type:func +Message_Update = 0x800E9FF8; // type:func +Message_SetTables = 0x800EAAF8; // type:func +GameOver_Init = 0x800EAB30; // type:func +GameOver_FadeInLights = 0x800EAB44; // type:func +GameOver_Update = 0x800EABAC; // type:func +Interface_Destroy = 0x800EB070; // type:func +Interface_Init = 0x800EB08C; // type:func +Message_Init = 0x800EB474; // type:func +Regs_InitDataImpl = 0x800EB558; // type:func +Regs_InitData = 0x800EBF48; // type:func +ConsoleLogo_Calc = 0x80800000; // type:func +ConsoleLogo_SetupView = 0x80800098; // type:func +ConsoleLogo_Draw = 0x8080011C; // type:func +ConsoleLogo_Main = 0x808006C0; // type:func +ConsoleLogo_Destroy = 0x80800780; // type:func +ConsoleLogo_Init = 0x8080079C; // type:func +MapSelect_LoadTitle = 0x80800930; // type:func +MapSelect_LoadGame = 0x80800950; // type:func +MapSelect_UpdateMenu = 0x80800A40; // type:func +MapSelect_PrintMenu = 0x808013A0; // type:func +MapSelect_PrintLoadingMessage = 0x8080157C; // type:func +MapSelect_PrintAgeSetting = 0x80801608; // type:func +MapSelect_PrintCutsceneSetting = 0x8080167C; // type:func +MapSelect_DrawMenu = 0x80801838; // type:func +MapSelect_DrawLoadingScreen = 0x8080194C; // type:func +MapSelect_Draw = 0x80801A34; // type:func +MapSelect_Main = 0x80801AE8; // type:func +MapSelect_Destroy = 0x80801B14; // type:func +MapSelect_Init = 0x80801B20; // type:func +TitleSetup_SetupTitleScreen = 0x808035B0; // type:func +func_80803C5C = 0x8080361C; // type:func +TitleSetup_Main = 0x80803624; // type:func +TitleSetup_Destroy = 0x80803668; // type:func +TitleSetup_Init = 0x80803670; // type:func +FileSelect_SetupCopySource = 0x80803700; // type:func +FileSelect_SelectCopySource = 0x8080392C; // type:func +FileSelect_SetupCopyDest1 = 0x80803CD0; // type:func +FileSelect_SetupCopyDest2 = 0x80803EE4; // type:func +FileSelect_SelectCopyDest = 0x80803FD4; // type:func +FileSelect_ExitToCopySource1 = 0x80804400; // type:func +FileSelect_ExitToCopySource2 = 0x808044FC; // type:func +FileSelect_SetupCopyConfirm1 = 0x80804644; // type:func +FileSelect_SetupCopyConfirm2 = 0x80804900; // type:func +FileSelect_CopyConfirm = 0x80804968; // type:func +FileSelect_ReturnToCopyDest = 0x80804B78; // type:func +FileSelect_CopyAnim1 = 0x80804E5C; // type:func +FileSelect_CopyAnim2 = 0x80804F1C; // type:func +FileSelect_CopyAnim3 = 0x808050D8; // type:func +FileSelect_CopyAnim4 = 0x80805228; // type:func +FileSelect_CopyAnim5 = 0x80805370; // type:func +FileSelect_ExitCopyToMain = 0x8080579C; // type:func +FileSelect_SetupEraseSelect = 0x80805910; // type:func +FileSelect_EraseSelect = 0x80805B4C; // type:func +FileSelect_SetupEraseConfirm1 = 0x80805EF0; // type:func +FileSelect_SetupEraseConfirm2 = 0x808062D8; // type:func +FileSelect_EraseConfirm = 0x808063F8; // type:func +FileSelect_ExitToEraseSelect1 = 0x808065F8; // type:func +FileSelect_ExitToEraseSelect2 = 0x808066E0; // type:func +FileSelect_EraseAnim1 = 0x808069BC; // type:func +FileSelect_EraseAnim2 = 0x80806C2C; // type:func +FileSelect_EraseAnim3 = 0x80806CE4; // type:func +FileSelect_ExitEraseToMain = 0x80807004; // type:func +FileSelect_DrawCharacter = 0x808071E0; // type:func +FileSelect_DrawCharacterTransition = 0x80807318; // type:func +FileSelect_SetKeyboardVtx = 0x808074F8; // type:func +FileSelect_SetNameEntryVtx = 0x808077BC; // type:func +FileSelect_DrawKeyboard = 0x808084A0; // type:func +FileSelect_ApplyDiacriticToCharacter = 0x80808D64; // type:func +FileSelect_ApplyDiacriticToFilename = 0x80808F6C; // type:func +FileSelect_DrawNameEntry = 0x80808FEC; // type:func +FileSelect_StartNameEntry = 0x8080A450; // type:func +FileSelect_UpdateKeyboardCursor = 0x8080A504; // type:func +FileSelect_StartOptions = 0x8080AEE4; // type:func +FileSelect_UpdateOptionsMenu = 0x8080AF74; // type:func +FileSelect_DrawOptionsImpl = 0x8080B1F0; // type:func +FileSelect_DrawOptions = 0x8080C608; // type:func +FileSelect_SetView = 0x8080C630; // type:func +FileSelect_QuadTextureIA8 = 0x8080C6B4; // type:func +FileSelect_InitModeUpdate = 0x8080C894; // type:func +FileSelect_InitModeDraw = 0x8080C8EC; // type:func +FileSelect_FadeInMenuElements = 0x8080C8F8; // type:func +FileSelect_SplitNumber = 0x8080CA60; // type:func +FileSelect_StartFadeIn = 0x8080CAD4; // type:func +FileSelect_FinishFadeIn = 0x8080CB5C; // type:func +FileSelect_UpdateMainMenu = 0x8080CBF4; // type:func +FileSelect_UnusedCM31 = 0x8080D498; // type:func +FileSelect_UnusedCMDelay = 0x8080D4A4; // type:func +FileSelect_RotateToNameEntry = 0x8080D4F8; // type:func +FileSelect_RotateToOptions = 0x8080D56C; // type:func +FileSelect_RotateToMain = 0x8080D5E0; // type:func +FileSelect_PulsateCursor = 0x8080D658; // type:func +FileSelect_ConfigModeUpdate = 0x8080D754; // type:func +FileSelect_SetWindowVtx = 0x8080D790; // type:func +FileSelect_SetWindowContentVtx = 0x8080DA64; // type:func +FileSelect_DrawFileInfo = 0x8080ED28; // type:func +FileSelect_DrawWindowContents = 0x8080F4A4; // type:func +FileSelect_ConfigModeDraw = 0x80810958; // type:func +FileSelect_FadeMainToSelect = 0x80811238; // type:func +FileSelect_MoveSelectedFileToTop = 0x808113A4; // type:func +FileSelect_FadeInFileInfo = 0x808114A8; // type:func +FileSelect_ConfirmFile = 0x8081158C; // type:func +FileSelect_FadeOutFileInfo = 0x80811764; // type:func +FileSelect_MoveSelectedFileToSlot = 0x80811854; // type:func +FileSelect_FadeOut = 0x80811AAC; // type:func +FileSelect_LoadGame = 0x80811B08; // type:func +FileSelect_SelectModeUpdate = 0x80811CD0; // type:func +FileSelect_SelectModeDraw = 0x80811D0C; // type:func +FileSelect_Main = 0x808120C4; // type:func +FileSelect_InitContext = 0x8081268C; // type:func +FileSelect_Destroy = 0x80812CB8; // type:func +FileSelect_Init = 0x80812CC4; // type:func +KaleidoScope_DrawQuestStatus = 0x808141F0; // type:func +KaleidoScope_UpdateQuestStatusPoint = 0x808165DC; // type:func +KaleidoScope_DrawDebugEditorText = 0x808165F0; // type:func +KaleidoScope_DrawDigit = 0x808168E4; // type:func +KaleidoScope_DrawDebugEditor = 0x80816A58; // type:func +KaleidoScope_DrawEquipmentImage = 0x808185A0; // type:func +KaleidoScope_DrawPlayerWork = 0x808189A0; // type:func +KaleidoScope_DrawEquipment = 0x80818B44; // type:func +KaleidoScope_DrawAmmoCount = 0x8081A020; // type:func +KaleidoScope_SetCursorPos = 0x8081A55C; // type:func +KaleidoScope_SetItemCursorPos = 0x8081A58C; // type:func +KaleidoScope_DrawItemSelect = 0x8081A5B8; // type:func +KaleidoScope_UpdateItemEquip = 0x8081B414; // type:func +KaleidoScope_DrawDungeonMap = 0x8081C010; // type:func +KaleidoScope_DrawWorldMap = 0x8081D89C; // type:func +KaleidoScope_UpdatePrompt = 0x8081F5E0; // type:func +KaleidoScope_SetupPlayerPreRender = 0x8081F7E0; // type:func +KaleidoScope_ProcessPlayerPreRender = 0x8081F8CC; // type:func +KaleidoScope_QuadTextureIA4 = 0x8081F908; // type:func +KaleidoScope_QuadTextureIA8 = 0x8081FAE4; // type:func +KaleidoScope_OverridePalIndexCI4 = 0x8081FCC4; // type:func +KaleidoScope_MoveCursorToSpecialPos = 0x8081FD34; // type:func +KaleidoScope_DrawQuadTextureRGBA32 = 0x8081FD88; // type:func +KaleidoScope_SetDefaultCursor = 0x8081FF88; // type:func +KaleidoScope_SetupPageSwitch = 0x80820038; // type:func +KaleidoScope_HandlePageToggles = 0x808201B4; // type:func +KaleidoScope_DrawCursor = 0x808202AC; // type:func +KaleidoScope_DrawPageSections = 0x8082064C; // type:func +KaleidoScope_DrawPages = 0x80820900; // type:func +KaleidoScope_DrawInfoPanel = 0x80821FB8; // type:func +KaleidoScope_UpdateNamePanel = 0x80823404; // type:func +KaleidoScope_UpdatePageSwitch = 0x8082359C; // type:func +KaleidoScope_SetView = 0x8082376C; // type:func +KaleidoScope_SetPageVertices = 0x808237D8; // type:func +KaleidoScope_SetVertices = 0x8082459C; // type:func +KaleidoScope_DrawGameOver = 0x80825730; // type:func +KaleidoScope_Draw = 0x80825E18; // type:func +KaleidoScope_GrayOutTextureRGBA32 = 0x80826064; // type:func +KaleidoScope_UpdateOpening = 0x80826114; // type:func +KaleidoScope_UpdateCursorVtx = 0x808262F0; // type:func +KaleidoScope_LoadDungeonMap = 0x80826568; // type:func +KaleidoScope_UpdateDungeonMap = 0x808265F8; // type:func +KaleidoScope_Update = 0x808266DC; // type:func +PauseMapMark_Init = 0x80828BD0; // type:func +PauseMapMark_Clear = 0x80828C04; // type:func +PauseMapMark_DrawForDungeon = 0x80828C18; // type:func +PauseMapMark_Draw = 0x8082922C; // type:func +Player_ZeroSpeedXZ = 0x80830290; // type:func +func_80832224 = 0x808302A8; // type:func +Player_IsTalking = 0x808302D0; // type:func +Player_AnimPlayOnce = 0x808302EC; // type:func +Player_AnimPlayLoop = 0x80830310; // type:func +Player_AnimPlayLoopAdjusted = 0x80830334; // type:func +Player_AnimPlayOnceAdjusted = 0x80830364; // type:func +Player_ApplyYawFromAnim = 0x80830394; // type:func +func_80832318 = 0x808303B4; // type:func +func_80832340 = 0x808303E0; // type:func +Player_DetachHeldActor = 0x80830450; // type:func +func_80832440 = 0x808304DC; // type:func +Player_PutAwayHeldItem = 0x808305C4; // type:func +func_80832564 = 0x80830600; // type:func +func_80832594 = 0x80830638; // type:func +func_80832630 = 0x808306D8; // type:func +Player_RequestRumble = 0x808306F4; // type:func +Player_PlayVoiceSfx = 0x80830740; // type:func +func_808326F0 = 0x808307A0; // type:func +Player_ApplyFloorSfxOffset = 0x8083080C; // type:func +Player_PlayFloorSfx = 0x80830828; // type:func +Player_ApplyFloorAndAgeSfxOffsets = 0x80830860; // type:func +Player_PlayFloorSfxByAge = 0x80830888; // type:func +Player_PlaySteppingSfx = 0x808308C0; // type:func +Player_PlayJumpingSfx = 0x8083091C; // type:func +Player_PlayLandingSfx = 0x80830968; // type:func +func_808328EC = 0x808309B4; // type:func +Player_ProcessAnimSfxList = 0x808309E8; // type:func +Player_AnimChangeOnceMorph = 0x80830BD0; // type:func +Player_AnimChangeOnceMorphAdjusted = 0x80830C3C; // type:func +Player_AnimChangeLoopMorph = 0x80830CAC; // type:func +Player_AnimChangeFreeze = 0x80830CF4; // type:func +Player_AnimChangeLoopSlowMorph = 0x80830D38; // type:func +func_80832CB0 = 0x80830D80; // type:func +Player_ResetAnimMovement = 0x80830DD4; // type:func +Player_ResetAnimMovementScaledByAge = 0x80830DFC; // type:func +Player_ZeroRootLimbYaw = 0x80830E88; // type:func +Player_FinishAnimMovement = 0x80830E98; // type:func +Player_ApplyAnimMovementScaledByAge = 0x80830F24; // type:func +Player_StartAnimMovement = 0x80831034; // type:func +Player_AnimReplacePlayOnceSetSpeed = 0x808310DC; // type:func +Player_AnimReplacePlayOnce = 0x80831124; // type:func +Player_AnimReplacePlayOnceAdjusted = 0x8083114C; // type:func +Player_AnimReplaceNormalPlayOnceAdjusted = 0x80831174; // type:func +Player_AnimReplacePlayLoopSetSpeed = 0x80831194; // type:func +Player_AnimReplacePlayLoop = 0x808311DC; // type:func +Player_AnimReplacePlayLoopAdjusted = 0x80831204; // type:func +Player_AnimReplaceNormalPlayLoopAdjusted = 0x8083122C; // type:func +Player_ProcessControlStick = 0x8083124C; // type:func +func_8083328C = 0x80831378; // type:func +func_808332B8 = 0x808313A8; // type:func +func_808332E4 = 0x808313D4; // type:func +func_808332F4 = 0x808313E8; // type:func +Player_GetIdleAnim = 0x8083142C; // type:func +Player_CheckForIdleAnim = 0x80831448; // type:func +Player_ProcessFidgetAnimSfxList = 0x808314FC; // type:func +func_80833438 = 0x80831538; // type:func +func_808334B4 = 0x808315B4; // type:func +func_808334E4 = 0x808315E8; // type:func +func_80833528 = 0x80831630; // type:func +func_8083356C = 0x80831678; // type:func +func_808335B0 = 0x808316C0; // type:func +func_808335F4 = 0x80831708; // type:func +Player_SetUpperActionFunc = 0x80831750; // type:func +Player_InitItemActionWithAnim = 0x8083177C; // type:func +Player_ItemToItemAction = 0x8083183C; // type:func +Player_InitDefaultIA = 0x80831888; // type:func +Player_InitDekuStickIA = 0x80831898; // type:func +Player_InitHammerIA = 0x808318B4; // type:func +Player_InitBowOrSlingshotIA = 0x808318C4; // type:func +Player_InitExplosiveIA = 0x808318FC; // type:func +Player_InitHookshotIA = 0x80831A3C; // type:func +Player_InitBoomerangIA = 0x80831AAC; // type:func +Player_InitItemAction = 0x80831AC8; // type:func +func_80833A20 = 0x80831B54; // type:func +Player_FriendlyLockOnOrParallel = 0x80831C5C; // type:func +Player_UpdateHostileLockOn = 0x80831C84; // type:func +Player_IsZTargeting = 0x80831CFC; // type:func +Player_IsZTargetingWithHostileUpdate = 0x80831D38; // type:func +func_80833C3C = 0x80831D74; // type:func +Player_ItemIsInUse = 0x80831D8C; // type:func +Player_ItemIsItemAction = 0x80831DD8; // type:func +Player_GetItemOnButton = 0x80831E20; // type:func +Player_ProcessItemButtons = 0x80831F3C; // type:func +Player_StartChangingHeldItem = 0x80832224; // type:func +Player_UpdateItems = 0x808323DC; // type:func +func_80834380 = 0x808324C4; // type:func +func_8083442C = 0x80832570; // type:func +Player_FinishItemChange = 0x808326D8; // type:func +func_80834644 = 0x80832788; // type:func +func_808346C4 = 0x80832808; // type:func +func_80834758 = 0x8083289C; // type:func +func_8083485C = 0x808329A4; // type:func +func_80834894 = 0x808329DC; // type:func +Player_WaitToFinishItemChange = 0x80832A38; // type:func +func_8083499C = 0x80832AE8; // type:func +Player_UpperAction_Sword = 0x80832B28; // type:func +Player_UpperAction_ChangeHeldItem = 0x80832B78; // type:func +func_80834B5C = 0x80832CA8; // type:func +func_80834BD4 = 0x80832D24; // type:func +func_80834C74 = 0x80832DC8; // type:func +func_80834D2C = 0x80832E80; // type:func +func_80834E44 = 0x80832F98; // type:func +func_80834E7C = 0x80832FD0; // type:func +func_80834EB8 = 0x8083300C; // type:func +func_80834F2C = 0x80833080; // type:func +func_80834FBC = 0x80833110; // type:func +func_8083501C = 0x80833170; // type:func +func_808350A4 = 0x808331F8; // type:func +func_808351D4 = 0x8083332C; // type:func +func_808353D8 = 0x80833538; // type:func +func_80835588 = 0x808336E8; // type:func +Player_SetParallel = 0x80833744; // type:func +func_80835644 = 0x808337B0; // type:func +func_80835688 = 0x808337F8; // type:func +Player_UpperAction_CarryActor = 0x80833858; // type:func +func_808357E8 = 0x80833958; // type:func +func_80835800 = 0x80833974; // type:func +func_80835884 = 0x808339F8; // type:func +func_808358F0 = 0x80833A64; // type:func +func_808359FC = 0x80833B78; // type:func +func_80835B60 = 0x80833CE0; // type:func +func_80835C08 = 0x80833D88; // type:func +Player_SetupAction = 0x80833DE0; // type:func +Player_SetupActionPreserveAnimMovement = 0x80833F3C; // type:func +Player_SetupActionPreserveItemAction = 0x80833F70; // type:func +func_80835E44 = 0x80833FD4; // type:func +func_80835EA4 = 0x80834038; // type:func +Player_DestroyHookshot = 0x80834094; // type:func +Player_UseItem = 0x808340E4; // type:func +func_80836448 = 0x808345EC; // type:func +Player_CanUpdateItems = 0x8083476C; // type:func +Player_UpdateUpperBody = 0x80834818; // type:func +Player_SetupWaitForPutAway = 0x80834A40; // type:func +Player_UpdateShapeYaw = 0x80834A98; // type:func +Player_ScaledStepBinangClamped = 0x80834B74; // type:func +func_80836AB8 = 0x80834C60; // type:func +Player_UpdateZTargeting = 0x80834D94; // type:func +Player_CalcSpeedAndYawFromControlStick = 0x80835158; // type:func +Player_DecelerateToZero = 0x808353C8; // type:func +Player_GetMovementSpeedAndYaw = 0x8083541C; // type:func +Player_TryActionHandlerList = 0x808354FC; // type:func +Player_TryActionInterrupt = 0x80835658; // type:func +func_80837530 = 0x808356F0; // type:func +Player_CanSpinAttack = 0x808357A0; // type:func +func_80837704 = 0x808358D0; // type:func +func_808377DC = 0x808359A8; // type:func +func_80837818 = 0x808359EC; // type:func +func_80837918 = 0x80835AEC; // type:func +func_80837948 = 0x80835B1C; // type:func +Player_SetIntangibility = 0x80835CBC; // type:func +Player_SetInvulnerability = 0x80835CD8; // type:func +func_80837B18 = 0x80835CF8; // type:func +func_80837B60 = 0x80835D40; // type:func +func_80837B9C = 0x80835D7C; // type:func +func_80837C0C = 0x80835DEC; // type:func +func_80838144 = 0x80836324; // type:func +func_8083816C = 0x8083634C; // type:func +func_8083819C = 0x8083637C; // type:func +func_8083821C = 0x80836400; // type:func +func_80838280 = 0x80836464; // type:func +func_808382BC = 0x808364A0; // type:func +func_808382DC = 0x808364C0; // type:func +func_80838940 = 0x80836B24; // type:func +func_808389E8 = 0x80836BC8; // type:func +Player_ActionHandler_12 = 0x80836BF4; // type:func +func_80838E70 = 0x80837050; // type:func +func_80838F18 = 0x80837100; // type:func +func_80838F5C = 0x8083714C; // type:func +func_80838FB8 = 0x808371B0; // type:func +Player_HandleExitsAndVoids = 0x8083722C; // type:func +Player_GetRelativePosition = 0x808377D0; // type:func +Player_SpawnFairy = 0x80837874; // type:func +func_808396F4 = 0x808378E8; // type:func +func_8083973C = 0x80837934; // type:func +Player_PosVsWallLineTest = 0x80837960; // type:func +Player_ActionHandler_1 = 0x808379FC; // type:func +func_80839E88 = 0x80838094; // type:func +func_80839F30 = 0x80838138; // type:func +func_80839F90 = 0x80838194; // type:func +func_80839FFC = 0x80838200; // type:func +func_8083A060 = 0x80838268; // type:func +func_8083A098 = 0x808382A4; // type:func +func_8083A0D4 = 0x808382E4; // type:func +func_8083A0F4 = 0x80838304; // type:func +Player_SetupTalk = 0x80838508; // type:func +func_8083A360 = 0x80838578; // type:func +func_8083A388 = 0x808385A0; // type:func +func_8083A3B0 = 0x808385C8; // type:func +func_8083A40C = 0x80838620; // type:func +func_8083A434 = 0x80838648; // type:func +func_8083A4A8 = 0x808386BC; // type:func +func_8083A5C4 = 0x808387D8; // type:func +func_8083A6AC = 0x808388CC; // type:func +func_8083A9B8 = 0x80838BD4; // type:func +func_8083AA10 = 0x80838C2C; // type:func +func_8083AD4C = 0x80838F68; // type:func +Player_StartCsAction = 0x80838FF0; // type:func +func_8083AE40 = 0x8083905C; // type:func +func_8083AF44 = 0x808390E4; // type:func +func_8083B010 = 0x808391B8; // type:func +Player_ActionHandler_13 = 0x808391EC; // type:func +Player_ActionHandler_Talk = 0x808397F0; // type:func +func_8083B8F4 = 0x80839AA0; // type:func +Player_ActionHandler_0 = 0x80839B48; // type:func +func_8083BA90 = 0x80839C40; // type:func +func_8083BB20 = 0x80839CD8; // type:func +func_8083BBA0 = 0x80839D58; // type:func +Player_SetupRoll = 0x80839DC0; // type:func +Player_TryRoll = 0x80839E38; // type:func +func_8083BCD0 = 0x80839E8C; // type:func +Player_ActionHandler_10 = 0x80839F78; // type:func +func_8083BF50 = 0x8083A110; // type:func +func_8083C0B8 = 0x8083A274; // type:func +func_8083C0E8 = 0x8083A2AC; // type:func +func_8083C148 = 0x8083A308; // type:func +Player_ActionHandler_Roll = 0x8083A3A4; // type:func +Player_ActionHandler_11 = 0x8083A480; // type:func +func_8083C484 = 0x8083A658; // type:func +func_8083C50C = 0x8083A6E0; // type:func +Player_ActionHandler_8 = 0x8083A718; // type:func +func_8083C61C = 0x8083A7F4; // type:func +func_8083C6B8 = 0x8083A890; // type:func +func_8083C858 = 0x8083AA34; // type:func +func_8083C8DC = 0x8083AAB8; // type:func +Player_SetStartingMovement = 0x8083AAEC; // type:func +Player_StartMode_Idle = 0x8083AC00; // type:func +Player_StartMode_MoveForwardSlow = 0x8083AC38; // type:func +Player_StartMode_MoveForward = 0x8083AC80; // type:func +func_8083CB2C = 0x8083AD14; // type:func +func_8083CB94 = 0x8083AD78; // type:func +func_8083CBF0 = 0x8083ADD4; // type:func +func_8083CC9C = 0x8083AE7C; // type:func +func_8083CD00 = 0x8083AEDC; // type:func +Player_SetupTurnInPlace = 0x8083AF30; // type:func +func_8083CE0C = 0x8083AFEC; // type:func +func_8083CEAC = 0x8083B088; // type:func +func_8083CF10 = 0x8083B0E8; // type:func +func_8083CF5C = 0x8083B130; // type:func +func_8083CFA8 = 0x8083B178; // type:func +func_8083D0A8 = 0x8083B280; // type:func +func_8083D12C = 0x8083B308; // type:func +func_8083D330 = 0x8083B510; // type:func +func_8083D36C = 0x8083B54C; // type:func +func_8083D53C = 0x8083B720; // type:func +func_8083D6EC = 0x8083B8D0; // type:func +func_8083DB98 = 0x8083BD80; // type:func +func_8083DC54 = 0x8083BE3C; // type:func +func_8083DDC8 = 0x8083BFB0; // type:func +func_8083DF68 = 0x8083C158; // type:func +func_8083DFE0 = 0x8083C1D4; // type:func +Player_ActionHandler_3 = 0x8083C2F4; // type:func +Player_GetSlopeDirection = 0x8083C494; // type:func +Player_HandleSlopes = 0x8083C510; // type:func +func_8083E4C4 = 0x8083C6C4; // type:func +Player_ActionHandler_2 = 0x8083C7AC; // type:func +func_8083EA94 = 0x8083CC44; // type:func +Player_CanThrowCarriedActor = 0x8083CCA0; // type:func +Player_ActionHandler_9 = 0x8083CCF4; // type:func +func_8083EC18 = 0x8083CDC8; // type:func +func_8083F070 = 0x8083D224; // type:func +Player_TryEnteringCrawlspace = 0x8083D27C; // type:func +func_8083F360 = 0x8083D518; // type:func +func_8083F524 = 0x8083D6DC; // type:func +Player_TryLeavingCrawlspace = 0x8083D728; // type:func +func_8083F72C = 0x8083D8E4; // type:func +Player_ActionHandler_5 = 0x8083D970; // type:func +func_8083F9D0 = 0x8083DB88; // type:func +func_8083FAB8 = 0x8083DC70; // type:func +func_8083FB14 = 0x8083DCCC; // type:func +func_8083FB7C = 0x8083DD34; // type:func +func_8083FBC0 = 0x8083DD74; // type:func +func_8083FC68 = 0x8083DE24; // type:func +func_8083FD78 = 0x8083DF34; // type:func +func_8083FFB8 = 0x8083E178; // type:func +func_80840058 = 0x8083E218; // type:func +func_80840138 = 0x8083E300; // type:func +func_808401B0 = 0x8083E378; // type:func +func_8084021C = 0x8083E3E4; // type:func +func_8084029C = 0x8083E464; // type:func +Player_Action_80840450 = 0x8083E61C; // type:func +Player_Action_808407CC = 0x8083E998; // type:func +Player_ChooseNextIdleAnim = 0x8083EB98; // type:func +Player_Action_Idle = 0x8083ED94; // type:func +Player_Action_80840DE4 = 0x8083EFB4; // type:func +func_80841138 = 0x8083F308; // type:func +func_8084140C = 0x8083F5E4; // type:func +func_80841458 = 0x8083F630; // type:func +Player_Action_808414F8 = 0x8083F6D0; // type:func +func_808416C0 = 0x8083F8A4; // type:func +Player_Action_8084170C = 0x8083F8F0; // type:func +Player_Action_808417FC = 0x8083F9E0; // type:func +func_80841860 = 0x8083FA44; // type:func +Player_Action_8084193C = 0x8083FB20; // type:func +Player_Action_TurnInPlace = 0x8083FD84; // type:func +func_80841CC4 = 0x8083FEA0; // type:func +func_80841EE4 = 0x808400C4; // type:func +Player_Action_80842180 = 0x80840368; // type:func +Player_Action_8084227C = 0x8084046C; // type:func +Player_Action_808423EC = 0x808405E0; // type:func +Player_Action_8084251C = 0x80840710; // type:func +func_8084260C = 0x80840800; // type:func +func_8084269C = 0x80840890; // type:func +Player_Action_8084279C = 0x80840990; // type:func +func_8084285C = 0x80840A50; // type:func +func_808428D8 = 0x80840ACC; // type:func +func_80842964 = 0x80840B5C; // type:func +Player_RequestQuake = 0x80840BB4; // type:func +func_80842A28 = 0x80840C28; // type:func +func_80842A88 = 0x80840C8C; // type:func +func_80842AC4 = 0x80840CC8; // type:func +func_80842B7C = 0x80840D84; // type:func +func_80842CF0 = 0x80840EFC; // type:func +func_80842D20 = 0x80840F34; // type:func +func_80842DF4 = 0x8084100C; // type:func +Player_Action_80843188 = 0x808413A0; // type:func +Player_Action_808435C4 = 0x808417DC; // type:func +Player_Action_8084370C = 0x80841928; // type:func +Player_Action_8084377C = 0x8084199C; // type:func +Player_Action_80843954 = 0x80841B78; // type:func +Player_Action_80843A38 = 0x80841C60; // type:func +func_80843AE8 = 0x80841D14; // type:func +Player_Action_80843CEC = 0x80841F18; // type:func +func_80843E14 = 0x80842044; // type:func +func_80843E64 = 0x80842098; // type:func +func_8084409C = 0x808422D0; // type:func +Player_Action_8084411C = 0x80842358; // type:func +Player_Action_Roll = 0x8084294C; // type:func +Player_Action_80844A44 = 0x80842C88; // type:func +Player_Action_80844AF4 = 0x80842D38; // type:func +func_80844BE4 = 0x80842E28; // type:func +func_80844CF8 = 0x80842F40; // type:func +func_80844D30 = 0x80842F78; // type:func +func_80844D68 = 0x80842FB0; // type:func +func_80844DC8 = 0x80843014; // type:func +func_80844E3C = 0x80843088; // type:func +Player_Action_80844E68 = 0x808430B8; // type:func +Player_Action_80845000 = 0x80843250; // type:func +Player_Action_80845308 = 0x80843558; // type:func +Player_Action_80845668 = 0x808438B8; // type:func +Player_Action_WaitForPutAway = 0x80843B24; // type:func +func_80845964 = 0x80843BB8; // type:func +func_80845BA0 = 0x80843DFC; // type:func +func_80845C68 = 0x80843EC8; // type:func +Player_Action_80845CA4 = 0x80843F08; // type:func +Player_Action_80845EF8 = 0x80844168; // type:func +Player_Action_80846050 = 0x808442C0; // type:func +Player_Action_80846120 = 0x80844398; // type:func +Player_Action_80846260 = 0x808444D8; // type:func +Player_Action_80846358 = 0x808445D8; // type:func +Player_Action_80846408 = 0x80844688; // type:func +Player_Action_808464B0 = 0x80844730; // type:func +Player_Action_80846578 = 0x808447FC; // type:func +Player_DoNothing = 0x808448C4; // type:func +Player_StartMode_Nothing = 0x808448D4; // type:func +Player_StartMode_BlueWarp = 0x808448F0; // type:func +Player_PutSwordInHand = 0x808449B0; // type:func +Player_StartMode_TimeTravel = 0x80844A64; // type:func +Player_StartMode_Door = 0x80844B40; // type:func +Player_StartMode_Grotto = 0x80844B88; // type:func +Player_StartMode_KnockedOver = 0x80844C18; // type:func +Player_StartMode_WarpSong = 0x80844C5C; // type:func +Player_SpawnMagicSpell = 0x80844C9C; // type:func +Player_StartMode_FaroresWind = 0x80844D08; // type:func +Player_InitCommon = 0x80844D48; // type:func +Player_Init = 0x80844F78; // type:func +Player_ApproachZeroBinang = 0x80845488; // type:func +func_80847298 = 0x8084552C; // type:func +Player_UpdateInterface = 0x80845668; // type:func +Player_UpdateHoverBoots = 0x80845D18; // type:func +Player_ProcessSceneCollision = 0x80845E40; // type:func +Player_UpdateCamAndSeqModes = 0x80846948; // type:func +Player_UpdateBurningDekuStick = 0x80846CA8; // type:func +Player_UpdateBodyShock = 0x80846DF0; // type:func +Player_UpdateBodyBurn = 0x80846F20; // type:func +Player_DetectRumbleSecrets = 0x808471A4; // type:func +Player_UpdateCommon = 0x8084724C; // type:func +Player_Update = 0x80848158; // type:func +Player_DrawGameplay = 0x80848390; // type:func +Player_Draw = 0x80848834; // type:func +Player_Destroy = 0x80848D94; // type:func +func_8084ABD8 = 0x80848E18; // type:func +func_8084AEEC = 0x8084912C; // type:func +func_8084B000 = 0x80849248; // type:func +func_8084B158 = 0x808493A8; // type:func +Player_Action_8084B1D8 = 0x80849428; // type:func +func_8084B3CC = 0x80849618; // type:func +func_8084B498 = 0x808496EC; // type:func +func_8084B4D4 = 0x80849728; // type:func +Player_Action_Talk = 0x80849788; // type:func +Player_Action_8084B78C = 0x808499F0; // type:func +func_8084B840 = 0x80849AA4; // type:func +Player_Action_8084B898 = 0x80849B00; // type:func +Player_Action_8084B9E4 = 0x80849C4C; // type:func +Player_Action_8084BBE4 = 0x80849E50; // type:func +Player_Action_8084BDFC = 0x8084A068; // type:func +func_8084BEE4 = 0x8084A150; // type:func +Player_Action_8084BF1C = 0x8084A188; // type:func +Player_Action_8084C5F8 = 0x8084A868; // type:func +Player_Action_8084C760 = 0x8084A9D0; // type:func +Player_Action_8084C81C = 0x8084AA8C; // type:func +func_8084C89C = 0x8084AB0C; // type:func +func_8084C9BC = 0x8084AC38; // type:func +func_8084CBF4 = 0x8084AE74; // type:func +Player_Action_8084CC98 = 0x8084AF1C; // type:func +Player_Action_8084D3E4 = 0x8084B66C; // type:func +func_8084D530 = 0x8084B7C0; // type:func +func_8084D574 = 0x8084B808; // type:func +func_8084D5CC = 0x8084B864; // type:func +Player_Action_8084D610 = 0x8084B8B0; // type:func +Player_Action_8084D7C4 = 0x8084BA60; // type:func +Player_Action_8084D84C = 0x8084BAF0; // type:func +func_8084D980 = 0x8084BC24; // type:func +Player_Action_8084DAB4 = 0x8084BD5C; // type:func +func_8084DBC4 = 0x8084BE6C; // type:func +Player_Action_8084DC48 = 0x8084BEF0; // type:func +func_8084DF6C = 0x8084C21C; // type:func +func_8084DFAC = 0x8084C260; // type:func +func_8084DFF4 = 0x8084C2AC; // type:func +Player_Action_8084E1EC = 0x8084C4A4; // type:func +Player_Action_8084E30C = 0x8084C5C4; // type:func +Player_Action_8084E368 = 0x8084C624; // type:func +Player_Action_8084E3C4 = 0x8084C684; // type:func +Player_Action_8084E604 = 0x8084C8C4; // type:func +Player_Action_8084E6D4 = 0x8084C994; // type:func +func_8084E988 = 0x8084CC48; // type:func +Player_Action_TimeTravelEnd = 0x8084CC6C; // type:func +Player_Action_8084EAC0 = 0x8084CD80; // type:func +Player_Action_SwingBottle = 0x8084CF6C; // type:func +Player_Action_8084EED8 = 0x8084D1A4; // type:func +Player_Action_8084EFC0 = 0x8084D28C; // type:func +Player_Action_ExchangeItem = 0x8084D3D4; // type:func +Player_Action_8084F308 = 0x8084D5DC; // type:func +Player_Action_SlideOnSlope = 0x8084D664; // type:func +Player_Action_WaitForCutscene = 0x8084D8DC; // type:func +Player_Action_StartWarpSongArrive = 0x8084D96C; // type:func +Player_Action_BlueWarpArrive = 0x8084D9E4; // type:func +Player_Action_8084F88C = 0x8084DB60; // type:func +Player_Action_TryOpeningDoor = 0x8084DC74; // type:func +Player_Action_ExitGrotto = 0x8084DC94; // type:func +Player_Action_8084FA54 = 0x8084DD28; // type:func +Player_Action_8084FB10 = 0x8084DDE4; // type:func +Player_Action_8084FBF4 = 0x8084DEC8; // type:func +func_8084FF7C = 0x8084DF80; // type:func +Player_UpdateBunnyEars = 0x8084E034; // type:func +Player_ActionHandler_7 = 0x8084E22C; // type:func +Player_Action_808502D0 = 0x8084E2D8; // type:func +Player_Action_808505DC = 0x8084E5E8; // type:func +Player_Action_8085063C = 0x8084E648; // type:func +Player_Action_FaroresWindArrive = 0x8084E778; // type:func +Player_Action_808507F4 = 0x8084E800; // type:func +Player_Action_HookshotFly = 0x8084EAFC; // type:func +Player_Action_80850C68 = 0x8084EC7C; // type:func +Player_Action_80850E84 = 0x8084EE98; // type:func +Player_AnimChangeOnceMorphZeroRootYawSpeed = 0x8084EEEC; // type:func +Player_AnimChangeOnceMorphAdjustedZeroRootYawSpeed = 0x8084EF30; // type:func +Player_AnimChangeLoopMorphAdjustedZeroRootYawSpeed = 0x8084EFB0; // type:func +func_80851008 = 0x8084F01C; // type:func +func_80851030 = 0x8084F044; // type:func +func_80851050 = 0x8084F064; // type:func +func_80851094 = 0x8084F0A8; // type:func +func_808510B4 = 0x8084F0C8; // type:func +func_808510D4 = 0x8084F0E8; // type:func +func_808510F4 = 0x8084F108; // type:func +func_80851114 = 0x8084F128; // type:func +func_80851134 = 0x8084F148; // type:func +func_80851154 = 0x8084F168; // type:func +func_80851174 = 0x8084F188; // type:func +func_80851194 = 0x8084F1A8; // type:func +func_808511B4 = 0x8084F1C8; // type:func +func_808511D4 = 0x8084F1E8; // type:func +func_808511FC = 0x8084F214; // type:func +func_80851248 = 0x8084F268; // type:func +func_80851294 = 0x8084F2BC; // type:func +func_808512E0 = 0x8084F310; // type:func +func_80851314 = 0x8084F348; // type:func +func_80851368 = 0x8084F39C; // type:func +func_808513BC = 0x8084F3F0; // type:func +func_808514C0 = 0x8084F4F8; // type:func +func_8085157C = 0x8084F5B4; // type:func +func_808515A4 = 0x8084F5E0; // type:func +func_80851688 = 0x8084F6C4; // type:func +func_80851750 = 0x8084F794; // type:func +func_80851788 = 0x8084F7D0; // type:func +func_80851828 = 0x8084F870; // type:func +func_808518DC = 0x8084F928; // type:func +func_8085190C = 0x8084F95C; // type:func +func_80851998 = 0x8084F9E8; // type:func +func_808519C0 = 0x8084FA10; // type:func +func_808519EC = 0x8084FA3C; // type:func +func_80851A50 = 0x8084FAA0; // type:func +func_80851B90 = 0x8084FBE0; // type:func +func_80851BE8 = 0x8084FC3C; // type:func +func_80851CA4 = 0x8084FCFC; // type:func +func_80851D2C = 0x8084FD88; // type:func +func_80851D80 = 0x8084FDE0; // type:func +func_80851DEC = 0x8084FE54; // type:func +func_80851E28 = 0x8084FE94; // type:func +func_80851E64 = 0x8084FED4; // type:func +func_80851E90 = 0x8084FF00; // type:func +func_80851ECC = 0x8084FF40; // type:func +func_80851F14 = 0x8084FF90; // type:func +func_80851F84 = 0x80850004; // type:func +func_80851FB0 = 0x80850030; // type:func +func_80852048 = 0x808500CC; // type:func +func_80852080 = 0x80850108; // type:func +func_808520BC = 0x80850148; // type:func +func_80852174 = 0x80850200; // type:func +func_808521B8 = 0x8085024C; // type:func +func_808521F4 = 0x8085028C; // type:func +func_80852234 = 0x808502CC; // type:func +func_8085225C = 0x808502F8; // type:func +func_80852280 = 0x8085031C; // type:func +func_80852298 = 0x80850338; // type:func +func_80852328 = 0x808503CC; // type:func +func_80852358 = 0x808503FC; // type:func +func_80852388 = 0x8085042C; // type:func +func_80852414 = 0x808504BC; // type:func +func_80852450 = 0x808504FC; // type:func +func_80852480 = 0x8085052C; // type:func +func_808524B0 = 0x8085055C; // type:func +func_808524D0 = 0x80850580; // type:func +func_80852514 = 0x808505C8; // type:func +func_80852544 = 0x808505FC; // type:func +func_80852554 = 0x80850610; // type:func +func_80852564 = 0x80850624; // type:func +func_808525C0 = 0x80850688; // type:func +func_80852608 = 0x808506D4; // type:func +func_80852648 = 0x8085071C; // type:func +func_808526EC = 0x808507C4; // type:func +func_8085283C = 0x8085091C; // type:func +func_808528C8 = 0x808509AC; // type:func +func_80852944 = 0x80850A2C; // type:func +func_808529D0 = 0x80850AB8; // type:func +func_80852A54 = 0x80850B40; // type:func +func_80852B4C = 0x80850C38; // type:func +func_80852C0C = 0x80850CF8; // type:func +func_80852C50 = 0x80850D3C; // type:func +Player_Action_CsAction = 0x80850EF8; // type:func +Player_IsDroppingFish = 0x80850FA0; // type:func +Player_StartFishing = 0x80850FD4; // type:func +func_80852F38 = 0x80851010; // type:func +Player_TryCsAction = 0x808510DC; // type:func +func_80853080 = 0x80851160; // type:func +Player_InflictDamage = 0x808511BC; // type:func +Player_StartTalking = 0x80851224; // type:func +EnTest_SetupAction = 0x8085D5D0; // type:func +EnTest_Init = 0x8085D5DC; // type:func +EnTest_Destroy = 0x8085D828; // type:func +EnTest_ChooseRandomAction = 0x8085D8C0; // type:func +EnTest_ChooseAction = 0x8085DA3C; // type:func +EnTest_SetupWaitGround = 0x8085DD5C; // type:func +EnTest_WaitGround = 0x8085DDD4; // type:func +EnTest_SetupWaitAbove = 0x8085DEB4; // type:func +EnTest_WaitAbove = 0x8085DF28; // type:func +EnTest_SetupIdle = 0x8085DFF4; // type:func +EnTest_Idle = 0x8085E078; // type:func +EnTest_Fall = 0x8085E2A8; // type:func +EnTest_Land = 0x8085E35C; // type:func +EnTest_SetupWalkAndBlock = 0x8085E3CC; // type:func +EnTest_WalkAndBlock = 0x8085E490; // type:func +func_80860BDC = 0x8085EB74; // type:func +func_80860C24 = 0x8085EBBC; // type:func +func_80860EC0 = 0x8085EE58; // type:func +func_80860F84 = 0x8085EF1C; // type:func +EnTest_SetupSlashDown = 0x8085F3B0; // type:func +EnTest_SlashDown = 0x8085F434; // type:func +EnTest_SetupSlashDownEnd = 0x8085F540; // type:func +EnTest_SlashDownEnd = 0x8085F590; // type:func +EnTest_SetupSlashUp = 0x8085F7BC; // type:func +EnTest_SlashUp = 0x8085F838; // type:func +EnTest_SetupJumpBack = 0x8085F8F0; // type:func +EnTest_JumpBack = 0x8085F990; // type:func +EnTest_SetupJumpslash = 0x8085FB38; // type:func +EnTest_Jumpslash = 0x8085FBE4; // type:func +EnTest_SetupJumpUp = 0x8085FCF4; // type:func +EnTest_JumpUp = 0x8085FD6C; // type:func +EnTest_SetupStopAndBlock = 0x8085FE64; // type:func +EnTest_StopAndBlock = 0x8085FF24; // type:func +EnTest_SetupIdleFromBlock = 0x8085FFF4; // type:func +EnTest_IdleFromBlock = 0x80860040; // type:func +func_80862154 = 0x808600F8; // type:func +func_808621D4 = 0x80860178; // type:func +func_80862398 = 0x80860340; // type:func +func_80862418 = 0x808603C0; // type:func +EnTest_SetupStunned = 0x80860524; // type:func +EnTest_Stunned = 0x80860600; // type:func +func_808627C4 = 0x80860778; // type:func +func_808628C8 = 0x8086087C; // type:func +func_80862DBC = 0x80860D74; // type:func +func_80862E6C = 0x80860E28; // type:func +func_80862FA8 = 0x80860F64; // type:func +func_80863044 = 0x80861000; // type:func +func_808630F0 = 0x808610AC; // type:func +func_8086318C = 0x80861148; // type:func +EnTest_SetupRecoil = 0x808611FC; // type:func +EnTest_Recoil = 0x80861250; // type:func +EnTest_Rise = 0x8086131C; // type:func +func_808633E8 = 0x808613A4; // type:func +EnTest_UpdateHeadRot = 0x80861420; // type:func +EnTest_UpdateDamage = 0x808614B8; // type:func +EnTest_Update = 0x80861658; // type:func +EnTest_OverrideLimbDraw = 0x80861A84; // type:func +EnTest_PostLimbDraw = 0x80861C58; // type:func +EnTest_Draw = 0x80861FE0; // type:func +func_80864158 = 0x808620F4; // type:func +EnTest_ReactToProjectile = 0x80862184; // type:func +EnGirlA_SetupAction = 0x80862E80; // type:func +EnGirlA_TryChangeShopItem = 0x80862E8C; // type:func +EnGirlA_InitItem = 0x80863004; // type:func +EnGirlA_Init = 0x808630A8; // type:func +EnGirlA_Destroy = 0x808630DC; // type:func +EnGirlA_CanBuy_Arrows = 0x8086310C; // type:func +EnGirlA_CanBuy_Bombs = 0x808631BC; // type:func +EnGirlA_CanBuy_DekuNuts = 0x8086325C; // type:func +EnGirlA_CanBuy_DekuSticks = 0x80863314; // type:func +EnGirlA_CanBuy_Fish = 0x808633CC; // type:func +EnGirlA_CanBuy_RedPotion = 0x80863444; // type:func +EnGirlA_CanBuy_GreenPotion = 0x808634BC; // type:func +EnGirlA_CanBuy_BluePotion = 0x80863534; // type:func +EnGirlA_CanBuy_Longsword = 0x808635AC; // type:func +EnGirlA_CanBuy_HylianShield = 0x80863640; // type:func +EnGirlA_CanBuy_DekuShield = 0x808636C0; // type:func +EnGirlA_CanBuy_GoronTunic = 0x80863740; // type:func +EnGirlA_CanBuy_ZoraTunic = 0x808637E8; // type:func +EnGirlA_CanBuy_RecoveryHeart = 0x80863890; // type:func +EnGirlA_CanBuy_MilkBottle = 0x808638DC; // type:func +EnGirlA_CanBuy_WeirdEgg = 0x80863938; // type:func +EnGirlA_CanBuy_Unk19 = 0x80863994; // type:func +EnGirlA_CanBuy_Unk20 = 0x808639A8; // type:func +EnGirlA_CanBuy_Bombchus = 0x808639BC; // type:func +EnGirlA_CanBuy_DekuSeeds = 0x80863A40; // type:func +EnGirlA_CanBuy_SoldOut = 0x80863AF0; // type:func +EnGirlA_CanBuy_BlueFire = 0x80863B04; // type:func +EnGirlA_CanBuy_Bugs = 0x80863B7C; // type:func +EnGirlA_CanBuy_Poe = 0x80863BF4; // type:func +EnGirlA_CanBuy_Fairy = 0x80863C6C; // type:func +EnGirlA_ItemGive_Arrows = 0x80863CE4; // type:func +EnGirlA_ItemGive_Bombs = 0x80863D2C; // type:func +EnGirlA_ItemGive_DekuNuts = 0x80863DCC; // type:func +EnGirlA_ItemGive_DekuSticks = 0x80863E3C; // type:func +EnGirlA_ItemGive_Longsword = 0x80863E78; // type:func +EnGirlA_ItemGive_HylianShield = 0x80863EC0; // type:func +EnGirlA_ItemGive_DekuShield = 0x80863EFC; // type:func +EnGirlA_ItemGive_GoronTunic = 0x80863F38; // type:func +EnGirlA_ItemGive_ZoraTunic = 0x80863F74; // type:func +EnGirlA_ItemGive_Health = 0x80863FB0; // type:func +EnGirlA_ItemGive_MilkBottle = 0x80863FF0; // type:func +EnGirlA_ItemGive_WeirdEgg = 0x8086402C; // type:func +EnGirlA_ItemGive_Unk19 = 0x80864068; // type:func +EnGirlA_ItemGive_Unk20 = 0x80864098; // type:func +EnGirlA_ItemGive_DekuSeeds = 0x808640C8; // type:func +EnGirlA_ItemGive_BottledItem = 0x80864104; // type:func +EnGirlA_BuyEvent_ShieldDiscount = 0x80864234; // type:func +EnGirlA_BuyEvent_GoronTunic = 0x808642D4; // type:func +EnGirlA_BuyEvent_ZoraTunic = 0x80864304; // type:func +EnGirlA_BuyEvent_ObtainBombchuPack = 0x80864334; // type:func +EnGirlA_Noop = 0x80864448; // type:func +EnGirlA_SetItemDescription = 0x80864458; // type:func +EnGirlA_SetItemOutOfStock = 0x80864580; // type:func +EnGirlA_UpdateStockedItem = 0x808645B4; // type:func +EnGirlA_TrySetMaskItemDescription = 0x8086462C; // type:func +EnGirlA_WaitForObject = 0x808646BC; // type:func +EnGirlA_Update2 = 0x80864A6C; // type:func +EnGirlA_Update = 0x80864B28; // type:func +func_80A3C498 = 0x80864B4C; // type:func +EnGirlA_Draw = 0x80864B90; // type:func +EnPart_Init = 0x808657A0; // type:func +EnPart_Destroy = 0x808657B0; // type:func +func_80ACDDE8 = 0x808657C0; // type:func +func_80ACE13C = 0x80865B14; // type:func +func_80ACE5B8 = 0x80865F90; // type:func +func_80ACE5C8 = 0x80865FA4; // type:func +func_80ACE7E8 = 0x808661C8; // type:func +EnPart_Update = 0x808663C4; // type:func +func_80ACEAC0 = 0x808664A4; // type:func +EnPart_Draw = 0x8086655C; // type:func +EnLight_Init = 0x80866E00; // type:func +EnLight_Destroy = 0x80866FE0; // type:func +EnLight_UpdatePosRot = 0x80867014; // type:func +EnLight_Update = 0x80867090; // type:func +EnLight_UpdateSwitch = 0x80867334; // type:func +EnLight_Draw = 0x8086776C; // type:func +EnDoor_Init = 0x80867C00; // type:func +EnDoor_Destroy = 0x80867E1C; // type:func +EnDoor_SetupType = 0x80867E50; // type:func +EnDoor_Idle = 0x80868008; // type:func +EnDoor_WaitForCheck = 0x808682C0; // type:func +EnDoor_Check = 0x8086830C; // type:func +EnDoor_AjarWait = 0x80868344; // type:func +EnDoor_AjarOpen = 0x80868378; // type:func +EnDoor_AjarClose = 0x808683E8; // type:func +EnDoor_Open = 0x80868430; // type:func +EnDoor_Update = 0x80868684; // type:func +EnDoor_OverrideLimbDraw = 0x808686A8; // type:func +EnDoor_Draw = 0x808687DC; // type:func +EnBox_SetupAction = 0x80868A40; // type:func +EnBox_ClipToGround = 0x80868A4C; // type:func +EnBox_Init = 0x80868AD8; // type:func +EnBox_Destroy = 0x80868F48; // type:func +EnBox_RandomDustKinematic = 0x80868F7C; // type:func +EnBox_SpawnDust = 0x80869080; // type:func +EnBox_Fall = 0x80869134; // type:func +EnBox_FallOnSwitchFlag = 0x808692B8; // type:func +func_809C9700 = 0x80869388; // type:func +EnBox_AppearOnSwitchFlag = 0x80869518; // type:func +EnBox_AppearOnRoomClear = 0x80869598; // type:func +EnBox_AppearInit = 0x80869650; // type:func +EnBox_AppearAnimation = 0x8086970C; // type:func +EnBox_WaitOpen = 0x808697B8; // type:func +EnBox_Open = 0x808699EC; // type:func +EnBox_SpawnIceSmoke = 0x80869B74; // type:func +EnBox_Update = 0x80869E20; // type:func +EnBox_PostLimbDraw = 0x80869F5C; // type:func +EnBox_EmptyDList = 0x8086A0C4; // type:func +func_809CA4A0 = 0x8086A0E8; // type:func +func_809CA518 = 0x8086A128; // type:func +EnBox_Draw = 0x8086A168; // type:func +EnPoh_Init = 0x8086A5A0; // type:func +EnPoh_Destroy = 0x8086A8E8; // type:func +func_80ADE114 = 0x8086A968; // type:func +EnPoh_SetupIdle = 0x8086A9C0; // type:func +func_80ADE1BC = 0x8086AA10; // type:func +EnPoh_SetupAttack = 0x8086AA60; // type:func +func_80ADE28C = 0x8086AAE0; // type:func +func_80ADE368 = 0x8086ABBC; // type:func +EnPoh_SetupInitialAction = 0x8086AC30; // type:func +func_80ADE48C = 0x8086ACE0; // type:func +func_80ADE4C8 = 0x8086AD20; // type:func +func_80ADE514 = 0x8086AD6C; // type:func +EnPoh_SetupDisappear = 0x8086ADC4; // type:func +EnPoh_SetupAppear = 0x8086AE1C; // type:func +EnPoh_SetupDeath = 0x8086AE68; // type:func +func_80ADE6D4 = 0x8086AF34; // type:func +EnPoh_Talk = 0x8086B020; // type:func +func_80ADE950 = 0x8086B1B8; // type:func +func_80ADE998 = 0x8086B204; // type:func +func_80ADE9BC = 0x8086B22C; // type:func +EnPoh_MoveTowardsPlayerHeight = 0x8086B240; // type:func +func_80ADEA5C = 0x8086B2D4; // type:func +func_80ADEAC4 = 0x8086B344; // type:func +EnPoh_Idle = 0x8086B400; // type:func +func_80ADEC9C = 0x8086B51C; // type:func +EnPoh_Attack = 0x8086B680; // type:func +func_80ADEECC = 0x8086B750; // type:func +func_80ADEF38 = 0x8086B7BC; // type:func +EnPoh_ComposerAppear = 0x8086B93C; // type:func +func_80ADF15C = 0x8086B9E0; // type:func +func_80ADF574 = 0x8086BDF8; // type:func +func_80ADF5E0 = 0x8086BE64; // type:func +EnPoh_Disappear = 0x8086BEE4; // type:func +EnPoh_Appear = 0x8086C000; // type:func +func_80ADF894 = 0x8086C120; // type:func +EnPoh_Death = 0x8086C220; // type:func +func_80ADFA90 = 0x8086C320; // type:func +func_80ADFE28 = 0x8086C6B8; // type:func +func_80ADFE80 = 0x8086C710; // type:func +func_80AE009C = 0x8086C92C; // type:func +EnPoh_TalkRegular = 0x8086C96C; // type:func +EnPoh_TalkComposer = 0x8086CA98; // type:func +func_80AE032C = 0x8086CBC4; // type:func +EnPoh_UpdateVisibility = 0x8086CC5C; // type:func +EnPoh_Update = 0x8086CDCC; // type:func +func_80AE067C = 0x8086CF18; // type:func +func_80AE089C = 0x8086D138; // type:func +EnPoh_UpdateLiving = 0x8086D2B8; // type:func +EnPoh_OverrideLimbDraw = 0x8086D498; // type:func +EnPoh_PostLimbDraw = 0x8086D58C; // type:func +EnPoh_DrawRegular = 0x8086D77C; // type:func +EnPoh_DrawComposer = 0x8086D9A4; // type:func +EnPoh_UpdateDead = 0x8086DE20; // type:func +EnPoh_DrawSoul = 0x8086DE74; // type:func +EnOkuta_Init = 0x8086E790; // type:func +EnOkuta_Destroy = 0x8086E99C; // type:func +EnOkuta_SpawnBubbles = 0x8086E9C8; // type:func +EnOkuta_SpawnDust = 0x8086EA74; // type:func +EnOkuta_SpawnSplash = 0x8086EADC; // type:func +EnOkuta_SpawnRipple = 0x8086EB20; // type:func +EnOkuta_SetupWaitToAppear = 0x8086EBC4; // type:func +EnOkuta_SetupAppear = 0x8086EBF4; // type:func +EnOkuta_SetupHide = 0x8086EC64; // type:func +EnOkuta_SetupWaitToShoot = 0x8086ECA4; // type:func +EnOkuta_SetupShoot = 0x8086ED04; // type:func +EnOkuta_SetupWaitToDie = 0x8086EDF0; // type:func +EnOkuta_SetupDie = 0x8086EE78; // type:func +EnOkuta_SetupFreeze = 0x8086EEC0; // type:func +EnOkuta_SpawnProjectile = 0x8086EF0C; // type:func +EnOkuta_WaitToAppear = 0x8086F04C; // type:func +EnOkuta_Appear = 0x8086F0A8; // type:func +EnOkuta_Hide = 0x8086F1EC; // type:func +EnOkuta_WaitToShoot = 0x8086F2EC; // type:func +EnOkuta_Shoot = 0x8086F41C; // type:func +EnOkuta_WaitToDie = 0x8086F59C; // type:func +EnOkuta_Die = 0x8086F5F0; // type:func +EnOkuta_Freeze = 0x8086F904; // type:func +EnOkuta_ProjectileFly = 0x8086FA80; // type:func +EnOkuta_UpdateHeadScale = 0x8086FCCC; // type:func +EnOkuta_ColliderCheck = 0x80870074; // type:func +EnOkuta_Update = 0x80870124; // type:func +EnOkuta_GetSnoutScale = 0x808704A4; // type:func +EnOkuta_OverrideLimbDraw = 0x8087072C; // type:func +EnOkuta_Draw = 0x80870828; // type:func +EnBom_SetupAction = 0x80870D70; // type:func +EnBom_Init = 0x80870D7C; // type:func +EnBom_Destroy = 0x80870E94; // type:func +EnBom_Move = 0x80870ED4; // type:func +EnBom_WaitForRelease = 0x808710A4; // type:func +EnBom_Explode = 0x808710F0; // type:func +EnBom_Update = 0x80871240; // type:func +EnBom_Draw = 0x808718D0; // type:func +EnWallmas_Init = 0x80871C40; // type:func +EnWallmas_Destroy = 0x80871D80; // type:func +EnWallmas_TimerInit = 0x80871DAC; // type:func +EnWallmas_SetupDrop = 0x80871E08; // type:func +EnWallmas_SetupLand = 0x80871ECC; // type:func +EnWallmas_SetupStand = 0x80871F90; // type:func +EnWallmas_SetupWalk = 0x80871FD0; // type:func +EnWallmas_SetupJumpToCeiling = 0x80872020; // type:func +EnWallmas_SetupReturnToCeiling = 0x80872068; // type:func +EnWallmas_SetupTakeDamage = 0x808720EC; // type:func +EnWallmas_SetupCooldown = 0x808721A8; // type:func +EnWallmas_SetupDie = 0x808721FC; // type:func +EnWallmas_SetupTakePlayer = 0x808722C4; // type:func +EnWallmas_ProximityOrSwitchInit = 0x8087234C; // type:func +EnWallmas_SetupStun = 0x80872394; // type:func +EnWallmas_WaitToDrop = 0x80872464; // type:func +EnWallmas_Drop = 0x80872570; // type:func +EnWallmas_Land = 0x8087263C; // type:func +EnWallmas_Stand = 0x80872678; // type:func +EnWallmas_Walk = 0x808726D8; // type:func +EnWallmas_JumpToCeiling = 0x8087278C; // type:func +EnWallmas_ReturnToCeiling = 0x808727C8; // type:func +EnWallmas_TakeDamage = 0x808728E4; // type:func +EnWallmas_Cooldown = 0x80872978; // type:func +EnWallmas_Die = 0x808729B4; // type:func +EnWallmas_TakePlayer = 0x80872A28; // type:func +EnWallmas_WaitForProximity = 0x80872C4C; // type:func +EnWallmas_WaitForSwitchFlag = 0x80872CA8; // type:func +EnWallmas_Stun = 0x80872CF4; // type:func +EnWallmas_ColUpdate = 0x80872D68; // type:func +EnWallmas_Update = 0x80872E84; // type:func +EnWallmas_DrawXlu = 0x8087304C; // type:func +EnWallMas_OverrideLimbDraw = 0x808731EC; // type:func +EnWallMas_PostLimbDraw = 0x80873260; // type:func +EnWallmas_Draw = 0x80873350; // type:func +EnDodongo_SetupAction = 0x80873650; // type:func +EnDodongo_SpawnBombSmoke = 0x8087365C; // type:func +EnDodongo_Init = 0x80873B4C; // type:func +EnDodongo_Destroy = 0x80873D74; // type:func +EnDodongo_SetupIdle = 0x80873DD4; // type:func +EnDodongo_SetupWalk = 0x80873E3C; // type:func +EnDodongo_SetupBreatheFire = 0x80873EE0; // type:func +EnDodongo_SetupEndBreatheFire = 0x80873F34; // type:func +EnDodongo_SetupSwallowBomb = 0x80873F84; // type:func +EnDodongo_SetupStunned = 0x80874004; // type:func +EnDodongo_Idle = 0x8087409C; // type:func +EnDodongo_EndBreatheFire = 0x80874114; // type:func +EnDodongo_BreatheFire = 0x80874164; // type:func +EnDodongo_SwallowBomb = 0x8087433C; // type:func +EnDodongo_Walk = 0x80874834; // type:func +EnDodongo_SetupSweepTail = 0x80874B74; // type:func +EnDodongo_SweepTail = 0x80874BD4; // type:func +EnDodongo_SetupDeath = 0x80874E98; // type:func +EnDodongo_Death = 0x80874F10; // type:func +EnDodongo_Stunned = 0x8087505C; // type:func +EnDodongo_CollisionCheck = 0x808750C0; // type:func +EnDodongo_UpdateQuad = 0x808751E8; // type:func +EnDodongo_Update = 0x80875354; // type:func +EnDodongo_OverrideLimbDraw = 0x80875520; // type:func +EnDodongo_PostLimbDraw = 0x80875574; // type:func +EnDodongo_Draw = 0x808759B0; // type:func +EnDodongo_ShiftVecRadial = 0x80875AA0; // type:func +EnDodongo_AteBomb = 0x80875B00; // type:func +EnFirefly_Extinguish = 0x808763F0; // type:func +EnFirefly_Ignite = 0x8087641C; // type:func +EnFirefly_Init = 0x8087645C; // type:func +EnFirefly_Destroy = 0x80876654; // type:func +EnFirefly_SetupFlyIdle = 0x80876680; // type:func +EnFirefly_SetupFall = 0x8087672C; // type:func +EnFirefly_SetupDie = 0x808767D0; // type:func +EnFirefly_SetupRebound = 0x808767F4; // type:func +EnFirefly_SetupDiveAttack = 0x80876830; // type:func +EnFirefly_SetupFlyAway = 0x808768A0; // type:func +EnFirefly_SetupStunned = 0x808768D0; // type:func +EnFirefly_SetupFrozenFall = 0x80876940; // type:func +EnFirefly_SetupPerch = 0x80876AE0; // type:func +EnFirefly_SetupDisturbDiveAttack = 0x80876B04; // type:func +EnFirefly_ReturnToPerch = 0x80876B40; // type:func +EnFirefly_SeekTorch = 0x80876C5C; // type:func +EnFirefly_FlyIdle = 0x80876DAC; // type:func +EnFirefly_Fall = 0x8087703C; // type:func +EnFirefly_Die = 0x8087710C; // type:func +EnFirefly_DiveAttack = 0x80877188; // type:func +EnFirefly_Rebound = 0x8087739C; // type:func +EnFirefly_FlyAway = 0x80877430; // type:func +EnFirefly_Stunned = 0x80877598; // type:func +EnFirefly_FrozenFall = 0x8087763C; // type:func +EnFirefly_Perch = 0x8087769C; // type:func +EnFirefly_DisturbDiveAttack = 0x8087775C; // type:func +EnFirefly_Combust = 0x80877834; // type:func +EnFirefly_UpdateDamage = 0x808778B4; // type:func +EnFirefly_Update = 0x80877A64; // type:func +EnFirefly_OverrideLimbDraw = 0x80877D0C; // type:func +EnFirefly_PostLimbDraw = 0x80877D60; // type:func +EnFirefly_Draw = 0x808780F0; // type:func +EnFirefly_DrawInvisible = 0x808781A4; // type:func +EnHorse_BgCheckBridgeJumpPoint = 0x80878560; // type:func +EnHorse_CheckBridgeJumps = 0x808786C0; // type:func +EnHorse_RaceWaypointPos = 0x80878800; // type:func +EnHorse_RotateToPoint = 0x80878854; // type:func +EnHorse_UpdateIngoRaceInfo = 0x80878890; // type:func +EnHorse_PlayWalkingSfx = 0x80878C44; // type:func +EnHorse_PlayTrottingSfx = 0x80878D00; // type:func +EnHorse_PlayGallopingSfx = 0x80878D48; // type:func +EnHorse_SlopeSpeedMultiplier = 0x80878D90; // type:func +func_80A5BB90 = 0x80878E10; // type:func +func_80A5BBBC = 0x80878E40; // type:func +EnHorse_IdleAnimSounds = 0x80878EF0; // type:func +EnHorse_Spawn = 0x8087901C; // type:func +EnHorse_ResetCutscene = 0x80879260; // type:func +EnHorse_ResetRace = 0x80879278; // type:func +EnHorse_PlayerCanMove = 0x80879288; // type:func +EnHorse_ResetHorsebackArchery = 0x80879344; // type:func +EnHorse_ClearDustFlags = 0x8087935C; // type:func +EnHorse_Init = 0x80879368; // type:func +EnHorse_Destroy = 0x80879A98; // type:func +EnHorse_RotateToPlayer = 0x80879B08; // type:func +EnHorse_Freeze = 0x80879B78; // type:func +EnHorse_Frozen = 0x80879BF8; // type:func +EnHorse_UpdateSpeed = 0x80879D68; // type:func +EnHorse_StartMountedIdleResetAnim = 0x8087A1AC; // type:func +EnHorse_StartMountedIdle = 0x8087A1E8; // type:func +EnHorse_MountedIdle = 0x8087A324; // type:func +EnHorse_MountedIdleAnim = 0x8087A424; // type:func +EnHorse_MountedIdleWhinney = 0x8087A448; // type:func +EnHorse_MountedIdleWhinneying = 0x8087A544; // type:func +EnHorse_StartTurning = 0x8087A644; // type:func +EnHorse_MountedTurn = 0x8087A6EC; // type:func +EnHorse_StartWalkingFromIdle = 0x8087A8B0; // type:func +EnHorse_StartWalkingInterruptable = 0x8087A900; // type:func +EnHorse_StartWalking = 0x8087A924; // type:func +EnHorse_MountedWalkingReset = 0x8087A9D0; // type:func +EnHorse_MountedWalk = 0x8087AA24; // type:func +EnHorse_StartTrotting = 0x8087ACF4; // type:func +EnHorse_MountedTrotReset = 0x8087AD98; // type:func +EnHorse_MountedTrot = 0x8087ADE4; // type:func +EnHorse_StartGallopingInterruptable = 0x8087AF1C; // type:func +EnHorse_StartGalloping = 0x8087AF40; // type:func +EnHorse_MountedGallopReset = 0x8087AFE8; // type:func +EnHorse_JumpLanding = 0x8087B040; // type:func +EnHorse_MountedGallop = 0x8087B0C4; // type:func +EnHorse_StartRearing = 0x8087B298; // type:func +EnHorse_MountedRearing = 0x8087B3BC; // type:func +EnHorse_StartBraking = 0x8087B538; // type:func +EnHorse_Stopping = 0x8087B628; // type:func +EnHorse_StartReversingInterruptable = 0x8087B814; // type:func +EnHorse_StartReversing = 0x8087B838; // type:func +EnHorse_Reverse = 0x8087B8DC; // type:func +EnHorse_LowJumpInit = 0x8087BC8C; // type:func +EnHorse_StartLowJump = 0x8087BCB0; // type:func +EnHorse_Stub1 = 0x8087BDE0; // type:func +EnHorse_LowJump = 0x8087BDEC; // type:func +EnHorse_HighJumpInit = 0x8087BFB0; // type:func +EnHorse_StartHighJump = 0x8087BFD4; // type:func +EnHorse_Stub2 = 0x8087C110; // type:func +EnHorse_HighJump = 0x8087C11C; // type:func +EnHorse_InitInactive = 0x8087C2E0; // type:func +EnHorse_Inactive = 0x8087C330; // type:func +EnHorse_PlayIdleAnimation = 0x8087C45C; // type:func +EnHorse_ChangeIdleAnimation = 0x8087C62C; // type:func +EnHorse_ResetIdleAnimation = 0x8087C654; // type:func +EnHorse_StartIdleRidable = 0x8087C688; // type:func +EnHorse_Idle = 0x8087C6BC; // type:func +EnHorse_StartMovingAnimation = 0x8087C8A4; // type:func +EnHorse_SetFollowAnimation = 0x8087CA0C; // type:func +EnHorse_FollowPlayer = 0x8087CB40; // type:func +EnHorse_InitIngoHorse = 0x8087CF64; // type:func +EnHorse_SetIngoAnimation = 0x8087CFE8; // type:func +EnHorse_UpdateIngoHorseAnim = 0x8087D08C; // type:func +EnHorse_UpdateIngoRace = 0x8087D3A0; // type:func +EnHorse_CsMoveInit = 0x8087D550; // type:func +EnHorse_CsMoveToPoint = 0x8087D5BC; // type:func +EnHorse_CsSetAnimHighJump = 0x8087D70C; // type:func +EnHorse_CsPlayHighJumpAnim = 0x8087D730; // type:func +EnHorse_CsJumpInit = 0x8087D864; // type:func +EnHorse_CsJump = 0x8087D89C; // type:func +EnHorse_CsRearingInit = 0x8087DAF4; // type:func +EnHorse_CsRearing = 0x8087DC14; // type:func +EnHorse_WarpMoveInit = 0x8087DDBC; // type:func +EnHorse_CsWarpMoveToPoint = 0x8087DEA4; // type:func +EnHorse_CsWarpRearingInit = 0x8087DFF4; // type:func +EnHorse_CsWarpRearing = 0x8087E17C; // type:func +EnHorse_InitCutscene = 0x8087E324; // type:func +EnHorse_GetCutsceneFunctionIndex = 0x8087E348; // type:func +EnHorse_CutsceneUpdate = 0x8087E398; // type:func +EnHorse_UpdateHbaRaceInfo = 0x8087E4F0; // type:func +EnHorse_InitHorsebackArchery = 0x8087E6E0; // type:func +EnHorse_UpdateHbaAnim = 0x8087E714; // type:func +EnHorse_UpdateHorsebackArchery = 0x8087EA4C; // type:func +EnHorse_InitFleePlayer = 0x8087ECD8; // type:func +EnHorse_FleePlayer = 0x8087ED00; // type:func +EnHorse_BridgeJumpInit = 0x8087F554; // type:func +EnHorse_StartBridgeJump = 0x8087F78C; // type:func +EnHorse_BridgeJumpMove = 0x8087F83C; // type:func +EnHorse_CheckBridgeJumpLanding = 0x8087F998; // type:func +EnHorse_BridgeJump = 0x8087FA84; // type:func +EnHorse_Vec3fOffset = 0x8087FAC8; // type:func +EnHorse_CalcFloorHeight = 0x8087FB44; // type:func +EnHorse_ObstructMovement = 0x8087FC84; // type:func +EnHorse_CheckFloors = 0x8087FDAC; // type:func +EnHorse_MountDismount = 0x8088032C; // type:func +EnHorse_StickDirection = 0x80880430; // type:func +EnHorse_UpdateStick = 0x808804BC; // type:func +EnHorse_ResolveCollision = 0x808804FC; // type:func +EnHorse_BgCheckSlowMoving = 0x80880654; // type:func +EnHorse_UpdateBgCheckInfo = 0x80880794; // type:func +EnHorse_CheckBoost = 0x808812A0; // type:func +EnHorse_RegenBoost = 0x8088144C; // type:func +EnHorse_UpdatePlayerDir = 0x80881678; // type:func +EnHorse_TiltBody = 0x80881784; // type:func +EnHorse_UpdateConveyors = 0x80881880; // type:func +EnHorse_RandInt = 0x80881988; // type:func +EnHorse_Update = 0x808819BC; // type:func +EnHorse_PlayerDirToMountSide = 0x808821E8; // type:func +EnHorse_MountSideCheck = 0x80882228; // type:func +EnHorse_GetMountSide = 0x8088232C; // type:func +EnHorse_RandomOffset = 0x80882384; // type:func +EnHorse_PostDraw = 0x80882420; // type:func +EnHorse_OverrideLimbDraw = 0x80882F18; // type:func +EnHorse_Draw = 0x80883018; // type:func +EnArrow_SetupAction = 0x808847C0; // type:func +EnArrow_Init = 0x808847CC; // type:func +EnArrow_Destroy = 0x808849D4; // type:func +EnArrow_Shoot = 0x80884A5C; // type:func +func_809B3CEC = 0x80884B74; // type:func +EnArrow_CarryActor = 0x80884C5C; // type:func +EnArrow_Fly = 0x80884E60; // type:func +func_809B45E0 = 0x80885468; // type:func +func_809B4640 = 0x808854C8; // type:func +EnArrow_Update = 0x80885530; // type:func +func_809B4800 = 0x8088568C; // type:func +EnArrow_Draw = 0x808857F4; // type:func +EnElf_SetupAction = 0x80885EC0; // type:func +func_80A01C38 = 0x80885ECC; // type:func +func_80A01F90 = 0x80886224; // type:func +func_80A01FE0 = 0x80886278; // type:func +func_80A020A4 = 0x80886340; // type:func +func_80A0214C = 0x808863EC; // type:func +func_80A0232C = 0x808865CC; // type:func +EnElf_GetColorValue = 0x80886644; // type:func +EnElf_Init = 0x808866B4; // type:func +func_80A0299C = 0x80886C20; // type:func +func_80A029A8 = 0x80886C30; // type:func +EnElf_Destroy = 0x80886C58; // type:func +func_80A02A20 = 0x80886CA8; // type:func +func_80A02AA4 = 0x80886D2C; // type:func +func_80A02B38 = 0x80886DC0; // type:func +func_80A02BD8 = 0x80886E5C; // type:func +func_80A02C98 = 0x80886F1C; // type:func +func_80A02E30 = 0x808870B4; // type:func +func_80A02EC0 = 0x80887140; // type:func +func_80A02F2C = 0x808871AC; // type:func +func_80A03018 = 0x80887298; // type:func +func_80A03148 = 0x808873CC; // type:func +func_80A0329C = 0x80887524; // type:func +func_80A0353C = 0x808877C8; // type:func +func_80A03604 = 0x80887890; // type:func +func_80A03610 = 0x808878A0; // type:func +func_80A03814 = 0x80887AA8; // type:func +func_80A03990 = 0x80887C28; // type:func +func_80A03AB0 = 0x80887D4C; // type:func +EnElf_UpdateLights = 0x80887DB0; // type:func +func_80A03CF8 = 0x80887F84; // type:func +EnElf_ChangeColor = 0x8088861C; // type:func +func_80A04414 = 0x808886A8; // type:func +func_80A0461C = 0x808888B4; // type:func +EnElf_SpawnSparkles = 0x80888C50; // type:func +func_80A04D90 = 0x80889030; // type:func +func_80A04DE4 = 0x80889084; // type:func +func_80A04F94 = 0x80889238; // type:func +func_80A05040 = 0x808892E8; // type:func +func_80A05114 = 0x808893C4; // type:func +func_80A05188 = 0x80889440; // type:func +func_80A05208 = 0x808894C8; // type:func +func_80A052F4 = 0x808895BC; // type:func +func_80A053F0 = 0x808896C0; // type:func +EnElf_Update = 0x8088993C; // type:func +EnElf_OverrideLimbDraw = 0x80889998; // type:func +EnElf_Draw = 0x80889ABC; // type:func +EnElf_GetCuePos = 0x8088A134; // type:func +EnNiw_Init = 0x8088A880; // type:func +EnNiw_Destroy = 0x8088AD84; // type:func +func_80AB5BF8 = 0x8088ADB0; // type:func +EnNiw_SpawnAttackCucco = 0x8088B158; // type:func +func_80AB6100 = 0x8088B2A0; // type:func +EnNiw_ResetAction = 0x8088B41C; // type:func +func_80AB6324 = 0x8088B4C4; // type:func +func_80AB63A8 = 0x8088B548; // type:func +func_80AB6450 = 0x8088B5F0; // type:func +func_80AB6570 = 0x8088B710; // type:func +func_80AB6A38 = 0x8088BBDC; // type:func +func_80AB6BF8 = 0x8088BD9C; // type:func +func_80AB6D08 = 0x8088BEAC; // type:func +func_80AB6EB4 = 0x8088C058; // type:func +func_80AB6F04 = 0x8088C0A8; // type:func +func_80AB70A0 = 0x8088C248; // type:func +func_80AB70F8 = 0x8088C2A0; // type:func +func_80AB714C = 0x8088C2F4; // type:func +func_80AB7204 = 0x8088C3AC; // type:func +func_80AB7290 = 0x8088C43C; // type:func +func_80AB7328 = 0x8088C4D4; // type:func +func_80AB7420 = 0x8088C5D0; // type:func +func_80AB747C = 0x8088C62C; // type:func +EnNiw_Update = 0x8088C6E4; // type:func +EnNiw_OverrideLimbDraw = 0x8088CF90; // type:func +EnNiw_Draw = 0x8088D0E8; // type:func +EnNiw_SpawnFeather = 0x8088D198; // type:func +EnNiw_UpdateEffects = 0x8088D288; // type:func +EnNiw_DrawEffects = 0x8088D43C; // type:func +EnTite_SetupAction = 0x8088DBB0; // type:func +EnTite_Init = 0x8088DBBC; // type:func +EnTite_Destroy = 0x8088DD14; // type:func +EnTite_SetupIdle = 0x8088DD5C; // type:func +EnTite_Idle = 0x8088DDC4; // type:func +EnTite_SetupAttack = 0x8088DF08; // type:func +EnTite_Attack = 0x8088DF7C; // type:func +EnTite_SetupTurnTowardPlayer = 0x8088E624; // type:func +EnTite_TurnTowardPlayer = 0x8088E6C0; // type:func +EnTite_SetupMoveTowardPlayer = 0x8088E95C; // type:func +EnTite_MoveTowardPlayer = 0x8088EA18; // type:func +EnTite_SetupRecoil = 0x8088EF28; // type:func +EnTite_Recoil = 0x8088EF94; // type:func +EnTite_SetupStunned = 0x8088F2EC; // type:func +EnTite_Stunned = 0x8088F3A0; // type:func +EnTite_SetupDeathCry = 0x8088F73C; // type:func +EnTite_DeathCry = 0x8088F770; // type:func +EnTite_FallApart = 0x8088F7E4; // type:func +EnTite_SetupFlipOnBack = 0x8088F870; // type:func +EnTite_FlipOnBack = 0x8088F98C; // type:func +EnTite_SetupFlipUpright = 0x8088FB48; // type:func +EnTite_FlipUpright = 0x8088FB98; // type:func +EnTite_CheckDamage = 0x8088FCC0; // type:func +EnTite_Update = 0x8088FE98; // type:func +EnTite_PostLimbDraw = 0x80890284; // type:func +EnTite_Draw = 0x80890374; // type:func +EnReeba_Init = 0x80890950; // type:func +EnReeba_Destroy = 0x80890B2C; // type:func +EnReeba_SetupSurface = 0x80890BA4; // type:func +EnReeba_Surface = 0x80890CB8; // type:func +EnReeba_Move = 0x80890ED8; // type:func +EnReeba_SetupMoveBig = 0x80890FF4; // type:func +EnReeba_MoveBig = 0x80891018; // type:func +EnReeba_Recoiled = 0x80891288; // type:func +EnReeba_SetupSink = 0x808912F4; // type:func +EnReeba_Sink = 0x8089134C; // type:func +EnReeba_SetupDamaged = 0x8089145C; // type:func +EnReeba_Damaged = 0x808914C0; // type:func +EnReeba_SetupStunned = 0x80891558; // type:func +EnReeba_Stunned = 0x808915A8; // type:func +EnReeba_StunDie = 0x8089170C; // type:func +EnReeba_SetupDie = 0x80891834; // type:func +EnReeba_Die = 0x808918A8; // type:func +EnReeba_StunRecover = 0x80891A88; // type:func +EnReeba_CheckDamage = 0x80891B1C; // type:func +EnReeba_Update = 0x80891D58; // type:func +EnReeba_Draw = 0x80892008; // type:func +EnPeehat_SetupAction = 0x808923C0; // type:func +EnPeehat_Init = 0x808923CC; // type:func +EnPeehat_Destroy = 0x8089263C; // type:func +EnPeehat_SpawnDust = 0x808926B0; // type:func +EnPeehat_HitWhenGrounded = 0x80892848; // type:func +EnPeehat_Ground_SetStateGround = 0x80892A64; // type:func +EnPeehat_Ground_StateGround = 0x80892AFC; // type:func +EnPeehat_Flying_SetStateGround = 0x80892C50; // type:func +EnPeehat_Flying_StateGrounded = 0x80892CDC; // type:func +EnPeehat_Flying_SetStateFly = 0x80892DE0; // type:func +EnPeehat_Flying_StateFly = 0x80892E28; // type:func +EnPeehat_Ground_SetStateRise = 0x80892FA0; // type:func +EnPeehat_Ground_StateRise = 0x80893048; // type:func +EnPeehat_Flying_SetStateRise = 0x80893210; // type:func +EnPeehat_Flying_StateRise = 0x808932B8; // type:func +EnPeehat_Ground_SetStateSeekPlayer = 0x80893480; // type:func +EnPeehat_Ground_StateSeekPlayer = 0x808934D0; // type:func +EnPeehat_Larva_SetStateSeekPlayer = 0x8089364C; // type:func +EnPeehat_Larva_StateSeekPlayer = 0x80893698; // type:func +EnPeehat_Ground_SetStateLanding = 0x80893A70; // type:func +EnPeehat_Ground_StateLanding = 0x80893AB8; // type:func +EnPeehat_Flying_SetStateLanding = 0x80893C6C; // type:func +EnPeehat_Flying_StateLanding = 0x80893CB4; // type:func +EnPeehat_Ground_SetStateHover = 0x80893E64; // type:func +EnPeehat_Ground_StateHover = 0x80893EF4; // type:func +EnPeehat_Ground_SetStateReturnHome = 0x80894150; // type:func +EnPeehat_Ground_StateReturnHome = 0x80894188; // type:func +EnPeehat_SetStateAttackRecoil = 0x80894374; // type:func +EnPeehat_StateAttackRecoil = 0x808943D4; // type:func +EnPeehat_SetStateBoomerangStunned = 0x808945B0; // type:func +EnPeehat_StateBoomerangStunned = 0x80894634; // type:func +EnPeehat_Adult_SetStateDie = 0x808946B0; // type:func +EnPeehat_Adult_StateDie = 0x8089471C; // type:func +EnPeehat_SetStateExplode = 0x808949DC; // type:func +EnPeehat_StateExplode = 0x80894A34; // type:func +EnPeehat_Adult_CollisionCheck = 0x80894B0C; // type:func +EnPeehat_Update = 0x80894CF8; // type:func +EnPeehat_OverrideLimbDraw = 0x8089515C; // type:func +EnPeehat_PostLimbDraw = 0x80895334; // type:func +EnPeehat_Draw = 0x808954E8; // type:func +EnHoll_SetupAction = 0x80895AC0; // type:func +EnHoll_IsKokiriLayer8 = 0x80895ACC; // type:func +EnHoll_ChooseAction = 0x80895AFC; // type:func +EnHoll_Init = 0x80895B64; // type:func +EnHoll_Destroy = 0x80895BA0; // type:func +EnHoll_SwapRooms = 0x80895BD0; // type:func +EnHoll_HorizontalVisibleNarrow = 0x80895C8C; // type:func +EnHoll_HorizontalInvisible = 0x80895ECC; // type:func +EnHoll_VerticalDownBgCoverLarge = 0x8089607C; // type:func +EnHoll_VerticalBgCover = 0x80896268; // type:func +EnHoll_VerticalInvisible = 0x808963E8; // type:func +EnHoll_HorizontalBgCoverSwitchFlag = 0x808964E0; // type:func +EnHoll_WaitRoomLoaded = 0x808966F0; // type:func +EnHoll_Update = 0x80896768; // type:func +EnHoll_Draw = 0x8089678C; // type:func +EnSceneChange_SetupAction = 0x80896A90; // type:func +EnSceneChange_Init = 0x80896A9C; // type:func +EnSceneChange_Destroy = 0x80896AC4; // type:func +EnSceneChange_DoNothing = 0x80896AD4; // type:func +EnSceneChange_Update = 0x80896AE4; // type:func +EnSceneChange_Draw = 0x80896B08; // type:func +EnZf_SetupAction = 0x80896BC0; // type:func +EnZf_PrimaryFloorCheck = 0x80896BCC; // type:func +EnZf_SecondaryFloorCheck = 0x80896D3C; // type:func +EnZf_Init = 0x80896E6C; // type:func +EnZf_Destroy = 0x808971A4; // type:func +EnZf_FindPlatform = 0x80897228; // type:func +EnZf_FindNextPlatformAwayFromPlayer = 0x808973F0; // type:func +EnZf_FindNextPlatformTowardsPlayer = 0x80897694; // type:func +EnZf_CanAttack = 0x80897870; // type:func +func_80B44DC4 = 0x80897944; // type:func +EnZf_ChooseAction = 0x80897A10; // type:func +EnZf_SetupDropIn = 0x80897C30; // type:func +EnZf_DropIn = 0x80897CF8; // type:func +func_80B45384 = 0x80897F08; // type:func +func_80B4543C = 0x80897FC0; // type:func +EnZf_SetupApproachPlayer = 0x8089823C; // type:func +EnZf_ApproachPlayer = 0x808982D0; // type:func +EnZf_SetupJumpForward = 0x808989BC; // type:func +EnZf_JumpForward = 0x80898A7C; // type:func +func_80B4604C = 0x80898BD8; // type:func +func_80B46098 = 0x80898C24; // type:func +func_80B462E4 = 0x80898E70; // type:func +func_80B463E4 = 0x80898F78; // type:func +EnZf_SetupSlash = 0x808995BC; // type:func +EnZf_Slash = 0x80899678; // type:func +EnZf_SetupRecoilFromBlockedSlash = 0x80899904; // type:func +EnZf_RecoilFromBlockedSlash = 0x80899978; // type:func +EnZf_SetupJumpBack = 0x80899A30; // type:func +EnZf_JumpBack = 0x80899AD0; // type:func +EnZf_SetupStunned = 0x80899BF4; // type:func +EnZf_Stunned = 0x80899CC4; // type:func +EnZf_SetupSheatheSword = 0x80899F04; // type:func +EnZf_SheatheSword = 0x80899FE0; // type:func +EnZf_SetupHopAndTaunt = 0x8089A08C; // type:func +EnZf_HopAndTaunt = 0x8089A0EC; // type:func +EnZf_SetupHopAway = 0x8089A344; // type:func +EnZf_HopAway = 0x8089A3C4; // type:func +EnZf_SetupDrawSword = 0x8089A810; // type:func +EnZf_DrawSword = 0x8089A8A4; // type:func +EnZf_SetupDamaged = 0x8089A954; // type:func +EnZf_Damaged = 0x8089AA60; // type:func +EnZf_SetupJumpUp = 0x8089ADC0; // type:func +EnZf_JumpUp = 0x8089AE68; // type:func +func_80B483E4 = 0x8089AF94; // type:func +EnZf_CircleAroundPlayer = 0x8089B130; // type:func +EnZf_SetupDie = 0x8089B8B0; // type:func +EnZf_Die = 0x8089BA14; // type:func +EnZf_UpdateHeadRotation = 0x8089BB54; // type:func +EnZf_UpdateDamage = 0x8089BC78; // type:func +EnZf_Update = 0x8089BE10; // type:func +EnZf_OverrideLimbDraw = 0x8089C1C8; // type:func +EnZf_PostLimbDraw = 0x8089C254; // type:func +EnZf_Draw = 0x8089C4A8; // type:func +EnZf_SetupCircleAroundPlayer = 0x8089C6F4; // type:func +EnZf_DodgeRangedEngaging = 0x8089C7C0; // type:func +EnZf_DodgeRangedWaiting = 0x8089C9EC; // type:func +EnHata_Init = 0x8089D6B0; // type:func +EnHata_Destroy = 0x8089D7E8; // type:func +EnHata_Update = 0x8089D830; // type:func +EnHata_OverrideLimbDraw = 0x8089DA4C; // type:func +EnHata_PostLimbDraw = 0x8089DAD0; // type:func +EnHata_Draw = 0x8089DAE8; // type:func +func_808C1190 = 0x8089DC40; // type:func +func_808C11D0 = 0x8089DC80; // type:func +func_808C1200 = 0x8089DCB0; // type:func +func_808C1230 = 0x8089DCE0; // type:func +func_808C1278 = 0x8089DD28; // type:func +func_808C12C4 = 0x8089DD74; // type:func +func_808C1554 = 0x8089E004; // type:func +func_808C17C8 = 0x8089E284; // type:func +BossDodongo_AteExplosive = 0x8089E36C; // type:func +BossDodongo_Init = 0x8089E42C; // type:func +BossDodongo_Destroy = 0x8089E708; // type:func +BossDodongo_SetupIntroCutscene = 0x8089E748; // type:func +BossDodongo_IntroCutscene = 0x8089E7C8; // type:func +BossDodongo_SetupDamaged = 0x8089F344; // type:func +BossDodongo_SetupExplode = 0x8089F3D8; // type:func +BossDodongo_SetupWalk = 0x8089F47C; // type:func +BossDodongo_SetupRoll = 0x8089F50C; // type:func +BossDodongo_SetupBlowFire = 0x8089F580; // type:func +BossDodongo_SetupInhale = 0x8089F608; // type:func +BossDodongo_Damaged = 0x8089F698; // type:func +BossDodongo_Explode = 0x8089F74C; // type:func +BossDodongo_LayDown = 0x8089F9A0; // type:func +BossDodongo_Vulnerable = 0x8089FA80; // type:func +BossDodongo_GetUp = 0x8089FB6C; // type:func +BossDodongo_BlowFire = 0x8089FBD0; // type:func +BossDodongo_Inhale = 0x8089FD00; // type:func +BossDodongo_Walk = 0x8089FDD4; // type:func +BossDodongo_Roll = 0x808A01E4; // type:func +BossDodongo_Update = 0x808A05E0; // type:func +BossDodongo_OverrideLimbDraw = 0x808A1420; // type:func +BossDodongo_PostLimbDraw = 0x808A1644; // type:func +BossDodongo_Draw = 0x808A1728; // type:func +func_808C4F6C = 0x808A19F0; // type:func +func_808C50A8 = 0x808A1B2C; // type:func +BossDodongo_PlayerYawCheck = 0x808A1C78; // type:func +BossDodongo_PlayerPosCheck = 0x808A1CD4; // type:func +BossDodongo_SpawnFire = 0x808A1D68; // type:func +BossDodongo_UpdateDamage = 0x808A1DDC; // type:func +BossDodongo_SetupDeathCutscene = 0x808A1F48; // type:func +BossDodongo_DeathCutscene = 0x808A2000; // type:func +BossDodongo_UpdateEffects = 0x808A3740; // type:func +BossDodongo_DrawEffects = 0x808A3874; // type:func +BossGoma_ClearPixels16x16Rgba16 = 0x808A7740; // type:func +BossGoma_ClearPixels32x32Rgba16 = 0x808A7770; // type:func +BossGoma_ClearPixels = 0x808A77C4; // type:func +BossGoma_Init = 0x808A7974; // type:func +BossGoma_PlayEffectsAndSfx = 0x808A7B2C; // type:func +BossGoma_Destroy = 0x808A7C34; // type:func +BossGoma_SetupDefeated = 0x808A7C74; // type:func +BossGoma_SetupEncounter = 0x808A7D3C; // type:func +BossGoma_SetupFloorIdle = 0x808A7DE0; // type:func +BossGoma_SetupCeilingIdle = 0x808A7E68; // type:func +BossGoma_SetupFallJump = 0x808A7EEC; // type:func +BossGoma_SetupFallStruckDown = 0x808A7F68; // type:func +BossGoma_SetupCeilingSpawnGohmas = 0x808A7FE4; // type:func +BossGoma_SetupCeilingPrepareSpawnGohmas = 0x808A8058; // type:func +BossGoma_SetupWallClimb = 0x808A80D0; // type:func +BossGoma_SetupCeilingMoveToCenter = 0x808A8154; // type:func +BossGoma_SetupFloorMain = 0x808A81E8; // type:func +BossGoma_SetupFloorLand = 0x808A8268; // type:func +BossGoma_SetupFloorLandStruckDown = 0x808A82F4; // type:func +BossGoma_SetupFloorStunned = 0x808A8398; // type:func +BossGoma_SetupFloorAttackPosture = 0x808A8408; // type:func +BossGoma_SetupFloorPrepareAttack = 0x808A847C; // type:func +BossGoma_SetupFloorAttack = 0x808A84F0; // type:func +BossGoma_SetupFloorDamaged = 0x808A856C; // type:func +BossGoma_UpdateCeilingMovement = 0x808A85E0; // type:func +BossGoma_SetupEncounterState4 = 0x808A881C; // type:func +BossGoma_Encounter = 0x808A89CC; // type:func +BossGoma_Defeated = 0x808A9AC4; // type:func +BossGoma_FloorAttackPosture = 0x808AA934; // type:func +BossGoma_FloorPrepareAttack = 0x808AAA3C; // type:func +BossGoma_FloorAttack = 0x808AAA98; // type:func +BossGoma_FloorDamaged = 0x808AACE8; // type:func +BossGoma_FloorLandStruckDown = 0x808AAD80; // type:func +BossGoma_FloorLand = 0x808AAE24; // type:func +BossGoma_FloorStunned = 0x808AAE80; // type:func +BossGoma_FallJump = 0x808AAFAC; // type:func +BossGoma_FallStruckDown = 0x808AB060; // type:func +BossGoma_CeilingSpawnGohmas = 0x808AB120; // type:func +BossGoma_CeilingPrepareSpawnGohmas = 0x808AB27C; // type:func +BossGoma_FloorIdle = 0x808AB2D8; // type:func +BossGoma_CeilingIdle = 0x808AB340; // type:func +BossGoma_FloorMain = 0x808AB438; // type:func +BossGoma_WallClimb = 0x808AB6A8; // type:func +BossGoma_CeilingMoveToCenter = 0x808AB774; // type:func +BossGoma_UpdateEye = 0x808AB970; // type:func +BossGoma_UpdateTailLimbsScale = 0x808ABBB8; // type:func +BossGoma_UpdateHit = 0x808ABCC4; // type:func +BossGoma_UpdateMainEnvColor = 0x808ABEA4; // type:func +BossGoma_UpdateEyeEnvColor = 0x808AC020; // type:func +BossGoma_Update = 0x808AC0C8; // type:func +BossGoma_OverrideLimbDraw = 0x808AC298; // type:func +BossGoma_PostLimbDraw = 0x808AC6E4; // type:func +BossGoma_EmptyDlist = 0x808AC8E8; // type:func +BossGoma_NoBackfaceCullingDlist = 0x808AC90C; // type:func +BossGoma_Draw = 0x808AC978; // type:func +BossGoma_SpawnChildGohma = 0x808ACA68; // type:func +func_80B4AB40 = 0x808AD6E0; // type:func +func_80B4AB48 = 0x808AD6E8; // type:func +EnZl1_Init = 0x808AD6F0; // type:func +EnZl1_Destroy = 0x808AD980; // type:func +func_80B4AE18 = 0x808AD9C0; // type:func +func_80B4AF18 = 0x808ADAC0; // type:func +func_80B4B010 = 0x808ADBB8; // type:func +func_80B4B240 = 0x808ADDF0; // type:func +func_80B4B7F4 = 0x808AE3A4; // type:func +func_80B4B834 = 0x808AE3E8; // type:func +func_80B4B874 = 0x808AE42C; // type:func +func_80B4B8B4 = 0x808AE46C; // type:func +func_80B4BBC4 = 0x808AE77C; // type:func +func_80B4BC78 = 0x808AE830; // type:func +func_80B4BF2C = 0x808AEAE4; // type:func +EnZl1_Update = 0x808AEDD8; // type:func +EnZl1_OverrideLimbDraw = 0x808AEEFC; // type:func +EnZl1_PostLimbDraw = 0x808AEFBC; // type:func +EnZl1_Draw = 0x808AF018; // type:func +EnViewer_SetupAction = 0x808B14F0; // type:func +EnViewer_Init = 0x808B14FC; // type:func +EnViewer_Destroy = 0x808B15D0; // type:func +EnViewer_InitAnimGanondorfOrZelda = 0x808B15FC; // type:func +EnViewer_InitAnimImpa = 0x808B1748; // type:func +EnViewer_InitAnimHorse = 0x808B17D8; // type:func +EnViewer_InitImpl = 0x808B1870; // type:func +EnViewer_UpdateImpl = 0x808B1A2C; // type:func +EnViewer_Update = 0x808B2584; // type:func +EnViewer_Ganondorf3OverrideLimbDraw = 0x808B25D8; // type:func +EnViewer_Ganondorf9PostLimbDraw = 0x808B2648; // type:func +EnViewer_GanondorfPostLimbDrawUpdateCapeVec = 0x808B2710; // type:func +EnViewer_DrawGanondorf = 0x808B2750; // type:func +EnViewer_DrawHorse = 0x808B2B7C; // type:func +EnViewer_ZeldaOverrideLimbDraw = 0x808B2BA8; // type:func +EnViewer_ZeldaPostLimbDraw = 0x808B2C28; // type:func +EnViewer_DrawZelda = 0x808B2C70; // type:func +EnViewer_ImpaOverrideLimbDraw = 0x808B3314; // type:func +EnViewer_DrawImpa = 0x808B333C; // type:func +EnViewer_Draw = 0x808B3450; // type:func +EnViewer_UpdatePosition = 0x808B3540; // type:func +EnViewer_InitFireEffect = 0x808B3910; // type:func +EnViewer_DrawFireEffects = 0x808B3A58; // type:func +EnViewer_UpdateGanondorfCape = 0x808B3D9C; // type:func +EnGoma_Init = 0x808B43B0; // type:func +EnGoma_Destroy = 0x808B473C; // type:func +EnGoma_SetupFlee = 0x808B478C; // type:func +EnGoma_Flee = 0x808B4830; // type:func +EnGoma_EggFallToGround = 0x808B48D0; // type:func +EnGoma_Egg = 0x808B4B5C; // type:func +EnGoma_SetupHatch = 0x808B4D9C; // type:func +EnGoma_Hatch = 0x808B4E64; // type:func +EnGoma_SetupHurt = 0x808B4EAC; // type:func +EnGoma_Hurt = 0x808B4F98; // type:func +EnGoma_SetupDie = 0x808B5020; // type:func +EnGoma_Die = 0x808B50E0; // type:func +EnGoma_SetupDead = 0x808B5184; // type:func +EnGoma_Dead = 0x808B51FC; // type:func +EnGoma_SetupStand = 0x808B536C; // type:func +EnGoma_SetupChasePlayer = 0x808B53F8; // type:func +EnGoma_SetupPrepareJump = 0x808B5478; // type:func +EnGoma_PrepareJump = 0x808B54F4; // type:func +EnGoma_SetupLand = 0x808B558C; // type:func +EnGoma_Land = 0x808B5604; // type:func +EnGoma_SetupJump = 0x808B5670; // type:func +EnGoma_Jump = 0x808B5718; // type:func +EnGoma_Stand = 0x808B57D0; // type:func +EnGoma_ChasePlayer = 0x808B584C; // type:func +EnGoma_SetupStunned = 0x808B5954; // type:func +EnGoma_Stunned = 0x808B59F0; // type:func +EnGoma_LookAtPlayer = 0x808B5AF0; // type:func +EnGoma_UpdateHit = 0x808B5B9C; // type:func +EnGoma_UpdateEyeEnvColor = 0x808B5DCC; // type:func +EnGoma_SetFloorRot = 0x808B5E5C; // type:func +EnGoma_Update = 0x808B5F70; // type:func +EnGoma_OverrideLimbDraw = 0x808B61BC; // type:func +EnGoma_NoBackfaceCullingDlist = 0x808B6318; // type:func +EnGoma_Draw = 0x808B6384; // type:func +EnGoma_Debris = 0x808B6810; // type:func +EnGoma_SpawnHatchDebris = 0x808B6854; // type:func +EnGoma_BossLimb = 0x808B69B8; // type:func +BgPushbox_SetupAction = 0x808B7060; // type:func +BgPushbox_Init = 0x808B706C; // type:func +BgPushbox_Destroy = 0x808B7104; // type:func +BgPushbox_UpdateImpl = 0x808B7138; // type:func +BgPushbox_Update = 0x808B7214; // type:func +BgPushbox_Draw = 0x808B7244; // type:func +EnBubble_SetDimensions = 0x808B7360; // type:func +func_809CBCBC = 0x808B741C; // type:func +func_809CBCEC = 0x808B7450; // type:func +EnBubble_DamagePlayer = 0x808B7474; // type:func +EnBubble_Explosion = 0x808B74E0; // type:func +func_809CBFD4 = 0x808B773C; // type:func +func_809CC020 = 0x808B7788; // type:func +EnBubble_Vec3fNormalizedReflect = 0x808B77DC; // type:func +EnBubble_Vec3fNormalize = 0x808B7864; // type:func +EnBubble_Fly = 0x808B78DC; // type:func +func_809CC648 = 0x808B7DB8; // type:func +EnBubble_DetectPop = 0x808B7E54; // type:func +func_809CC774 = 0x808B7EE4; // type:func +EnBubble_Init = 0x808B7FF8; // type:func +EnBubble_Destroy = 0x808B80F8; // type:func +EnBubble_Wait = 0x808B8124; // type:func +EnBubble_Pop = 0x808B81D8; // type:func +EnBubble_Disappear = 0x808B8228; // type:func +EnBubble_Regrow = 0x808B8270; // type:func +EnBubble_Update = 0x808B82E0; // type:func +EnBubble_Draw = 0x808B835C; // type:func +DoorShutter_SetupAction = 0x808B8780; // type:func +DoorShutter_SetupDoor = 0x808B8790; // type:func +DoorShutter_Init = 0x808B8978; // type:func +DoorShutter_Destroy = 0x808B8B90; // type:func +DoorShutter_WaitForObject = 0x808B8C00; // type:func +DoorShutter_GetPlayerDistance = 0x808B8D3C; // type:func +DoorShutter_GetPlayerSide = 0x808B8DD4; // type:func +DoorShutter_WaitClear = 0x808B8F54; // type:func +DoorShutter_Unopenable = 0x808B9000; // type:func +DoorShutter_Idle = 0x808B9010; // type:func +DoorShutter_InitOpeningDoorCam = 0x808B9164; // type:func +DoorShutter_UpdateOpening = 0x808B921C; // type:func +DoorShutter_UpdateBarsClosed = 0x808B9314; // type:func +DoorShutter_BarAndWaitSwitchFlag = 0x808B93F8; // type:func +DoorShutter_UnbarredCheckSwitchFlag = 0x808B94B0; // type:func +DoorShutter_Open = 0x808B951C; // type:func +DoorShutter_Unbar = 0x808B966C; // type:func +DoorShutter_SetupClosed = 0x808B973C; // type:func +DoorShutter_Close = 0x808B9908; // type:func +DoorShutter_JabuDoorClose = 0x808B9A4C; // type:func +DoorShutter_WaitPlayerSurprised = 0x808B9A90; // type:func +DoorShutter_GohmaBlockFall = 0x808B9AE8; // type:func +DoorShutter_GohmaBlockBounce = 0x808B9BE4; // type:func +DoorShutter_PhantomGanonBarsRaise = 0x808B9C70; // type:func +DoorShutter_Update = 0x808B9D00; // type:func +DoorShutter_DrawJabuJabuDoor = 0x808B9D54; // type:func +DoorShutter_ShouldDraw = 0x808B9F44; // type:func +DoorShutter_Draw = 0x808B9FF0; // type:func +DoorShutter_RequestQuakeAndRumble = 0x808BA544; // type:func +EnDodojr_Init = 0x808BAA40; // type:func +EnDodojr_Destroy = 0x808BAB28; // type:func +EnDodojr_DoSwallowedBombEffects = 0x808BAB54; // type:func +EnDodojr_SpawnLargeDust = 0x808BAB98; // type:func +EnDodojr_SpawnSmallDust = 0x808BADB8; // type:func +EnDodojr_UpdateBounces = 0x808BAF38; // type:func +EnDodojr_SetupCrawlTowardsTarget = 0x808BB01C; // type:func +EnDodojr_SetupFlipBounce = 0x808BB0A4; // type:func +EnDodojr_SetupSwallowedBombDeathSequence = 0x808BB148; // type:func +EnDodojr_SetupJumpAttackBounce = 0x808BB1B8; // type:func +EnDodojr_SetupDespawn = 0x808BB23C; // type:func +EnDodojr_SetupEatBomb = 0x808BB2A8; // type:func +EnDodojr_CheckNearbyBombs = 0x808BB324; // type:func +EnDodojr_TryEatBomb = 0x808BB450; // type:func +EnDodojr_UpdateCrawl = 0x808BB4D4; // type:func +EnDodojr_IsPlayerWithinAttackRange = 0x808BB6E8; // type:func +EnDodojr_SetupStandardDeathBounce = 0x808BB718; // type:func +EnDodojr_CheckDamaged = 0x808BB764; // type:func +EnDodojr_UpdateCollider = 0x808BB920; // type:func +EnDodojr_WaitUnderground = 0x808BBA30; // type:func +EnDodojr_EmergeFromGround = 0x808BBB48; // type:func +EnDodojr_CrawlTowardsTarget = 0x808BBC10; // type:func +EnDodojr_EatBomb = 0x808BBD14; // type:func +EnDodojr_SwallowBomb = 0x808BBDC4; // type:func +EnDodojr_SwallowedBombDeathBounce = 0x808BBE34; // type:func +EnDodojr_SwallowedBombDeathSequence = 0x808BBED4; // type:func +EnDodojr_StunnedBounce = 0x808BBEF4; // type:func +EnDodojr_Stunned = 0x808BBF74; // type:func +EnDodojr_JumpAttackBounce = 0x808BC024; // type:func +EnDodojr_Despawn = 0x808BC08C; // type:func +EnDodojr_StandardDeathBounce = 0x808BC144; // type:func +EnDodojr_DeathSequence = 0x808BC1CC; // type:func +EnDodojr_DropItem = 0x808BC278; // type:func +EnDodojr_WaitFreezeFrames = 0x808BC2DC; // type:func +EnDodojr_Update = 0x808BC324; // type:func +EnDodojr_OverrideLimbDraw = 0x808BC3E4; // type:func +EnDodojr_PostLimbDraw = 0x808BC490; // type:func +EnDodojr_Draw = 0x808BC4A8; // type:func +EnBdfire_SetupAction = 0x808BC8E0; // type:func +EnbdFire_SetupDraw = 0x808BC8EC; // type:func +EnBdfire_Init = 0x808BC8F8; // type:func +EnBdfire_Destroy = 0x808BCB28; // type:func +func_809BC2A4 = 0x808BCB60; // type:func +func_809BC598 = 0x808BCE54; // type:func +EnBdfire_Update = 0x808BD144; // type:func +EnBdfire_DrawFire = 0x808BD180; // type:func +EnBdfire_Draw = 0x808BD340; // type:func +EnBoom_SetupAction = 0x808BD480; // type:func +EnBoom_Init = 0x808BD48C; // type:func +EnBoom_Destroy = 0x808BD5A8; // type:func +EnBoom_Fly = 0x808BD5E8; // type:func +EnBoom_Update = 0x808BDA28; // type:func +EnBoom_Draw = 0x808BDA80; // type:func +EnTorch2_Init = 0x808BDD50; // type:func +EnTorch2_Destroy = 0x808BDEF8; // type:func +EnTorch2_GetAttackItem = 0x808BDF68; // type:func +EnTorch2_SwingSword = 0x808BDFB0; // type:func +EnTorch2_Backflip = 0x808BE148; // type:func +EnTorch2_Update = 0x808BE1A0; // type:func +EnTorch2_OverrideLimbDraw = 0x808BFB88; // type:func +EnTorch2_PostLimbDraw = 0x808BFBB4; // type:func +EnTorch2_Draw = 0x808BFBD8; // type:func +EnBili_Init = 0x808C04F0; // type:func +EnBili_Destroy = 0x808C05E8; // type:func +EnBili_SetupFloatIdle = 0x808C0614; // type:func +EnBili_SetupSpawnedFlyApart = 0x808C0670; // type:func +EnBili_SetupDischargeLightning = 0x808C06E8; // type:func +EnBili_SetupClimb = 0x808C0744; // type:func +EnBili_SetupApproachPlayer = 0x808C079C; // type:func +EnBili_SetupSetNewHomeHeight = 0x808C07BC; // type:func +EnBili_SetupRecoil = 0x808C0824; // type:func +EnBili_SetupBurnt = 0x808C08AC; // type:func +EnBili_SetupDie = 0x808C094C; // type:func +EnBili_SetupStunned = 0x808C0980; // type:func +EnBili_SetupFrozen = 0x808C09F8; // type:func +EnBili_UpdateTentaclesIndex = 0x808C0BD0; // type:func +EnBili_UpdateFloating = 0x808C0CF0; // type:func +EnBili_FloatIdle = 0x808C0DD8; // type:func +EnBili_SpawnedFlyApart = 0x808C0EC4; // type:func +EnBili_DischargeLightning = 0x808C0F1C; // type:func +EnBili_Climb = 0x808C1118; // type:func +EnBili_ApproachPlayer = 0x808C11D4; // type:func +EnBili_SetNewHomeHeight = 0x808C1264; // type:func +EnBili_Recoil = 0x808C12E0; // type:func +EnBili_Burnt = 0x808C1344; // type:func +EnBili_Die = 0x808C13B8; // type:func +EnBili_Stunned = 0x808C15E0; // type:func +EnBili_Frozen = 0x808C1640; // type:func +EnBili_UpdateDamage = 0x808C16D0; // type:func +EnBili_Update = 0x808C189C; // type:func +EnBili_PulseLimb3 = 0x808C1A70; // type:func +EnBili_PulseLimb2 = 0x808C1C88; // type:func +EnBili_PulseLimb4 = 0x808C1EA8; // type:func +EnBili_OverrideLimbDraw = 0x808C2010; // type:func +EnBili_Draw = 0x808C2100; // type:func +EnTp_SetupAction = 0x808C27C0; // type:func +EnTp_Init = 0x808C27CC; // type:func +EnTp_Destroy = 0x808C2A44; // type:func +EnTp_Tail_SetupFollowHead = 0x808C2A70; // type:func +EnTp_Tail_FollowHead = 0x808C2A9C; // type:func +EnTp_Head_SetupApproachPlayer = 0x808C2C78; // type:func +EnTp_Head_ApproachPlayer = 0x808C2CAC; // type:func +EnTp_SetupDie = 0x808C2E48; // type:func +EnTp_Die = 0x808C2EC0; // type:func +EnTp_Fragment_SetupFade = 0x808C31F0; // type:func +EnTp_Fragment_Fade = 0x808C32F4; // type:func +EnTp_Head_SetupTakeOff = 0x808C3340; // type:func +EnTp_Head_TakeOff = 0x808C339C; // type:func +EnTp_Head_SetupWait = 0x808C3584; // type:func +EnTp_Head_Wait = 0x808C35D0; // type:func +EnTp_Head_SetupBurrowReturnHome = 0x808C38DC; // type:func +EnTp_Head_BurrowReturnHome = 0x808C390C; // type:func +EnTp_UpdateDamage = 0x808C3BDC; // type:func +EnTp_Update = 0x808C3E34; // type:func +EnTp_Draw = 0x808C41A0; // type:func +EnSt_SetupAction = 0x808C4630; // type:func +EnSt_SpawnDust = 0x808C463C; // type:func +EnSt_SpawnBlastEffect = 0x808C485C; // type:func +EnSt_SpawnDeadEffect = 0x808C48E4; // type:func +EnSt_CreateBlureEffect = 0x808C4A20; // type:func +EnSt_CheckCeilingPos = 0x808C4B1C; // type:func +EnSt_AddBlurVertex = 0x808C4BEC; // type:func +EnSt_AddBlurSpace = 0x808C4CF4; // type:func +EnSt_SetWaitingAnimation = 0x808C4D20; // type:func +EnSt_SetReturnToCeilingAnimation = 0x808C4D50; // type:func +EnSt_SetLandAnimation = 0x808C4D90; // type:func +EnSt_SetDropAnimAndVel = 0x808C4DEC; // type:func +EnSt_InitColliders = 0x808C4E4C; // type:func +EnSt_CheckBodyStickHit = 0x808C4F8C; // type:func +EnSt_SetBodyCylinderAC = 0x808C5000; // type:func +EnSt_SetLegsCylinderAC = 0x808C5044; // type:func +EnSt_SetCylinderOC = 0x808C50FC; // type:func +EnSt_UpdateCylinders = 0x808C52D4; // type:func +EnSt_CheckHitPlayer = 0x808C5398; // type:func +EnSt_CheckHitFrontside = 0x808C5484; // type:func +EnSt_CheckHitBackside = 0x808C54C4; // type:func +EnSt_CheckColliders = 0x808C56B4; // type:func +EnSt_SetColliderScale = 0x808C573C; // type:func +EnSt_SetTeethColor = 0x808C58A8; // type:func +EnSt_DecrStunTimer = 0x808C59D8; // type:func +EnSt_UpdateYaw = 0x808C59F8; // type:func +EnSt_IsDoneBouncing = 0x808C5C98; // type:func +EnSt_Bob = 0x808C5D60; // type:func +EnSt_IsCloseToPlayer = 0x808C5DCC; // type:func +EnSt_IsCloseToInitialPos = 0x808C5E74; // type:func +EnSt_IsCloseToGround = 0x808C5EAC; // type:func +EnSt_Sway = 0x808C5EEC; // type:func +EnSt_Init = 0x808C60BC; // type:func +EnSt_Destroy = 0x808C61E0; // type:func +EnSt_WaitOnCeiling = 0x808C6260; // type:func +EnSt_WaitOnGround = 0x808C62BC; // type:func +EnSt_LandOnGround = 0x808C63B4; // type:func +EnSt_MoveToGround = 0x808C64B8; // type:func +EnSt_ReturnToCeiling = 0x808C65B0; // type:func +EnSt_BounceAround = 0x808C6684; // type:func +EnSt_FinishBouncing = 0x808C6758; // type:func +EnSt_Die = 0x808C68CC; // type:func +EnSt_StartOnCeilingOrGround = 0x808C6944; // type:func +EnSt_Update = 0x808C69C8; // type:func +EnSt_OverrideLimbDraw = 0x808C6B48; // type:func +EnSt_PostLimbDraw = 0x808C6C28; // type:func +EnSt_Draw = 0x808C6C64; // type:func +EnBw_SetupAction = 0x808C72A0; // type:func +EnBw_Init = 0x808C72AC; // type:func +EnBw_Destroy = 0x808C740C; // type:func +func_809CE884 = 0x808C744C; // type:func +func_809CE9A8 = 0x808C7570; // type:func +func_809CEA24 = 0x808C75EC; // type:func +func_809CF72C = 0x808C82F4; // type:func +func_809CF7AC = 0x808C8374; // type:func +func_809CF8F0 = 0x808C84B8; // type:func +func_809CF984 = 0x808C854C; // type:func +func_809CFBA8 = 0x808C8774; // type:func +func_809CFC4C = 0x808C8818; // type:func +func_809CFF10 = 0x808C8ADC; // type:func +func_809CFF98 = 0x808C8B64; // type:func +func_809D00F4 = 0x808C8CC0; // type:func +func_809D014C = 0x808C8D18; // type:func +func_809D01CC = 0x808C8D98; // type:func +func_809D0268 = 0x808C8E34; // type:func +func_809D03CC = 0x808C8F98; // type:func +func_809D0424 = 0x808C8FF0; // type:func +func_809D0584 = 0x808C9150; // type:func +EnBw_Update = 0x808C945C; // type:func +EnBw_OverrideLimbDraw = 0x808C98EC; // type:func +EnBw_Draw = 0x808C9B04; // type:func +EnEiyer_Init = 0x808CA630; // type:func +EnEiyer_Destroy = 0x808CA810; // type:func +EnEiyer_RotateAroundHome = 0x808CA83C; // type:func +EnEiyer_SetupAppearFromGround = 0x808CA8AC; // type:func +EnEiyer_SetupUnderground = 0x808CA9EC; // type:func +EnEiyer_SetupInactive = 0x808CAA4C; // type:func +EnEiyer_SetupAmbush = 0x808CAA78; // type:func +EnEiyer_SetupGlide = 0x808CAB58; // type:func +EnEiyer_SetupStartAttack = 0x808CABD4; // type:func +EnEiyer_SetupDiveAttack = 0x808CABE8; // type:func +EnEiyer_SetupLand = 0x808CAC30; // type:func +EnEiyer_SetupHurt = 0x808CACA8; // type:func +EnEiyer_SetupDie = 0x808CAD58; // type:func +EnEiyer_SetupDead = 0x808CAE18; // type:func +EnEiyer_SetupStunned = 0x808CAE44; // type:func +EnEiyer_AppearFromGround = 0x808CAF08; // type:func +EnEiyer_CheckPlayerCollision = 0x808CAF58; // type:func +EnEiyer_CircleUnderground = 0x808CAF88; // type:func +EnEiyer_WanderUnderground = 0x808CB004; // type:func +EnEiyer_Inactive = 0x808CB138; // type:func +EnEiyer_Ambush = 0x808CB1CC; // type:func +EnEiyer_Glide = 0x808CB324; // type:func +EnEiyer_StartAttack = 0x808CB540; // type:func +EnEiyer_DiveAttack = 0x808CB63C; // type:func +EnEiyer_Land = 0x808CB6C8; // type:func +EnEiyer_Hurt = 0x808CB7BC; // type:func +EnEiyer_Die = 0x808CB8F4; // type:func +EnEiyer_Dead = 0x808CB9A8; // type:func +EnEiyer_Stunned = 0x808CBA28; // type:func +EnEiyer_UpdateDamage = 0x808CBAE0; // type:func +EnEiyer_Update = 0x808CBC28; // type:func +EnEiyer_OverrideLimbDraw = 0x808CBE4C; // type:func +EnEiyer_Draw = 0x808CBEA0; // type:func +EnRiverSound_Init = 0x808CC290; // type:func +EnRiverSound_Destroy = 0x808CC360; // type:func +EnRiverSound_FindClosestPointOnLineSegment = 0x808CC3B8; // type:func +EnRiverSound_GetSfxPos = 0x808CC524; // type:func +EnRiverSound_Update = 0x808CC820; // type:func +EnRiverSound_Draw = 0x808CC9F0; // type:func +func_80A6B250 = 0x808CCC20; // type:func +func_80A6B30C = 0x808CCCDC; // type:func +EnHorseNormal_Init = 0x808CCDA4; // type:func +EnHorseNormal_Destroy = 0x808CD294; // type:func +func_80A6B91C = 0x808CD2F4; // type:func +EnHorseNormal_FollowPath = 0x808CD3AC; // type:func +EnHorseNormal_NextAnimation = 0x808CD588; // type:func +EnHorseNormal_CycleAnimations = 0x808CD5DC; // type:func +func_80A6BC48 = 0x808CD624; // type:func +func_80A6BCEC = 0x808CD6CC; // type:func +func_80A6BD7C = 0x808CD75C; // type:func +EnHorseNormal_Wander = 0x808CD850; // type:func +func_80A6C4CC = 0x808CDEB4; // type:func +EnHorseNormal_Wait = 0x808CDF5C; // type:func +func_80A6C6B0 = 0x808CE09C; // type:func +EnHorseNormal_WaitClone = 0x808CE150; // type:func +func_80A6C8E0 = 0x808CE2D4; // type:func +EnHorseNormal_Update = 0x808CE398; // type:func +EnHorseNormal_PostDraw = 0x808CE4F4; // type:func +func_80A6CC88 = 0x808CE680; // type:func +EnHorseNormal_Draw = 0x808CE868; // type:func +EnOssan_SetupAction = 0x808CF240; // type:func +ShopItemDisp_Default = 0x808CF24C; // type:func +ShopItemDisp_SpookyMask = 0x808CF264; // type:func +ShopItemDisp_SkullMask = 0x808CF298; // type:func +ShopItemDisp_BunnyHood = 0x808CF2CC; // type:func +ShopItemDisp_ZoraMask = 0x808CF300; // type:func +ShopItemDisp_GoronMask = 0x808CF334; // type:func +ShopItemDisp_GerudoMask = 0x808CF368; // type:func +EnOssan_SpawnItemsOnShelves = 0x808CF39C; // type:func +EnOssan_UpdateShopOfferings = 0x808CF4F0; // type:func +EnOssan_TalkDefaultShopkeeper = 0x808CF65C; // type:func +EnOssan_TalkKakarikoPotionShopkeeper = 0x808CF67C; // type:func +EnOssan_TalkMarketPotionShopkeeper = 0x808CF6C0; // type:func +EnOssan_TalkKokiriShopkeeper = 0x808CF6E0; // type:func +EnOssan_TalkBazaarShopkeeper = 0x808CF700; // type:func +EnOssan_TalkBombchuShopkeeper = 0x808CF744; // type:func +EnOssan_TalkZoraShopkeeper = 0x808CF764; // type:func +EnOssan_TalkGoronShopkeeper = 0x808CF7BC; // type:func +EnOssan_TalkHappyMaskShopkeeper = 0x808CF890; // type:func +EnOssan_UpdateCameraDirection = 0x808CF91C; // type:func +EnOssan_TryGetObjBankIndices = 0x808CF980; // type:func +EnOssan_Init = 0x808CFA44; // type:func +EnOssan_Destroy = 0x808CFC10; // type:func +EnOssan_UpdateCursorPos = 0x808CFC50; // type:func +EnOssan_EndInteraction = 0x808CFCB4; // type:func +EnOssan_TestEndInteraction = 0x808CFD78; // type:func +EnOssan_TestCancelOption = 0x808CFDC0; // type:func +EnOssan_SetStateStartShopping = 0x808CFE24; // type:func +EnOssan_StartShopping = 0x808CFEA8; // type:func +EnOssan_ChooseTalkToOwner = 0x808CFF80; // type:func +EnOssan_SetLookToShopkeeperFromShelf = 0x808CFFE0; // type:func +EnOssan_State_Idle = 0x808D0014; // type:func +EnOssan_UpdateJoystickInputState = 0x808D00C4; // type:func +EnOssan_SetCursorIndexFromNeutral = 0x808D0210; // type:func +EnOssan_CursorRight = 0x808D0348; // type:func +EnOssan_CursorLeft = 0x808D03D4; // type:func +EnOssan_TryPaybackMask = 0x808D043C; // type:func +EnOssan_State_StartConversation = 0x808D0578; // type:func +EnOssan_FacingShopkeeperDialogResult = 0x808D0720; // type:func +EnOssan_State_FacingShopkeeper = 0x808D078C; // type:func +EnOssan_State_TalkingToShopkeeper = 0x808D08A4; // type:func +EnOssan_State_LookToLeftShelf = 0x808D08F8; // type:func +EnOssan_State_LookToRightShelf = 0x808D09E4; // type:func +EnOssan_CursorUpDown = 0x808D0AD0; // type:func +EnOssan_HasPlayerSelectedItem = 0x808D0CE4; // type:func +EnOssan_State_BrowseLeftShelf = 0x808D0E80; // type:func +EnOssan_State_BrowseRightShelf = 0x808D1040; // type:func +EnOssan_State_LookFromShelfToShopkeeper = 0x808D1200; // type:func +EnOssan_State_DisplayOnlyBombDialog = 0x808D12BC; // type:func +EnOssan_GiveItemWithFanfare = 0x808D138C; // type:func +EnOssan_SetStateCantGetItem = 0x808D1458; // type:func +EnOssan_SetStateQuickBuyDialog = 0x808D148C; // type:func +EnOssan_HandleCanBuyItem = 0x808D14C0; // type:func +EnOssan_HandleCanBuyLonLonMilk = 0x808D1668; // type:func +EnOssan_HandleCanBuyWeirdEgg = 0x808D1774; // type:func +EnOssan_HandleCanBuyBombs = 0x808D18AC; // type:func +EnOssan_BuyGoronCityBombs = 0x808D19B0; // type:func +EnOssan_State_ItemSelected = 0x808D1A54; // type:func +EnOssan_State_SelectMilkBottle = 0x808D1B28; // type:func +EnOssan_State_SelectWeirdEgg = 0x808D1BFC; // type:func +EnOssan_State_SelectUnimplementedItem = 0x808D1CD0; // type:func +EnOssan_State_SelectBombs = 0x808D1D60; // type:func +EnOssan_State_SelectMaskItem = 0x808D1E58; // type:func +EnOssan_State_CantGetItem = 0x808D2034; // type:func +EnOssan_State_QuickBuyDialog = 0x808D20B0; // type:func +EnOssan_State_GiveItemWithFanfare = 0x808D2158; // type:func +EnOssan_State_ItemPurchased = 0x808D21C8; // type:func +EnOssan_State_ContinueShoppingPrompt = 0x808D230C; // type:func +EnOssan_State_WaitForDisplayOnlyBombDialog = 0x808D24EC; // type:func +EnOssan_State_21 = 0x808D2554; // type:func +EnOssan_State_22 = 0x808D25C8; // type:func +EnOssan_State_GiveLonLonMilk = 0x808D261C; // type:func +EnOssan_State_LendMaskOfTruth = 0x808D2670; // type:func +EnOssan_SetStateGiveDiscountDialog = 0x808D26E0; // type:func +EnOssan_State_GiveDiscountDialog = 0x808D270C; // type:func +EnOssan_PositionSelectedItem = 0x808D27A0; // type:func +EnOssan_ResetItemPosition = 0x808D2888; // type:func +EnOssan_TakeItemOffShelf = 0x808D28AC; // type:func +EnOssan_ReturnItemToShelf = 0x808D2948; // type:func +EnOssan_UpdateItemSelectedProperty = 0x808D29D4; // type:func +EnOssan_UpdateCursorAnim = 0x808D2B10; // type:func +EnOssan_UpdateStickDirectionPromptAnim = 0x808D2BDC; // type:func +EnOssan_WaitForBlink = 0x808D2D8C; // type:func +EnOssan_Blink = 0x808D2DC0; // type:func +EnOssan_AreShopkeeperObjectsLoaded = 0x808D2E60; // type:func +EnOssan_InitBazaarShopkeeper = 0x808D2EFC; // type:func +EnOssan_InitKokiriShopkeeper = 0x808D2F5C; // type:func +EnOssan_InitGoronShopkeeper = 0x808D3074; // type:func +EnOssan_InitZoraShopkeeper = 0x808D3150; // type:func +EnOssan_InitPotionShopkeeper = 0x808D322C; // type:func +EnOssan_InitHappyMaskShopkeeper = 0x808D328C; // type:func +EnOssan_InitBombchuShopkeeper = 0x808D32EC; // type:func +EnOssan_SetupHelloDialog = 0x808D334C; // type:func +EnOssan_InitActionFunc = 0x808D34B4; // type:func +EnOssan_Obj3ToSeg6 = 0x808D376C; // type:func +EnOssan_MainActionFunc = 0x808D37A4; // type:func +EnOssan_Update = 0x808D38C0; // type:func +EnOssan_OverrideLimbDrawDefaultShopkeeper = 0x808D38EC; // type:func +EnOssan_DrawCursor = 0x808D3924; // type:func +EnOssan_DrawTextRec = 0x808D3B84; // type:func +EnOssan_DrawStickDirectionPrompts = 0x808D3D20; // type:func +EnOssan_DrawBazaarShopkeeper = 0x808D40C8; // type:func +EnOssan_OverrideLimbDrawKokiriShopkeeper = 0x808D41BC; // type:func +EnOssan_EmptyDList = 0x808D42B4; // type:func +EnOssan_SetEnvColor = 0x808D42D8; // type:func +EnOssan_DrawKokiriShopkeeper = 0x808D4344; // type:func +EnOssan_DrawGoronShopkeeper = 0x808D44A4; // type:func +EnOssan_OverrideLimbDrawZoraShopkeeper = 0x808D45D8; // type:func +EnOssan_DrawZoraShopkeeper = 0x808D4610; // type:func +EnOssan_DrawPotionShopkeeper = 0x808D4754; // type:func +EnOssan_DrawHappyMaskShopkeeper = 0x808D4840; // type:func +EnOssan_DrawBombchuShopkeeper = 0x808D492C; // type:func +BgTreemouth_SetupAction = 0x808D5820; // type:func +BgTreemouth_Init = 0x808D582C; // type:func +BgTreemouth_Destroy = 0x808D5954; // type:func +func_808BC65C = 0x808D5988; // type:func +func_808BC6F8 = 0x808D5A24; // type:func +func_808BC80C = 0x808D5B38; // type:func +func_808BC864 = 0x808D5B90; // type:func +func_808BC8B8 = 0x808D5BE4; // type:func +func_808BC9EC = 0x808D5D18; // type:func +func_808BCAF0 = 0x808D5E20; // type:func +BgTreemouth_DoNothing = 0x808D5EBC; // type:func +BgTreemouth_Update = 0x808D5ECC; // type:func +BgTreemouth_Draw = 0x808D5F4C; // type:func +BgDodoago_SetupAction = 0x808D6E80; // type:func +BgDodoago_SpawnSparkles = 0x808D6E8C; // type:func +BgDodoago_Init = 0x808D6FAC; // type:func +BgDodoago_Destroy = 0x808D7110; // type:func +BgDodoago_WaitExplosives = 0x808D717C; // type:func +BgDodoago_OpenJaw = 0x808D7440; // type:func +BgDodoago_DoNothing = 0x808D7704; // type:func +BgDodoago_LightOneEye = 0x808D7714; // type:func +BgDodoago_Update = 0x808D7778; // type:func +BgDodoago_Draw = 0x808D78D0; // type:func +BgHidanDalm_Init = 0x808D7C30; // type:func +BgHidanDalm_Destroy = 0x808D7D18; // type:func +BgHidanDalm_Wait = 0x808D7D60; // type:func +BgHidanDalm_Shrink = 0x808D7EE4; // type:func +BgHidanDalm_Update = 0x808D8094; // type:func +BgHidanDalm_UpdateCollider = 0x808D80F4; // type:func +BgHidanDalm_Draw = 0x808D8220; // type:func +BgHidanHrock_Init = 0x808D8480; // type:func +BgHidanHrock_Destroy = 0x808D87B0; // type:func +func_808894A4 = 0x808D87F8; // type:func +func_808894B0 = 0x808D8808; // type:func +func_8088960C = 0x808D8964; // type:func +func_808896B8 = 0x808D8A10; // type:func +BgHidanHrock_Update = 0x808D8AF0; // type:func +BgHidanHrock_Draw = 0x808D8B14; // type:func +func_80A68660 = 0x808D8CB0; // type:func +func_80A686A8 = 0x808D8CFC; // type:func +func_80A68870 = 0x808D8EC4; // type:func +EnHorseGanon_Init = 0x808D8F80; // type:func +EnHorseGanon_Destroy = 0x808D90CC; // type:func +func_80A68AC4 = 0x808D911C; // type:func +func_80A68AF0 = 0x808D914C; // type:func +func_80A68B20 = 0x808D9180; // type:func +func_80A68DB0 = 0x808D9410; // type:func +func_80A68E14 = 0x808D9474; // type:func +EnHorseGanon_Update = 0x808D9538; // type:func +EnHorseGanon_PostDraw = 0x808D960C; // type:func +EnHorseGanon_Draw = 0x808D9798; // type:func +BgHidanRock_Init = 0x808D9A30; // type:func +BgHidanRock_Destroy = 0x808D9BAC; // type:func +func_8088B24C = 0x808D9C00; // type:func +func_8088B268 = 0x808D9C20; // type:func +func_8088B5F4 = 0x808D9FB0; // type:func +func_8088B634 = 0x808D9FF0; // type:func +func_8088B69C = 0x808DA05C; // type:func +func_8088B79C = 0x808DA15C; // type:func +func_8088B90C = 0x808DA2CC; // type:func +func_8088B954 = 0x808DA314; // type:func +func_8088B990 = 0x808DA350; // type:func +BgHidanRock_Update = 0x808DA53C; // type:func +func_8088BC40 = 0x808DA60C; // type:func +BgHidanRock_Draw = 0x808DA81C; // type:func +BgHidanRsekizou_Init = 0x808DAB30; // type:func +BgHidanRsekizou_Destroy = 0x808DAC34; // type:func +BgHidanRsekizou_Update = 0x808DAC7C; // type:func +BgHidanRsekizou_DrawFireball = 0x808DB040; // type:func +BgHidanRsekizou_Draw = 0x808DB358; // type:func +func_8088CEC0 = 0x808DB710; // type:func +BgHidanSekizou_Init = 0x808DBACC; // type:func +BgHidanSekizou_Destroy = 0x808DBC40; // type:func +func_8088D434 = 0x808DBC88; // type:func +func_8088D720 = 0x808DBF74; // type:func +func_8088D750 = 0x808DBFA4; // type:func +BgHidanSekizou_Update = 0x808DC110; // type:func +func_8088D9F4 = 0x808DC24C; // type:func +func_8088DC50 = 0x808DC494; // type:func +func_8088DE08 = 0x808DC64C; // type:func +BgHidanSekizou_Draw = 0x808DC72C; // type:func +BgHidanSima_Init = 0x808DCB60; // type:func +BgHidanSima_Destroy = 0x808DCC64; // type:func +func_8088E518 = 0x808DCCAC; // type:func +func_8088E5D0 = 0x808DCD68; // type:func +func_8088E6D0 = 0x808DCE6C; // type:func +func_8088E760 = 0x808DCF04; // type:func +func_8088E7A8 = 0x808DCF4C; // type:func +func_8088E90C = 0x808DD0B0; // type:func +BgHidanSima_Update = 0x808DD210; // type:func +func_8088EB54 = 0x808DD300; // type:func +BgHidanSima_Draw = 0x808DD778; // type:func +BgHidanSyoku_Init = 0x808DDA60; // type:func +BgHidanSyoku_Destroy = 0x808DDAEC; // type:func +func_8088F47C = 0x808DDB20; // type:func +func_8088F4B8 = 0x808DDB5C; // type:func +func_8088F514 = 0x808DDBBC; // type:func +func_8088F5A0 = 0x808DDC48; // type:func +func_8088F62C = 0x808DDCD4; // type:func +BgHidanSyoku_Update = 0x808DDD30; // type:func +BgHidanSyoku_Draw = 0x808DDDD8; // type:func +EnXc_InitCollider = 0x808DDEC0; // type:func +EnXc_UpdateCollider = 0x808DDF0C; // type:func +EnXc_Destroy = 0x808DDF50; // type:func +EnXc_CalculateHeadTurn = 0x808DDF7C; // type:func +EnXc_SetEyePattern = 0x808DE004; // type:func +EnXc_SpawnNut = 0x808DE08C; // type:func +EnXc_BgCheck = 0x808DE154; // type:func +EnXc_AnimIsFinished = 0x808DE19C; // type:func +EnXc_GetCue = 0x808DE1C0; // type:func +EnXc_CheckForCue = 0x808DE1E4; // type:func +EnXc_CheckForNoCue = 0x808DE230; // type:func +func_80B3C588 = 0x808DE27C; // type:func +func_80B3C620 = 0x808DE314; // type:func +EnXc_ChangeAnimation = 0x808DE3F4; // type:func +EnXc_CheckAndSetAction = 0x808DE4B0; // type:func +func_80B3C7D4 = 0x808DE4C8; // type:func +func_80B3C8CC = 0x808DE4F4; // type:func +func_80B3C924 = 0x808DE550; // type:func +func_80B3C964 = 0x808DE590; // type:func +func_80B3C9DC = 0x808DE608; // type:func +func_80B3C9EC = 0x808DE61C; // type:func +func_80B3CA38 = 0x808DE668; // type:func +EnXc_MinuetCS = 0x808DE6BC; // type:func +func_80B3CB58 = 0x808DE794; // type:func +EnXc_BoleroCS = 0x808DE7E8; // type:func +EnXc_SetupSerenadeAction = 0x808DE948; // type:func +EnXc_SerenadeCS = 0x808DE9A0; // type:func +EnXc_DoNothing = 0x808DEA68; // type:func +EnXc_SetWalkingSFX = 0x808DEA78; // type:func +EnXc_SetNutThrowSFX = 0x808DEAF8; // type:func +EnXc_SetLandingSFX = 0x808DEB84; // type:func +EnXc_SetColossusAppearSFX = 0x808DEC04; // type:func +func_80B3D118 = 0x808DED10; // type:func +EnXc_SetColossusWindSFX = 0x808DED54; // type:func +EnXc_SpawnFlame = 0x808DEE5C; // type:func +EnXc_SetupFlamePos = 0x808DEF00; // type:func +EnXc_DestroyFlame = 0x808DEF7C; // type:func +EnXc_InitFlame = 0x808DEFBC; // type:func +func_80B3D48C = 0x808DF058; // type:func +EnXc_GetCurrentHarpAnim = 0x808DF0A8; // type:func +EnXc_CalcXZAccel = 0x808DF13C; // type:func +func_80B3D644 = 0x808DF214; // type:func +EnXc_CalcXZSpeed = 0x808DF234; // type:func +func_80B3D6F0 = 0x808DF2C0; // type:func +func_80B3D710 = 0x808DF2E0; // type:func +func_80B3D730 = 0x808DF300; // type:func +func_80B3D750 = 0x808DF320; // type:func +EnXc_SetupFallFromSkyAction = 0x808DF36C; // type:func +func_80B3D8A4 = 0x808DF47C; // type:func +EnXc_SetupWalkAction = 0x808DF56C; // type:func +EnXc_SetupHaltAction = 0x808DF5DC; // type:func +EnXc_SetupStoppedAction = 0x808DF688; // type:func +func_80B3DAF0 = 0x808DF6D0; // type:func +EnXc_SetupInitialHarpAction = 0x808DF790; // type:func +EnXc_SetupPlayingHarpAction = 0x808DF808; // type:func +func_80B3DCA8 = 0x808DF890; // type:func +EnXc_SetupHarpPutawayAction = 0x808DF924; // type:func +func_80B3DE00 = 0x808DF9F4; // type:func +func_80B3DE78 = 0x808DFA6C; // type:func +EnXc_SetupReverseAccel = 0x808DFAE8; // type:func +EnXc_SetupReverseWalkAction = 0x808DFB98; // type:func +EnXc_SetupReverseHaltAction = 0x808DFC08; // type:func +EnXc_SetupNutThrow = 0x808DFCB4; // type:func +func_80B3E164 = 0x808DFD5C; // type:func +EnXc_SetupDisappear = 0x808DFDB0; // type:func +EnXc_ActionFunc0 = 0x808DFE20; // type:func +EnXc_ActionFunc1 = 0x808DFE60; // type:func +EnXc_GracefulFall = 0x808DFEA0; // type:func +EnXc_Accelerate = 0x808DFF1C; // type:func +EnXc_Walk = 0x808DFF7C; // type:func +EnXc_Stopped = 0x808DFFDC; // type:func +EnXc_ActionFunc6 = 0x808E003C; // type:func +EnXc_ActionFunc7 = 0x808E0084; // type:func +EnXc_ActionFunc8 = 0x808E00D0; // type:func +EnXc_ActionFunc9 = 0x808E0120; // type:func +EnXc_ActionFunc10 = 0x808E0168; // type:func +EnXc_ActionFunc11 = 0x808E01B0; // type:func +EnXc_ActionFunc12 = 0x808E01FC; // type:func +EnXc_ActionFunc13 = 0x808E0248; // type:func +EnXc_ReverseAccelerate = 0x808E02A4; // type:func +EnXc_ActionFunc15 = 0x808E0310; // type:func +EnXc_HaltAndWaitToThrowNut = 0x808E037C; // type:func +EnXc_ThrowNut = 0x808E03E8; // type:func +EnXc_Delete = 0x808E0450; // type:func +EnXc_Fade = 0x808E04AC; // type:func +func_80B3E87C = 0x808E04CC; // type:func +EnXc_PullingOutHarpOverrideLimbDraw = 0x808E04FC; // type:func +EnXc_HarpOverrideLimbDraw = 0x808E0538; // type:func +EnXc_DrawPullingOutHarp = 0x808E0560; // type:func +EnXc_DrawHarp = 0x808E069C; // type:func +func_80B3EBF0 = 0x808E07D8; // type:func +func_80B3EC00 = 0x808E07EC; // type:func +func_80B3EC0C = 0x808E07FC; // type:func +func_80B3EC90 = 0x808E0880; // type:func +func_80B3ECD8 = 0x808E08C8; // type:func +EnXc_ActionFunc20 = 0x808E0938; // type:func +EnXc_ActionFunc21 = 0x808E095C; // type:func +EnXc_ActionFunc22 = 0x808E097C; // type:func +EnXc_ActionFunc23 = 0x808E09C4; // type:func +EnXc_ActionFunc24 = 0x808E0A24; // type:func +EnXc_ActionFunc25 = 0x808E0A34; // type:func +EnXc_ActionFunc26 = 0x808E0A44; // type:func +EnXc_ActionFunc27 = 0x808E0A54; // type:func +EnXc_ActionFunc28 = 0x808E0A64; // type:func +func_80B3EE64 = 0x808E0A74; // type:func +func_80B3EE74 = 0x808E0A88; // type:func +func_80B3EEA4 = 0x808E0ABC; // type:func +func_80B3EEC8 = 0x808E0AE0; // type:func +func_80B3EEEC = 0x808E0B04; // type:func +func_80B3EF10 = 0x808E0B28; // type:func +func_80B3EF34 = 0x808E0B4C; // type:func +func_80B3EF58 = 0x808E0B70; // type:func +func_80B3EF80 = 0x808E0B98; // type:func +func_80B3EFA4 = 0x808E0BBC; // type:func +func_80B3EFC8 = 0x808E0BE0; // type:func +func_80B3EFEC = 0x808E0C04; // type:func +func_80B3F010 = 0x808E0C28; // type:func +func_80B3F0B8 = 0x808E0CD4; // type:func +func_80B3F0DC = 0x808E0CF8; // type:func +func_80B3F100 = 0x808E0D1C; // type:func +EnXc_Serenade = 0x808E0D40; // type:func +EnXc_ActionFunc30 = 0x808E0D60; // type:func +EnXc_ActionFunc31 = 0x808E0D8C; // type:func +EnXc_ActionFunc32 = 0x808E0DD0; // type:func +EnXc_ActionFunc33 = 0x808E0DFC; // type:func +EnXc_ActionFunc34 = 0x808E0E28; // type:func +EnXc_ActionFunc35 = 0x808E0E54; // type:func +EnXc_ActionFunc36 = 0x808E0E80; // type:func +EnXc_ActionFunc37 = 0x808E0EAC; // type:func +EnXc_ActionFunc38 = 0x808E0ED8; // type:func +EnXc_ActionFunc39 = 0x808E0F04; // type:func +EnXc_ActionFunc40 = 0x808E0F30; // type:func +EnXc_ActionFunc41 = 0x808E0F90; // type:func +EnXc_ActionFunc42 = 0x808E0FBC; // type:func +EnXc_ActionFunc43 = 0x808E0FE8; // type:func +EnXc_ActionFunc44 = 0x808E1014; // type:func +func_80B3F3C8 = 0x808E1024; // type:func +func_80B3F3D8 = 0x808E1038; // type:func +EnXc_PlayDiveSFX = 0x808E1058; // type:func +EnXc_LakeHyliaDive = 0x808E10AC; // type:func +func_80B3F534 = 0x808E1198; // type:func +func_80B3F59C = 0x808E1200; // type:func +func_80B3F620 = 0x808E1284; // type:func +func_80B3F644 = 0x808E12A8; // type:func +func_80B3F668 = 0x808E12CC; // type:func +func_80B3F6DC = 0x808E1340; // type:func +EnXc_SetupKneelAction = 0x808E1364; // type:func +func_80B3F754 = 0x808E13BC; // type:func +func_80B3F7BC = 0x808E142C; // type:func +EnXc_ActionFunc45 = 0x808E1468; // type:func +EnXc_ActionFunc46 = 0x808E1494; // type:func +EnXc_ActionFunc47 = 0x808E14C0; // type:func +EnXc_ActionFunc48 = 0x808E1518; // type:func +EnXc_ActionFunc49 = 0x808E1544; // type:func +EnXc_Kneel = 0x808E15A8; // type:func +EnXc_ActionFunc51 = 0x808E160C; // type:func +EnXc_ActionFunc52 = 0x808E1670; // type:func +func_80B3FA08 = 0x808E1690; // type:func +func_80B3FA2C = 0x808E16B8; // type:func +EnXc_PlayTriforceSFX = 0x808E16D8; // type:func +func_80B3FAE0 = 0x808E1770; // type:func +EnXc_CalcTriforce = 0x808E17B8; // type:func +func_80B3FF0C = 0x808E1BB0; // type:func +EnXc_SetupShowTriforceAction = 0x808E1C58; // type:func +EnXc_SetupShowTriforceIdleAction = 0x808E1CE8; // type:func +func_80B400AC = 0x808E1D54; // type:func +EnXc_ActionFunc53 = 0x808E1D90; // type:func +EnXc_ActionFunc54 = 0x808E1DB0; // type:func +EnXc_ShowTriforce = 0x808E1DF8; // type:func +EnXc_ShowTriforceIdle = 0x808E1E60; // type:func +EnXc_TriforceOverrideLimbDraw = 0x808E1EBC; // type:func +EnXc_TriforcePostLimbDraw = 0x808E1EE4; // type:func +EnXc_DrawTriforce = 0x808E1F60; // type:func +func_80B40590 = 0x808E21F4; // type:func +EnXc_SetThrownAroundSFX = 0x808E2210; // type:func +EnXc_PlayLinkScreamSFX = 0x808E22D4; // type:func +EnXc_SetCrySFX = 0x808E2308; // type:func +func_80B406F8 = 0x808E2364; // type:func +EnXc_SetupIdleInNocturne = 0x808E237C; // type:func +EnXc_SetupDefenseStance = 0x808E2418; // type:func +EnXc_SetupContortions = 0x808E2490; // type:func +EnXc_SetupFallInNocturne = 0x808E252C; // type:func +EnXc_SetupHittingGroundInNocturne = 0x808E2608; // type:func +func_80B40A78 = 0x808E26A8; // type:func +EnXc_SetupKneelInNocturne = 0x808E2748; // type:func +func_80B40BB4 = 0x808E27E4; // type:func +func_80B40C50 = 0x808E2880; // type:func +func_80B40C74 = 0x808E28A4; // type:func +func_80B40C98 = 0x808E28C8; // type:func +func_80B40CBC = 0x808E28EC; // type:func +func_80B40CE0 = 0x808E2910; // type:func +func_80B40D08 = 0x808E2938; // type:func +func_80B40D2C = 0x808E295C; // type:func +func_80B40D50 = 0x808E2980; // type:func +func_80B40D74 = 0x808E29A4; // type:func +EnXc_SetupReverseHaltInNocturneCS = 0x808E29C8; // type:func +func_80B40E40 = 0x808E2A74; // type:func +func_80B40E64 = 0x808E2A98; // type:func +func_80B40E88 = 0x808E2ABC; // type:func +EnXc_SetupNocturneState = 0x808E2AE0; // type:func +EnXc_InitialNocturneAction = 0x808E2C20; // type:func +EnXc_IdleInNocturne = 0x808E2C40; // type:func +EnXc_DefenseStance = 0x808E2C90; // type:func +EnXc_Contort = 0x808E2CD8; // type:func +EnXc_FallInNocturne = 0x808E2D44; // type:func +EnXc_HitGroundInNocturne = 0x808E2DAC; // type:func +EnXc_ActionFunc63 = 0x808E2DEC; // type:func +EnXc_KneelInNocturneCS = 0x808E2E48; // type:func +EnXc_ActionFunc65 = 0x808E2E90; // type:func +EnXc_ActionFunc66 = 0x808E2ED4; // type:func +EnXc_ActionFunc67 = 0x808E2F00; // type:func +EnXc_ActionFunc68 = 0x808E2F2C; // type:func +EnXc_ActionFunc69 = 0x808E2F58; // type:func +EnXc_ActionFunc70 = 0x808E2F84; // type:func +EnXc_ActionFunc71 = 0x808E2FB0; // type:func +EnXc_ActionFunc72 = 0x808E2FDC; // type:func +EnXc_ReverseAccelInNocturneCS = 0x808E3008; // type:func +EnXc_ReverseWalkInNocturneCS = 0x808E3034; // type:func +EnXc_ReverseHaltInNocturneCS = 0x808E3088; // type:func +EnXc_ThrowNutInNocturneCS = 0x808E30B4; // type:func +EnXc_DeleteInNocturneCS = 0x808E30E0; // type:func +EnXc_KillInNocturneCS = 0x808E310C; // type:func +EnXc_DrawSquintingEyes = 0x808E3130; // type:func +EnXc_InitTempleOfTime = 0x808E320C; // type:func +EnXc_SetupDialogueAction = 0x808E3378; // type:func +func_80B41798 = 0x808E3400; // type:func +EnXc_BlockingPedestalAction = 0x808E344C; // type:func +EnXc_ActionFunc80 = 0x808E34B4; // type:func +EnXc_Update = 0x808E351C; // type:func +EnXc_Init = 0x808E3564; // type:func +EnXc_OverrideLimbDraw = 0x808E36D0; // type:func +EnXc_PostLimbDraw = 0x808E3758; // type:func +EnXc_DrawNothing = 0x808E37E4; // type:func +EnXc_DrawDefault = 0x808E37F4; // type:func +EnXc_Draw = 0x808E38FC; // type:func +BgHidanCurtain_Init = 0x808E4650; // type:func +BgHidanCurtain_Destroy = 0x808E4864; // type:func +BgHidanCurtain_WaitForSwitchOn = 0x808E4890; // type:func +BgHidanCurtain_WaitForCutscene = 0x808E4944; // type:func +BgHidanCurtain_WaitForClear = 0x808E4970; // type:func +BgHidanCurtain_WaitForSwitchOff = 0x808E49B4; // type:func +BgHidanCurtain_TurnOn = 0x808E49F8; // type:func +BgHidanCurtain_TurnOff = 0x808E4A6C; // type:func +BgHidanCurtain_WaitForTimer = 0x808E4B5C; // type:func +BgHidanCurtain_Update = 0x808E4BC0; // type:func +BgHidanCurtain_Draw = 0x808E4E54; // type:func +BgSpot00Hanebasi_Init = 0x808E50F0; // type:func +BgSpot00Hanebasi_Destroy = 0x808E5500; // type:func +BgSpot00Hanebasi_DrawbridgeWait = 0x808E555C; // type:func +BgSpot00Hanebasi_DoNothing = 0x808E568C; // type:func +BgSpot00Hanebasi_DrawbridgeRiseAndFall = 0x808E569C; // type:func +BgSpot00Hanebasi_SetTorchLightInfo = 0x808E57D0; // type:func +BgSpot00Hanebasi_Update = 0x808E5928; // type:func +BgSpot00Hanebasi_DrawTorches = 0x808E5C38; // type:func +BgSpot00Hanebasi_Draw = 0x808E5ED8; // type:func +EnMb_SetupAction = 0x808E6200; // type:func +EnMb_Init = 0x808E620C; // type:func +EnMb_Destroy = 0x808E6570; // type:func +EnMb_FaceWaypoint = 0x808E65C0; // type:func +EnMb_NextWaypoint = 0x808E65F8; // type:func +EnMb_IsPlayerInCorridor = 0x808E66E4; // type:func +EnMb_FindWaypointTowardsPlayer = 0x808E6858; // type:func +EnMb_SetupSpearGuardLookAround = 0x808E69E8; // type:func +EnMb_SetupClubWaitPlayerNear = 0x808E6A50; // type:func +EnMb_SetupSpearPatrolTurnTowardsWaypoint = 0x808E6AB4; // type:func +EnMb_SetupSpearGuardWalk = 0x808E6B2C; // type:func +EnMb_SetupSpearPatrolWalkTowardsWaypoint = 0x808E6BD0; // type:func +EnMb_SetupSpearPrepareAndCharge = 0x808E6C80; // type:func +EnMb_SetupSpearPatrolImmediateCharge = 0x808E6D38; // type:func +EnMb_SetupClubAttack = 0x808E6DA8; // type:func +EnMb_SetupSpearEndChargeQuick = 0x808E6E78; // type:func +EnMb_SetupSpearPatrolEndCharge = 0x808E6ED8; // type:func +EnMb_SetupClubWaitAfterAttack = 0x808E6F5C; // type:func +EnMb_SetupClubDamaged = 0x808E6FD4; // type:func +EnMb_SetupClubDamagedWhileKneeling = 0x808E7034; // type:func +EnMb_SetupClubDead = 0x808E70BC; // type:func +EnMb_SetupStunned = 0x808E7144; // type:func +EnMb_Stunned = 0x808E71E8; // type:func +EnMb_SpearGuardLookAround = 0x808E72F4; // type:func +EnMb_SpearPatrolTurnTowardsWaypoint = 0x808E736C; // type:func +EnMb_SpearEndChargeQuick = 0x808E74D0; // type:func +EnMb_ClubWaitAfterAttack = 0x808E7638; // type:func +EnMb_SpearPatrolEndCharge = 0x808E767C; // type:func +EnMb_SpearGuardPrepareAndCharge = 0x808E7994; // type:func +EnMb_ClubAttack = 0x808E7AFC; // type:func +EnMb_SpearPatrolPrepareAndCharge = 0x808E7E74; // type:func +EnMb_SpearPatrolImmediateCharge = 0x808E81D8; // type:func +EnMb_ClubDamaged = 0x808E8548; // type:func +EnMb_ClubDamagedWhileKneeling = 0x808E85DC; // type:func +EnMb_ClubDead = 0x808E86E8; // type:func +EnMb_SpearGuardWalk = 0x808E89AC; // type:func +EnMb_SpearPatrolWalkTowardsWaypoint = 0x808E8CBC; // type:func +EnMb_ClubWaitPlayerNear = 0x808E8FA8; // type:func +EnMb_SetupSpearDamaged = 0x808E9058; // type:func +EnMb_SpearDamaged = 0x808E9120; // type:func +EnMb_SetupSpearDead = 0x808E9198; // type:func +EnMb_SpearDead = 0x808E9270; // type:func +EnMb_SpearUpdateAttackCollider = 0x808E9488; // type:func +EnMb_ClubUpdateAttackCollider = 0x808E9614; // type:func +EnMb_CheckColliding = 0x808E96AC; // type:func +EnMb_Update = 0x808E9878; // type:func +EnMb_PostLimbDraw = 0x808E9A4C; // type:func +EnMb_Draw = 0x808E9BE8; // type:func +EnBombf_SetupAction = 0x808EA430; // type:func +EnBombf_Init = 0x808EA43C; // type:func +EnBombf_Destroy = 0x808EA618; // type:func +EnBombf_SetupGrowBomb = 0x808EA658; // type:func +EnBombf_GrowBomb = 0x808EA680; // type:func +EnBombf_Move = 0x808EA990; // type:func +EnBombf_WaitForRelease = 0x808EAAB4; // type:func +EnBombf_Explode = 0x808EAB18; // type:func +EnBombf_Update = 0x808EAC6C; // type:func +EnBombf_NewMtxDList = 0x808EB418; // type:func +EnBombf_Draw = 0x808EB4A4; // type:func +BgHidanFirewall_Init = 0x808EB8C0; // type:func +BgHidanFirewall_Destroy = 0x808EB960; // type:func +BgHidanFirewall_CheckProximity = 0x808EB98C; // type:func +BgHidanFirewall_Wait = 0x808EB9FC; // type:func +BgHidanFirewall_Countdown = 0x808EBA44; // type:func +BgHidanFirewall_Erupt = 0x808EBA78; // type:func +BgHidanFirewall_Collide = 0x808EBB08; // type:func +BgHidanFirewall_ColliderFollowPlayer = 0x808EBB70; // type:func +BgHidanFirewall_Update = 0x808EBCD4; // type:func +BgHidanFirewall_Draw = 0x808EBDAC; // type:func +BgDyYoseizo_Init = 0x808EC020; // type:func +BgDyYoseizo_Destroy = 0x808EC124; // type:func +BgDyYoseizo_SpawnEffects = 0x808EC134; // type:func +BgDyYoseizo_Bob = 0x808EC430; // type:func +BgDyYoseizo_CheckMagicAcquired = 0x808EC4F8; // type:func +BgDyYoseizo_ChooseType = 0x808EC5BC; // type:func +BgDyYoseizo_SetupSpinGrow_NoReward = 0x808EC9B8; // type:func +BgDyYoseizo_SpinGrow_NoReward = 0x808ECAB4; // type:func +BgDyYoseizo_CompleteSpinGrow_NoReward = 0x808ECC10; // type:func +BgDyYoseizo_SetupGreetPlayer_NoReward = 0x808ECCC0; // type:func +BgDyYoseizo_GreetPlayer_NoReward = 0x808ECDD8; // type:func +BgDyYoseizo_SetupHealPlayer_NoReward = 0x808ECEB4; // type:func +BgDyYoseizo_HealPlayer_NoReward = 0x808ECFA0; // type:func +BgDyYoseizo_SayFarewell_NoReward = 0x808ED278; // type:func +BgDyYoseizo_SetupSpinShrink = 0x808ED354; // type:func +BgDyYoseizo_SpinShrink = 0x808ED458; // type:func +BgDyYoseizo_Vanish = 0x808ED548; // type:func +BgDyYoseizo_SetupSpinGrow_Reward = 0x808ED5EC; // type:func +BgDyYoseizo_SpinGrowSetupGive_Reward = 0x808ED720; // type:func +BgDyYoseizo_Give_Reward = 0x808EDA4C; // type:func +BgDyYoseizo_Update = 0x808EE09C; // type:func +BgDyYoseizo_OverrideLimbDraw = 0x808EE2C8; // type:func +BgDyYoseizo_Draw = 0x808EE330; // type:func +BgDyYoseizo_SpawnEffect = 0x808EE4B8; // type:func +BgDyYoseizo_UpdateEffects = 0x808EE5C8; // type:func +BgDyYoseizo_DrawEffects = 0x808EE8BC; // type:func +EnZl2_Destroy = 0x808EEE10; // type:func +EnZl2_UpdateEyes = 0x808EEE34; // type:func +func_80B4EA40 = 0x808EEEC4; // type:func +func_80B4EAF4 = 0x808EEF78; // type:func +func_80B4EBB8 = 0x808EF03C; // type:func +func_80B4EC48 = 0x808EF0CC; // type:func +EnZl2_setEyesIndex = 0x808EF16C; // type:func +EnZl2_setEyeIndex2 = 0x808EF18C; // type:func +EnZl2_setMouthIndex = 0x808EF1A4; // type:func +func_80B4ED2C = 0x808EF1BC; // type:func +EnZl2_UpdateSkelAnime = 0x808EF204; // type:func +EnZl2_GetCue = 0x808EF228; // type:func +func_80B4EDB8 = 0x808EF250; // type:func +func_80B4EE38 = 0x808EF2D0; // type:func +func_80B4EF64 = 0x808EF400; // type:func +func_80B4F230 = 0x808EF6D0; // type:func +func_80B4F45C = 0x808EF900; // type:func +EnZl2_PostLimbDraw = 0x808EFFCC; // type:func +func_80B4FCCC = 0x808F0118; // type:func +func_80B4FD00 = 0x808F0150; // type:func +func_80B4FD90 = 0x808F01E0; // type:func +func_80B4FDD4 = 0x808F0224; // type:func +func_80B4FE10 = 0x808F0264; // type:func +func_80B4FE48 = 0x808F029C; // type:func +func_80B4FE6C = 0x808F02C4; // type:func +func_80B4FE90 = 0x808F02EC; // type:func +func_80B4FEB4 = 0x808F0314; // type:func +func_80B4FED8 = 0x808F033C; // type:func +EnZl2_GiveLightArrows = 0x808F0364; // type:func +func_80B4FF84 = 0x808F03F4; // type:func +func_80B4FFF0 = 0x808F0460; // type:func +func_80B5008C = 0x808F0500; // type:func +func_80B500E0 = 0x808F0554; // type:func +func_80B501C4 = 0x808F0638; // type:func +func_80B501E8 = 0x808F065C; // type:func +func_80B50260 = 0x808F06D4; // type:func +func_80B50278 = 0x808F06F0; // type:func +func_80B50304 = 0x808F077C; // type:func +func_80B503DC = 0x808F0854; // type:func +func_80B5042C = 0x808F08A4; // type:func +func_80B50488 = 0x808F0900; // type:func +func_80B504D4 = 0x808F094C; // type:func +func_80B5053C = 0x808F09B0; // type:func +func_80B50580 = 0x808F09F8; // type:func +func_80B505D4 = 0x808F0A4C; // type:func +func_80B50618 = 0x808F0A94; // type:func +func_80B50644 = 0x808F0AC0; // type:func +func_80B50670 = 0x808F0AEC; // type:func +func_80B506C4 = 0x808F0B40; // type:func +func_80B5073C = 0x808F0BBC; // type:func +func_80B50780 = 0x808F0C04; // type:func +func_80B507E8 = 0x808F0C6C; // type:func +func_80B5082C = 0x808F0CB4; // type:func +func_80B50880 = 0x808F0D08; // type:func +func_80B508C8 = 0x808F0D50; // type:func +func_80B50928 = 0x808F0DAC; // type:func +func_80B50970 = 0x808F0DF4; // type:func +func_80B50980 = 0x808F0E08; // type:func +func_80B509A0 = 0x808F0E2C; // type:func +func_80B50A04 = 0x808F0E90; // type:func +func_80B50BBC = 0x808F1034; // type:func +func_80B50BEC = 0x808F106C; // type:func +func_80B50C40 = 0x808F10C8; // type:func +func_80B50CA8 = 0x808F1138; // type:func +func_80B50CFC = 0x808F1194; // type:func +func_80B50D50 = 0x808F11F0; // type:func +func_80B50D94 = 0x808F123C; // type:func +func_80B50DE8 = 0x808F1298; // type:func +func_80B50E3C = 0x808F12F4; // type:func +func_80B50E90 = 0x808F1350; // type:func +func_80B50EE4 = 0x808F13AC; // type:func +func_80B50F38 = 0x808F1408; // type:func +func_80B50F8C = 0x808F1464; // type:func +func_80B50FE8 = 0x808F14C8; // type:func +func_80B51034 = 0x808F151C; // type:func +func_80B51080 = 0x808F1570; // type:func +func_80B510CC = 0x808F15C4; // type:func +func_80B51118 = 0x808F1618; // type:func +func_80B51164 = 0x808F166C; // type:func +func_80B511B0 = 0x808F16C0; // type:func +func_80B511FC = 0x808F1714; // type:func +func_80B51250 = 0x808F1770; // type:func +func_80B512B8 = 0x808F17E0; // type:func +func_80B51310 = 0x808F1840; // type:func +func_80B5135C = 0x808F1890; // type:func +func_80B513A8 = 0x808F18DC; // type:func +func_80B51418 = 0x808F1950; // type:func +func_80B5146C = 0x808F19A4; // type:func +func_80B5149C = 0x808F19D8; // type:func +func_80B514F8 = 0x808F1A38; // type:func +func_80B5154C = 0x808F1A8C; // type:func +func_80B515C4 = 0x808F1B04; // type:func +func_80B515D8 = 0x808F1B1C; // type:func +func_80B51644 = 0x808F1B88; // type:func +func_80B51678 = 0x808F1BBC; // type:func +func_80B516D0 = 0x808F1C14; // type:func +func_80B51704 = 0x808F1C48; // type:func +func_80B5175C = 0x808F1CA0; // type:func +func_80B51790 = 0x808F1CD4; // type:func +func_80B517E0 = 0x808F1D24; // type:func +func_80B51824 = 0x808F1D6C; // type:func +func_80B5187C = 0x808F1DC4; // type:func +func_80B518C0 = 0x808F1E0C; // type:func +func_80B51948 = 0x808F1E94; // type:func +func_80B51A5C = 0x808F1F94; // type:func +func_80B51A8C = 0x808F1FCC; // type:func +func_80B51AE4 = 0x808F202C; // type:func +func_80B51B44 = 0x808F2094; // type:func +func_80B51BA8 = 0x808F2100; // type:func +func_80B51C0C = 0x808F216C; // type:func +func_80B51C64 = 0x808F21CC; // type:func +func_80B51CA8 = 0x808F2218; // type:func +func_80B51D0C = 0x808F2284; // type:func +func_80B51D24 = 0x808F22A0; // type:func +func_80B51DA4 = 0x808F2320; // type:func +func_80B51EA8 = 0x808F2424; // type:func +func_80B51EBC = 0x808F243C; // type:func +func_80B51F38 = 0x808F24BC; // type:func +func_80B51FA8 = 0x808F252C; // type:func +func_80B52068 = 0x808F25D8; // type:func +func_80B52098 = 0x808F2610; // type:func +func_80B52108 = 0x808F2688; // type:func +func_80B52114 = 0x808F2698; // type:func +func_80B521A0 = 0x808F26F8; // type:func +EnZl2_Update = 0x808F2784; // type:func +EnZl2_Init = 0x808F27CC; // type:func +EnZl2_OverrideLimbDraw = 0x808F2878; // type:func +func_80B523BC = 0x808F28E0; // type:func +func_80B523C8 = 0x808F28F0; // type:func +func_80B525D4 = 0x808F2ACC; // type:func +EnZl2_Draw = 0x808F2C74; // type:func +BgHidanFslift_Init = 0x808F3510; // type:func +BgHidanFslift_SetHookshotTargetPos = 0x808F35F8; // type:func +BgHidanFslift_Destroy = 0x808F3658; // type:func +BgHidanFslift_SetupIdle = 0x808F368C; // type:func +BgHidanFslift_Idle = 0x808F36A8; // type:func +BgHidanFslift_Descend = 0x808F3748; // type:func +BgHidanFslift_Ascend = 0x808F37B4; // type:func +BgHidanFslift_Update = 0x808F3850; // type:func +BgHidanFslift_Draw = 0x808F38F8; // type:func +EnOE2_SetupAction = 0x808F39E0; // type:func +EnOE2_Init = 0x808F39EC; // type:func +EnOE2_Destroy = 0x808F3A14; // type:func +EnOE2_DoNothing = 0x808F3A24; // type:func +EnOE2_Update = 0x808F3A34; // type:func +EnOE2_Draw = 0x808F3A44; // type:func +BgYdanHasi_Init = 0x808F3AC0; // type:func +BgYdanHasi_Destroy = 0x808F3C24; // type:func +BgYdanHasi_UpdateFloatingBlock = 0x808F3C58; // type:func +BgYdanHasi_InitWater = 0x808F3D90; // type:func +BgYdanHasi_MoveWater = 0x808F3DDC; // type:func +BgYdanHasi_DecWaterTimer = 0x808F3EAC; // type:func +BgYdanHasi_SetupThreeBlocks = 0x808F3F00; // type:func +BgYdanHasi_UpdateThreeBlocks = 0x808F3F6C; // type:func +BgYdanHasi_Update = 0x808F403C; // type:func +BgYdanHasi_Draw = 0x808F4060; // type:func +BgYdanMaruta_Init = 0x808F4270; // type:func +BgYdanMaruta_Destroy = 0x808F44D4; // type:func +func_808BEFF4 = 0x808F4528; // type:func +func_808BF078 = 0x808F45AC; // type:func +func_808BF108 = 0x808F463C; // type:func +func_808BF1EC = 0x808F4720; // type:func +BgYdanMaruta_DoNothing = 0x808F4790; // type:func +BgYdanMaruta_Update = 0x808F47A0; // type:func +BgYdanMaruta_Draw = 0x808F47C4; // type:func +BossGanondrof_ClearPixels8x8 = 0x808F4950; // type:func +BossGanondrof_ClearPixels16x8 = 0x808F4990; // type:func +BossGanondrof_ClearPixels16x16 = 0x808F49D0; // type:func +BossGanondrof_ClearPixels32x16 = 0x808F4A00; // type:func +BossGanondrof_ClearPixels16x32 = 0x808F4A48; // type:func +BossGanondrof_ClearPixels = 0x808F4A94; // type:func +BossGanondrof_SetColliderPos = 0x808F4D44; // type:func +BossGanondrof_Init = 0x808F4D88; // type:func +BossGanondrof_Destroy = 0x808F5018; // type:func +BossGanondrof_SetupIntro = 0x808F5084; // type:func +BossGanondrof_Intro = 0x808F50D0; // type:func +BossGanondrof_SetupPaintings = 0x808F5588; // type:func +BossGanondrof_Paintings = 0x808F55CC; // type:func +BossGanondrof_SetupNeutral = 0x808F57A0; // type:func +BossGanondrof_Neutral = 0x808F5820; // type:func +BossGanondrof_SetupThrow = 0x808F5F68; // type:func +BossGanondrof_Throw = 0x808F6090; // type:func +BossGanondrof_SetupReturn = 0x808F629C; // type:func +BossGanondrof_Return = 0x808F633C; // type:func +BossGanondrof_SetupStunned = 0x808F6448; // type:func +BossGanondrof_Stunned = 0x808F650C; // type:func +BossGanondrof_SetupBlock = 0x808F6620; // type:func +BossGanondrof_Block = 0x808F6694; // type:func +BossGanondrof_SetupCharge = 0x808F6770; // type:func +BossGanondrof_Charge = 0x808F67E0; // type:func +BossGanondrof_SetupDeath = 0x808F6EC4; // type:func +BossGanondrof_Death = 0x808F6F5C; // type:func +BossGanondrof_CollisionCheck = 0x808F7E4C; // type:func +BossGanondrof_Update = 0x808F8078; // type:func +BossGanondrof_OverrideLimbDraw = 0x808F8480; // type:func +BossGanondrof_PostLimbDraw = 0x808F885C; // type:func +BossGanondrof_GetClearPixelDList = 0x808F8920; // type:func +BossGanondrof_EmptyDList = 0x808F898C; // type:func +BossGanondrof_Draw = 0x808F89B0; // type:func +EnAm_SetupAction = 0x808F96E0; // type:func +EnAm_CanMove = 0x808F96EC; // type:func +EnAm_Init = 0x808F9818; // type:func +EnAm_Destroy = 0x808F99E4; // type:func +EnAm_SpawnEffects = 0x808F9A3C; // type:func +EnAm_SetupSleep = 0x808F9BD8; // type:func +EnAm_SetupStatue = 0x808F9C74; // type:func +EnAm_SetupLunge = 0x808F9D04; // type:func +EnAm_SetupCooldown = 0x808F9D68; // type:func +EnAm_SetupMoveToHome = 0x808F9DD4; // type:func +EnAm_SetupRotateToInit = 0x808F9E30; // type:func +EnAm_SetupRotateToHome = 0x808F9E8C; // type:func +EnAm_SetupRecoilFromDamage = 0x808F9EE8; // type:func +EnAm_SetupRicochet = 0x808F9FC0; // type:func +EnAm_Sleep = 0x808FA074; // type:func +EnAm_RotateToHome = 0x808FA2E0; // type:func +EnAm_RotateToInit = 0x808FA3E4; // type:func +EnAm_MoveToHome = 0x808FA550; // type:func +EnAm_RecoilFromDamage = 0x808FA6C0; // type:func +EnAm_Cooldown = 0x808FA764; // type:func +EnAm_Lunge = 0x808FA89C; // type:func +EnAm_Statue = 0x808FAAD0; // type:func +EnAm_SetupStunned = 0x808FAD20; // type:func +EnAm_Stunned = 0x808FAE0C; // type:func +EnAm_Ricochet = 0x808FAEE0; // type:func +EnAm_TransformSwordHitbox = 0x808FAF94; // type:func +EnAm_UpdateDamage = 0x808FB02C; // type:func +EnAm_Update = 0x808FB1C4; // type:func +EnAm_PostLimbDraw = 0x808FB568; // type:func +EnAm_Draw = 0x808FB5B0; // type:func +EnDekubaba_Init = 0x808FBAE0; // type:func +EnDekubaba_Destroy = 0x808FBD24; // type:func +EnDekubaba_DisableACColliderElems = 0x808FBD50; // type:func +EnDekubaba_SetupWait = 0x808FBDD8; // type:func +EnDekubaba_SetupGrow = 0x808FC040; // type:func +EnDekubaba_SetupRetract = 0x808FC170; // type:func +EnDekubaba_SetupDecideLunge = 0x808FC258; // type:func +EnDekubaba_SetupPrepareLunge = 0x808FC2B0; // type:func +EnDekubaba_SetupLunge = 0x808FC2D4; // type:func +EnDekubaba_SetupPullBack = 0x808FC318; // type:func +EnDekubaba_SetupRecover = 0x808FC390; // type:func +EnDekubaba_SetupHit = 0x808FC3C4; // type:func +EnDekubaba_SetupPrunedSomersault = 0x808FC48C; // type:func +EnDekubaba_SetupShrinkDie = 0x808FC500; // type:func +EnDekubaba_SetupStunnedVertical = 0x808FC580; // type:func +EnDekubaba_SetupSway = 0x808FC704; // type:func +EnDekubaba_SetupDeadStickDrop = 0x808FC770; // type:func +EnDekubaba_Wait = 0x808FC810; // type:func +EnDekubaba_Grow = 0x808FC8BC; // type:func +EnDekubaba_Retract = 0x808FCD24; // type:func +EnDekubaba_UpdateHeadPosition = 0x808FD0EC; // type:func +EnDekubaba_DecideLunge = 0x808FD1F0; // type:func +EnDekubaba_Lunge = 0x808FD420; // type:func +EnDekubaba_PrepareLunge = 0x808FD6A8; // type:func +EnDekubaba_PullBack = 0x808FD774; // type:func +EnDekubaba_Recover = 0x808FDB00; // type:func +EnDekubaba_Hit = 0x808FDBF8; // type:func +EnDekubaba_StunnedVertical = 0x808FDD08; // type:func +EnDekubaba_Sway = 0x808FDDA4; // type:func +EnDekubaba_PrunedSomersault = 0x808FDECC; // type:func +EnDekubaba_ShrinkDie = 0x808FE230; // type:func +EnDekubaba_DeadStickDrop = 0x808FE3F4; // type:func +EnDekubaba_UpdateDamage = 0x808FE45C; // type:func +EnDekubaba_Update = 0x808FE710; // type:func +EnDekubaba_DrawStemRetracted = 0x808FE8B0; // type:func +EnDekubaba_DrawStemExtended = 0x808FE9A0; // type:func +EnDekubaba_DrawStemBasePruned = 0x808FEC90; // type:func +EnDekubaba_DrawBaseShadow = 0x808FED50; // type:func +EnDekubaba_PostLimbDraw = 0x808FEE44; // type:func +EnDekubaba_Draw = 0x808FEE80; // type:func +EnMFire1_Init = 0x808FF590; // type:func +EnMFire1_Destroy = 0x808FF5FC; // type:func +EnMFire1_Update = 0x808FF628; // type:func +func_80A9EFE0 = 0x808FF730; // type:func +EnMThunder_Init = 0x808FF73C; // type:func +EnMThunder_Destroy = 0x808FF9FC; // type:func +func_80A9F314 = 0x808FFA6C; // type:func +func_80A9F350 = 0x808FFAA8; // type:func +func_80A9F408 = 0x808FFB60; // type:func +func_80A9F938 = 0x80900094; // type:func +func_80A9F9B4 = 0x80900110; // type:func +EnMThunder_Update = 0x8090027C; // type:func +EnMThunder_Draw = 0x80900450; // type:func +BgDdanJd_Init = 0x80900D30; // type:func +BgDdanJd_Destroy = 0x80900DDC; // type:func +BgDdanJd_Idle = 0x80900E10; // type:func +BgDdanJd_MoveEffects = 0x80900FB4; // type:func +BgDdanJd_Move = 0x8090118C; // type:func +BgDdanJd_Update = 0x80901290; // type:func +BgDdanJd_Draw = 0x809012B4; // type:func +BgBreakwall_SetupAction = 0x80901380; // type:func +BgBreakwall_Init = 0x8090138C; // type:func +BgBreakwall_Destroy = 0x80901538; // type:func +BgBreakwall_SpawnFragments = 0x8090156C; // type:func +BgBreakwall_WaitForObject = 0x80901A3C; // type:func +BgBreakwall_Wait = 0x80901B44; // type:func +BgBreakwall_LavaCoverMove = 0x80901D14; // type:func +BgBreakwall_Update = 0x80901D68; // type:func +BgBreakwall_Draw = 0x80901D8C; // type:func +EnJj_SetupAction = 0x809021F0; // type:func +EnJj_Init = 0x809021FC; // type:func +EnJj_Destroy = 0x8090248C; // type:func +EnJj_Blink = 0x8090251C; // type:func +EnJj_OpenMouth = 0x8090259C; // type:func +EnJj_WaitToOpenMouth = 0x809025F0; // type:func +EnJj_WaitForFish = 0x80902634; // type:func +EnJj_BeginCutscene = 0x809026F0; // type:func +EnJj_CutsceneUpdate = 0x80902798; // type:func +EnJj_RemoveDust = 0x809028F4; // type:func +EnJj_UpdateStaticCollision = 0x8090294C; // type:func +EnJj_Update = 0x8090295C; // type:func +EnJj_Draw = 0x80902A08; // type:func +EnHorseZelda_GetFieldPosition = 0x809037C0; // type:func +EnHorseZelda_Move = 0x8090380C; // type:func +EnHorseZelda_Init = 0x809039D4; // type:func +EnHorseZelda_Destroy = 0x80903B24; // type:func +EnHorseZelda_SetupStop = 0x80903B74; // type:func +EnHorseZelda_Stop = 0x80903BC4; // type:func +EnHorseZelda_Spur = 0x80903C0C; // type:func +EnHorseZelda_Gallop = 0x80903CF4; // type:func +EnHorseZelda_SetRotate = 0x80903D34; // type:func +EnHorseZelda_Update = 0x80903DF8; // type:func +EnHorseZelda_PostDraw = 0x80903ED4; // type:func +EnHorseZelda_Draw = 0x80904060; // type:func +BgDdanKd_SetupAction = 0x809042B0; // type:func +BgDdanKd_Init = 0x809042BC; // type:func +BgDdanKd_Destroy = 0x809043B4; // type:func +BgDdanKd_CheckForExplosions = 0x809043FC; // type:func +BgDdanKd_LowerStairs = 0x80904514; // type:func +BgDdanKd_DoNothing = 0x809049E8; // type:func +BgDdanKd_Update = 0x809049F8; // type:func +BgDdanKd_Draw = 0x80904A1C; // type:func +DoorWarp1_SetupAction = 0x80904BA0; // type:func +DoorWarp1_Init = 0x80904BAC; // type:func +DoorWarp1_Destroy = 0x80904D1C; // type:func +DoorWarp1_SetupWarp = 0x80904DA4; // type:func +DoorWarp1_SetupAdultDungeonWarp = 0x809050AC; // type:func +DoorWarp1_SetupBlueCrystal = 0x80905278; // type:func +DoorWarp1_SetupPurpleCrystal = 0x80905410; // type:func +DoorWarp1_SetPlayerPos = 0x809055B0; // type:func +DoorWarp1_BlueCrystal = 0x809055E8; // type:func +func_80999214 = 0x80905634; // type:func +func_80999348 = 0x80905768; // type:func +DoorWarp1_FloatPlayer = 0x80905830; // type:func +DoorWarp1_PurpleCrystal = 0x8090584C; // type:func +DoorWarp1_ChooseInitialAction = 0x8090592C; // type:func +DoorWarp1_AwaitClearFlag = 0x809059A4; // type:func +func_809995D4 = 0x809059FC; // type:func +DoorWarp1_WarpAppear = 0x80905B4C; // type:func +func_809998A4 = 0x80905CD0; // type:func +DoorWarp1_PlayerInRange = 0x80905D68; // type:func +DoorWarp1_ChildWarpIdle = 0x80905DD4; // type:func +DoorWarp1_ChildWarpOut = 0x80905EA0; // type:func +DoorWarp1_RutoWarpIdle = 0x80906294; // type:func +func_80999EE0 = 0x80906314; // type:func +func_80999FE4 = 0x8090641C; // type:func +DoorWarp1_RutoWarpOut = 0x809064D4; // type:func +func_8099A3A4 = 0x809067E0; // type:func +DoorWarp1_AdultWarpIdle = 0x809068AC; // type:func +func_8099A508 = 0x8090694C; // type:func +DoorWarp1_AdultWarpOut = 0x80906A30; // type:func +DoorWarp1_Destination = 0x80907314; // type:func +DoorWarp1_DoNothing = 0x80907444; // type:func +func_8099B020 = 0x80907454; // type:func +DoorWarp1_Update = 0x80907510; // type:func +DoorWarp1_DrawBlueCrystal = 0x80907574; // type:func +DoorWarp1_DrawPurpleCrystal = 0x80907744; // type:func +DoorWarp1_DrawWarp = 0x809079C8; // type:func +DoorWarp1_Draw = 0x80908874; // type:func +ObjSyokudai_Init = 0x80908EB0; // type:func +ObjSyokudai_Destroy = 0x80909074; // type:func +ObjSyokudai_Update = 0x809090C8; // type:func +ObjSyokudai_Draw = 0x809096E4; // type:func +ItemBHeart_Init = 0x80909B00; // type:func +ItemBHeart_Destroy = 0x80909B6C; // type:func +ItemBHeart_Update = 0x80909B7C; // type:func +func_80B85264 = 0x80909C24; // type:func +ItemBHeart_Draw = 0x80909D10; // type:func +EnDekunuts_Init = 0x80909F10; // type:func +EnDekunuts_Destroy = 0x8090A07C; // type:func +EnDekunuts_SetupWait = 0x8090A0B8; // type:func +EnDekunuts_SetupLookAround = 0x8090A12C; // type:func +EnDekunuts_SetupThrowNut = 0x8090A174; // type:func +EnDekunuts_SetupStand = 0x8090A1B8; // type:func +EnDekunuts_SetupBurrow = 0x8090A220; // type:func +EnDekunuts_SetupBeginRun = 0x8090A270; // type:func +EnDekunuts_SetupRun = 0x8090A2D8; // type:func +EnDekunuts_SetupGasp = 0x8090A330; // type:func +EnDekunuts_SetupBeDamaged = 0x8090A390; // type:func +EnDekunuts_SetupBeStunned = 0x8090A46C; // type:func +EnDekunuts_SetupDie = 0x8090A500; // type:func +EnDekunuts_Wait = 0x8090A550; // type:func +EnDekunuts_LookAround = 0x8090A7B4; // type:func +EnDekunuts_Stand = 0x8090A838; // type:func +EnDekunuts_ThrowNut = 0x8090A924; // type:func +EnDekunuts_Burrow = 0x8090AA7C; // type:func +EnDekunuts_BeginRun = 0x8090AB90; // type:func +EnDekunuts_Run = 0x8090ABF8; // type:func +EnDekunuts_Gasp = 0x8090AE38; // type:func +EnDekunuts_BeDamaged = 0x8090AEA0; // type:func +EnDekunuts_BeStunned = 0x8090AEF0; // type:func +EnDekunuts_Die = 0x8090AF6C; // type:func +EnDekunuts_ColliderCheck = 0x8090B0C8; // type:func +EnDekunuts_Update = 0x8090B1EC; // type:func +EnDekunuts_OverrideLimbDraw = 0x8090B354; // type:func +EnDekunuts_Draw = 0x8090B488; // type:func +BgMenkuriKaiten_Init = 0x8090B710; // type:func +BgMenkuriKaiten_Destroy = 0x8090B778; // type:func +BgMenkuriKaiten_Update = 0x8090B7AC; // type:func +BgMenkuriKaiten_Draw = 0x8090B80C; // type:func +BgMenkuriEye_Init = 0x8090B8A0; // type:func +BgMenkuriEye_Destroy = 0x8090B97C; // type:func +BgMenkuriEye_Update = 0x8090B9A8; // type:func +BgMenkuriEye_Draw = 0x8090BB18; // type:func +EnVali_Init = 0x8090BD40; // type:func +EnVali_Destroy = 0x8090BEBC; // type:func +EnVali_SetupLurk = 0x8090BF0C; // type:func +EnVali_SetupDropAppear = 0x8090BF5C; // type:func +EnVali_SetupFloatIdle = 0x8090BF94; // type:func +EnVali_SetupAttacked = 0x8090C1AC; // type:func +EnVali_SetupRetaliate = 0x8090C1E4; // type:func +EnVali_SetupMoveArmsDown = 0x8090C254; // type:func +EnVali_SetupBurnt = 0x8090C294; // type:func +EnVali_SetupDivideAndDie = 0x8090C2EC; // type:func +EnVali_SetupStunned = 0x8090C3F0; // type:func +EnVali_SetupFrozen = 0x8090C47C; // type:func +EnVali_SetupReturnToLurk = 0x8090C4DC; // type:func +EnVali_DischargeLightning = 0x8090C538; // type:func +EnVali_Lurk = 0x8090C734; // type:func +EnVali_DropAppear = 0x8090C774; // type:func +EnVali_FloatIdle = 0x8090C808; // type:func +EnVali_Attacked = 0x8090C9B4; // type:func +EnVali_Retaliate = 0x8090CA6C; // type:func +EnVali_MoveArmsDown = 0x8090CAC8; // type:func +EnVali_Burnt = 0x8090CB04; // type:func +EnVali_DivideAndDie = 0x8090CB40; // type:func +EnVali_Stunned = 0x8090CCF4; // type:func +EnVali_Frozen = 0x8090CDB0; // type:func +EnVali_ReturnToLurk = 0x8090CF40; // type:func +EnVali_UpdateDamage = 0x8090CFB0; // type:func +EnVali_Update = 0x8090D168; // type:func +EnVali_PulseOutside = 0x8090D2C4; // type:func +EnVali_PulseInsides = 0x8090D4E0; // type:func +EnVali_SetArmLength = 0x8090D6FC; // type:func +EnVali_OverrideLimbDraw = 0x8090D89C; // type:func +EnVali_PostLimbDraw = 0x8090D92C; // type:func +EnVali_DrawBody = 0x8090D9F0; // type:func +EnVali_Draw = 0x8090DD58; // type:func +BgMizuMovebg_GetDragonStatueBossRoomOffsetIndex = 0x8090E400; // type:func +BgMizuMovebg_Init = 0x8090E46C; // type:func +BgMizuMovebg_Destroy = 0x8090E834; // type:func +BgMizuMovebg_SetPosFromPath = 0x8090E8E8; // type:func +BgMizuMovebg_SetScrollAlphas = 0x8090E97C; // type:func +BgMizuMovebg_UpdateMain = 0x8090EB00; // type:func +BgMizuMovebg_UpdateHookshotPlatform = 0x8090EE3C; // type:func +BgMizuMovebg_Update = 0x8090EFF8; // type:func +BgMizuMovebg_Draw = 0x8090F01C; // type:func +BgMizuWater_GetWaterLevelActionIndex = 0x8090F590; // type:func +BgMizuWater_SetWaterBoxesHeight = 0x8090F630; // type:func +BgMizuWater_Init = 0x8090F69C; // type:func +BgMizuWater_Destroy = 0x8090F8F8; // type:func +BgMizuWater_WaitForAction = 0x8090F908; // type:func +BgMizuWater_ChangeWaterLevel = 0x8090FAD4; // type:func +BgMizuWater_Update = 0x8090FDE4; // type:func +BgMizuWater_Draw = 0x8090FF3C; // type:func +ArmsHook_SetupAction = 0x80910260; // type:func +ArmsHook_Init = 0x8091026C; // type:func +ArmsHook_Destroy = 0x809102E0; // type:func +ArmsHook_Wait = 0x80910328; // type:func +ArmsHook_PullPlayer = 0x809103A8; // type:func +ArmsHook_AttachToPlayer = 0x809103BC; // type:func +ArmsHook_DetachFromActor = 0x809103EC; // type:func +ArmsHook_CheckForCancel = 0x80910414; // type:func +ArmsHook_AttachToActor = 0x809104B0; // type:func +ArmsHook_Shoot = 0x809104F8; // type:func +ArmsHook_Update = 0x80910B64; // type:func +ArmsHook_Draw = 0x80910BA4; // type:func +EnfHG_Init = 0x80910FD0; // type:func +EnfHG_Destroy = 0x809110D0; // type:func +EnfHG_SetupIntro = 0x809110FC; // type:func +EnfHG_Intro = 0x80911160; // type:func +EnfHG_SetupApproach = 0x8091236C; // type:func +EnfHG_Approach = 0x809125B8; // type:func +EnfHG_Attack = 0x8091275C; // type:func +EnfHG_Damage = 0x80912BE0; // type:func +EnfHG_Retreat = 0x80912F10; // type:func +EnfHG_Done = 0x80913144; // type:func +EnfHG_Update = 0x80913154; // type:func +EnfHG_PostDraw = 0x809132E8; // type:func +EnfHG_Draw = 0x809132FC; // type:func +BgMoriHineri_Init = 0x80913900; // type:func +BgMoriHineri_Destroy = 0x80913B00; // type:func +func_808A39FC = 0x80913B34; // type:func +BgMoriHineri_DoNothing = 0x80913D2C; // type:func +BgMoriHineri_SpawnBossKeyChest = 0x80913D3C; // type:func +func_808A3C8C = 0x80913DCC; // type:func +func_808A3D58 = 0x80913E98; // type:func +func_808A3E54 = 0x80913F94; // type:func +BgMoriHineri_Update = 0x80914074; // type:func +BgMoriHineri_DrawHallAndRoom = 0x80914098; // type:func +EnBb_SetupAction = 0x80914650; // type:func +EnBb_FindExplosive = 0x8091465C; // type:func +EnBb_SpawnFlameTrail = 0x809146F0; // type:func +EnBb_KillFlameTrail = 0x8091488C; // type:func +EnBb_Init = 0x809148D8; // type:func +EnBb_Destroy = 0x80914C80; // type:func +EnBb_SetupFlameTrail = 0x80914CAC; // type:func +EnBb_FlameTrail = 0x80914D00; // type:func +EnBb_SetupDeath = 0x80914E7C; // type:func +EnBb_Death = 0x80914F10; // type:func +EnBb_SetupDamage = 0x8091508C; // type:func +EnBb_Damage = 0x8091514C; // type:func +EnBb_SetupBlue = 0x809151B8; // type:func +EnBb_Blue = 0x80915278; // type:func +EnBb_SetupDown = 0x80915A6C; // type:func +EnBb_Down = 0x80915AFC; // type:func +EnBb_SetupRed = 0x80915DD0; // type:func +EnBb_Red = 0x80915EE0; // type:func +EnBb_FaceWaypoint = 0x809162A8; // type:func +EnBb_SetWaypoint = 0x809162DC; // type:func +EnBb_SetupWhite = 0x809163A8; // type:func +EnBb_White = 0x80916458; // type:func +EnBb_InitGreen = 0x809167DC; // type:func +EnBb_SetupGreen = 0x80916914; // type:func +EnBb_Green = 0x809169AC; // type:func +EnBb_SetupStunned = 0x8091701C; // type:func +EnBb_Stunned = 0x80917130; // type:func +EnBb_CollisionCheck = 0x809172D4; // type:func +EnBb_Update = 0x80917608; // type:func +EnBb_PostLimbDraw = 0x80917888; // type:func +EnBb_Draw = 0x809178D8; // type:func +BgTokiHikari_Init = 0x80918330; // type:func +BgTokiHikari_Destroy = 0x809183BC; // type:func +BgTokiHikari_DoNothing = 0x809183CC; // type:func +BgTokiHikari_Update = 0x809183DC; // type:func +BgTokiHikari_Draw = 0x80918400; // type:func +func_808BA018 = 0x80918450; // type:func +func_808BA204 = 0x809185F8; // type:func +func_808BA22C = 0x80918620; // type:func +func_808BA274 = 0x80918668; // type:func +func_808BA2CC = 0x809186C0; // type:func +EnYukabyun_Init = 0x809190D0; // type:func +EnYukabyun_Destroy = 0x80919180; // type:func +func_80B43A94 = 0x809191AC; // type:func +func_80B43AD4 = 0x809191EC; // type:func +func_80B43B6C = 0x80919284; // type:func +EnYukabyun_Break = 0x809192E4; // type:func +EnYukabyun_Update = 0x80919358; // type:func +EnYukabyun_Draw = 0x809194F8; // type:func +BgTokiSwd_SetupAction = 0x809196E0; // type:func +BgTokiSwd_Init = 0x809196EC; // type:func +BgTokiSwd_Destroy = 0x809197C0; // type:func +func_808BAF40 = 0x809197EC; // type:func +func_808BB0AC = 0x80919960; // type:func +func_808BB128 = 0x809199E0; // type:func +BgTokiSwd_Update = 0x80919A34; // type:func +BgTokiSwd_Draw = 0x80919A88; // type:func +EnFhgFire_SetUpdate = 0x8091AD30; // type:func +EnFhgFire_Init = 0x8091AD3C; // type:func +EnFhgFire_Destroy = 0x8091B14C; // type:func +EnFhgFire_LightningStrike = 0x8091B1BC; // type:func +EnFhgFire_LightningTrail = 0x8091B554; // type:func +EnFhgFire_LightningShock = 0x8091B6F4; // type:func +EnFhgFire_LightningBurst = 0x8091B838; // type:func +EnFhgFire_SpearLight = 0x8091BAB4; // type:func +EnFhgFire_EnergyBall = 0x8091BCA8; // type:func +EnFhgFire_PhantomWarp = 0x8091C954; // type:func +EnFhgFire_Update = 0x8091CB10; // type:func +EnFhgFire_Draw = 0x8091CB60; // type:func +BgMjin_SetupAction = 0x8091D3D0; // type:func +BgMjin_Init = 0x8091D3DC; // type:func +BgMjin_Destroy = 0x8091D47C; // type:func +func_808A0850 = 0x8091D4B0; // type:func +BgMjin_DoNothing = 0x8091D584; // type:func +BgMjin_Update = 0x8091D594; // type:func +BgMjin_Draw = 0x8091D5B8; // type:func +BgHidanKousi_SetupAction = 0x8091D7C0; // type:func +BgHidanKousi_Init = 0x8091D7CC; // type:func +BgHidanKousi_Destroy = 0x8091D8C4; // type:func +func_80889ACC = 0x8091D8F8; // type:func +func_80889B5C = 0x8091D984; // type:func +func_80889BC0 = 0x8091D9E8; // type:func +func_80889C18 = 0x8091DA40; // type:func +func_80889C90 = 0x8091DAB8; // type:func +func_80889D28 = 0x8091DB54; // type:func +BgHidanKousi_Update = 0x8091DB64; // type:func +BgHidanKousi_Draw = 0x8091DB88; // type:func +DoorToki_Init = 0x8091DD50; // type:func +DoorToki_Destroy = 0x8091DDB8; // type:func +DoorToki_Update = 0x8091DDEC; // type:func +BgHidanHamstep_SetupAction = 0x8091DEB0; // type:func +BgHidanHamstep_SpawnChildren = 0x8091DED0; // type:func +BgHidanHamstep_Init = 0x8091E04C; // type:func +BgHidanHamstep_Destroy = 0x8091E2BC; // type:func +func_808884C8 = 0x8091E310; // type:func +func_80888638 = 0x8091E480; // type:func +func_80888694 = 0x8091E4DC; // type:func +func_80888734 = 0x8091E57C; // type:func +func_808887C4 = 0x8091E610; // type:func +func_80888860 = 0x8091E6AC; // type:func +func_808889B8 = 0x8091E7F8; // type:func +func_80888A58 = 0x8091E898; // type:func +BgHidanHamstep_DoNothing = 0x8091EA30; // type:func +BgHidanHamstep_Update = 0x8091EA40; // type:func +BgHidanHamstep_Draw = 0x8091EA64; // type:func +EnBird_SetupAction = 0x8091ED60; // type:func +EnBird_Init = 0x8091ED6C; // type:func +EnBird_Destroy = 0x8091EE58; // type:func +EnBird_SetupIdle = 0x8091EE68; // type:func +EnBird_Idle = 0x8091EF1C; // type:func +EnBird_SetupMove = 0x8091EFBC; // type:func +EnBird_Move = 0x8091EFFC; // type:func +EnBird_Update = 0x8091F118; // type:func +EnBird_Draw = 0x8091F148; // type:func +EnWood02_SpawnZoneCheck = 0x8091F220; // type:func +EnWood02_SpawnOffspring = 0x8091F348; // type:func +EnWood02_Init = 0x8091F560; // type:func +EnWood02_Destroy = 0x8091F99C; // type:func +EnWood02_Update = 0x8091F9D8; // type:func +EnWood02_Draw = 0x8091FED0; // type:func +EnLightbox_Init = 0x80920400; // type:func +EnLightbox_Destroy = 0x8092052C; // type:func +EnLightbox_Update = 0x80920560; // type:func +EnLightbox_Draw = 0x809207E8; // type:func +EnPubox_Init = 0x80920880; // type:func +EnPubox_Destroy = 0x809209B8; // type:func +EnPubox_Update = 0x809209EC; // type:func +EnPubox_Draw = 0x80920B3C; // type:func +EnTrap_Init = 0x80920BC0; // type:func +EnTrap_Destroy = 0x80920F7C; // type:func +EnTrap_Update = 0x80920FA8; // type:func +EnTrap_Draw = 0x80921D3C; // type:func +EnArowTrap_Init = 0x80921E60; // type:func +EnArowTrap_Destroy = 0x80921EB0; // type:func +EnArowTrap_Update = 0x80921EC0; // type:func +EnVase_Init = 0x80921FB0; // type:func +EnVase_Destroy = 0x80922014; // type:func +EnVase_Draw = 0x80922024; // type:func +EnTa_SetupAction = 0x809220B0; // type:func +EnTa_SetTextForTalkInLonLonHouse = 0x809220C0; // type:func +EnTa_Init = 0x809221A0; // type:func +EnTa_DecreaseShadowSize = 0x80922824; // type:func +EnTa_Destroy = 0x80922858; // type:func +EnTa_RequestTalk = 0x809228D0; // type:func +EnTa_SleepTalkInKakariko = 0x80922978; // type:func +EnTa_SleepTalkInLonLonHouse = 0x809229B8; // type:func +EnTa_SetupAwake = 0x809229F8; // type:func +EnTa_TalkWakingUp2 = 0x80922A74; // type:func +EnTa_TalkWakingUp1 = 0x80922AC0; // type:func +EnTa_WakeUp = 0x80922B5C; // type:func +EnTa_SleepTalkInCastle = 0x80922BE8; // type:func +EnTa_IdleAsleepInCastle = 0x80922C28; // type:func +EnTa_IdleAsleepInLonLonHouse = 0x80922CF0; // type:func +EnTa_IdleAsleepInKakariko = 0x80922D54; // type:func +EnTa_RunWithAccelerationAndSfx = 0x80922E1C; // type:func +EnTa_RunAwayRunOutOfGate = 0x80922E9C; // type:func +EnTa_RunAwayTurnTowardsGate = 0x80922F10; // type:func +EnTa_RunAwayRunWest = 0x80922F70; // type:func +EnTa_RunAwayTurnWest = 0x80922FF8; // type:func +EnTa_RunAwayRunSouth = 0x80923058; // type:func +EnTa_RunAwayStart = 0x809230F8; // type:func +EnTa_TalkAwakeInCastle = 0x80923170; // type:func +EnTa_IdleAwakeInCastle = 0x8092321C; // type:func +EnTa_TalkAwakeInKakariko = 0x80923268; // type:func +EnTa_IdleAwakeInKakariko = 0x809232B4; // type:func +EnTa_TalkAtRanch = 0x8092335C; // type:func +EnTa_IdleAtRanch = 0x809233A8; // type:func +EnTa_CheckCanBuyMilk = 0x809233EC; // type:func +EnTa_CreateFloorCamera = 0x8092343C; // type:func +EnTa_RemoveFloorCamera = 0x809234F0; // type:func +EnTa_SetupActionWithSleepAnimation = 0x80923534; // type:func +EnTa_SetupActionWithWakeUpAnimation = 0x809235C4; // type:func +EnTa_TalkNotEnoughRupees = 0x80923650; // type:func +EnTa_IsPlayerHoldingSuperCucco = 0x809236C8; // type:func +EnTa_TalkFoundSuperCucco = 0x8092371C; // type:func +EnTa_IdleFoundSuperCucco = 0x8092387C; // type:func +EnTa_GetSuperCuccosCount = 0x809238EC; // type:func +EnTa_AnimateHandsUpDown = 0x80923928; // type:func +EnTa_TransitionToPostCuccoGame = 0x809239F4; // type:func +EnTa_TalkCuccoGameEnd = 0x80923A44; // type:func +EnTa_RunCuccoGame = 0x80923B20; // type:func +EnTa_ThrowSuperCuccos = 0x80923E80; // type:func +EnTa_StartingCuccoGame3 = 0x809240F8; // type:func +EnTa_StartingCuccoGame2 = 0x8092421C; // type:func +EnTa_StartingCuccoGame1 = 0x809242EC; // type:func +EnTa_StartCuccoGame = 0x809243B4; // type:func +EnTa_TalkGeneralInLonLonHouse = 0x8092444C; // type:func +EnTa_GiveItemInLonLonHouse = 0x809244A8; // type:func +EnTa_TalkAfterCuccoGameFirstWon = 0x8092457C; // type:func +EnTa_WaitBuyMilkOrPlayCuccoGameResponse = 0x80924614; // type:func +EnTa_WaitForPlayCuccoGameResponse = 0x809247F0; // type:func +EnTa_WaitForMarryMalonResponse = 0x80924918; // type:func +EnTa_ContinueTalkInLonLonHouse = 0x80924998; // type:func +EnTa_TalkAfterCuccoGameWon = 0x80924A64; // type:func +EnTa_IdleSittingInLonLonHouse = 0x80924B3C; // type:func +EnTa_IdleAfterCuccoGameFinished = 0x80924C3C; // type:func +EnTa_BlinkWaitUntilNext = 0x80924D00; // type:func +EnTa_BlinkAdvanceState = 0x80924D34; // type:func +EnTa_AnimRepeatCurrent = 0x80924DF4; // type:func +EnTa_AnimSleeping = 0x80924E34; // type:func +EnTa_AnimSitSleeping = 0x80924E88; // type:func +EnTa_AnimRunToEnd = 0x80924F68; // type:func +EnTa_Update = 0x80924FC0; // type:func +EnTa_OverrideLimbDraw = 0x80925150; // type:func +EnTa_PostLimbDraw = 0x809252D4; // type:func +EnTa_Draw = 0x80925314; // type:func +EnTkEff_Create = 0x80925A70; // type:func +EnTkEff_Update = 0x80925B14; // type:func +EnTkEff_Draw = 0x80925C20; // type:func +EnTkEff_CreateDflt = 0x80925F18; // type:func +EnTk_RestAnim = 0x80925FD0; // type:func +EnTk_WalkAnim = 0x8092604C; // type:func +EnTk_DigAnim = 0x809260C0; // type:func +EnTk_UpdateEyes = 0x80926140; // type:func +EnTk_CheckFacingPlayer = 0x80926204; // type:func +EnTk_CheckNextSpot = 0x80926288; // type:func +EnTk_CheckCurrentSpot = 0x80926370; // type:func +EnTk_Step = 0x809263E8; // type:func +EnTk_Orient = 0x80926510; // type:func +EnTk_GetTextId = 0x80926680; // type:func +EnTk_UpdateTalkState = 0x809266D4; // type:func +EnTk_ChooseReward = 0x80926870; // type:func +EnTk_DigEff = 0x80926A2C; // type:func +EnTk_Init = 0x80926B9C; // type:func +EnTk_Destroy = 0x80926D18; // type:func +EnTk_Rest = 0x80926D44; // type:func +EnTk_Walk = 0x80926F6C; // type:func +EnTk_Dig = 0x8092703C; // type:func +EnTk_Update = 0x809272A0; // type:func +func_80B1D200 = 0x8092734C; // type:func +EnTk_OverrideLimbDraw = 0x80927378; // type:func +EnTk_PostLimbDraw = 0x809273E4; // type:func +EnTk_Draw = 0x80927498; // type:func +BgMoriBigst_SetupAction = 0x809278A0; // type:func +BgMoriBigst_InitDynapoly = 0x809278AC; // type:func +BgMoriBigst_Init = 0x80927904; // type:func +BgMoriBigst_Destroy = 0x809279DC; // type:func +BgMoriBigst_SetupWaitForMoriTex = 0x80927A10; // type:func +BgMoriBigst_WaitForMoriTex = 0x80927A38; // type:func +BgMoriBigst_SetupNoop = 0x80927B04; // type:func +BgMoriBigst_SetupStalfosFight = 0x80927B28; // type:func +BgMoriBigst_StalfosFight = 0x80927BDC; // type:func +BgMoriBigst_SetupFall = 0x80927C54; // type:func +BgMoriBigst_Fall = 0x80927C7C; // type:func +BgMoriBigst_SetupLanding = 0x80927D08; // type:func +BgMoriBigst_Landing = 0x80927D9C; // type:func +BgMoriBigst_SetupStalfosPairFight = 0x80927DC8; // type:func +BgMoriBigst_StalfosPairFight = 0x80927EE0; // type:func +BgMoriBigst_SetupDone = 0x80927F40; // type:func +BgMoriBigst_Update = 0x80927F64; // type:func +BgMoriBigst_Draw = 0x80927FD8; // type:func +func_808A1800 = 0x809281D0; // type:func +func_808A18FC = 0x809282C8; // type:func +BgMoriElevator_Init = 0x80928350; // type:func +BgMoriElevator_Destroy = 0x80928434; // type:func +BgMoriElevator_IsPlayerRiding = 0x80928474; // type:func +BgMoriElevator_SetupWaitAfterInit = 0x809284D4; // type:func +BgMoriElevator_WaitAfterInit = 0x809284E8; // type:func +func_808A1C30 = 0x8092858C; // type:func +BgMoriElevator_MoveIntoGround = 0x809285A0; // type:func +func_808A1CF4 = 0x80928654; // type:func +BgMoriElevator_MoveAboveGround = 0x809286B0; // type:func +BgMoriElevator_SetupSetPosition = 0x80928764; // type:func +BgMoriElevator_SetPosition = 0x80928778; // type:func +BgMoriElevator_StopMovement = 0x80928940; // type:func +func_808A2008 = 0x8092895C; // type:func +BgMoriElevator_Update = 0x80928A10; // type:func +BgMoriElevator_Draw = 0x80928A68; // type:func +BgMoriKaitenkabe_CrossProduct = 0x80928CC0; // type:func +BgMoriKaitenkabe_Init = 0x80928D34; // type:func +BgMoriKaitenkabe_Destroy = 0x80928DE8; // type:func +BgMoriKaitenkabe_WaitForMoriTex = 0x80928E1C; // type:func +BgMoriKaitenkabe_SetupWait = 0x80928E74; // type:func +BgMoriKaitenkabe_Wait = 0x80928E8C; // type:func +BgMoriKaitenkabe_SetupRotate = 0x80928FEC; // type:func +BgMoriKaitenkabe_Rotate = 0x8092900C; // type:func +BgMoriKaitenkabe_Update = 0x80929178; // type:func +BgMoriKaitenkabe_Draw = 0x8092919C; // type:func +BgMoriRakkatenjo_Init = 0x80929330; // type:func +BgMoriRakkatenjo_Destroy = 0x809293E8; // type:func +BgMoriRakkatenjo_IsLinkUnder = 0x8092941C; // type:func +BgMoriRakkatenjo_IsLinkClose = 0x809294CC; // type:func +BgMoriRakkatenjo_SetupWaitForMoriTex = 0x8092957C; // type:func +BgMoriRakkatenjo_WaitForMoriTex = 0x80929590; // type:func +BgMoriRakkatenjo_SetupWait = 0x809295E8; // type:func +BgMoriRakkatenjo_Wait = 0x80929624; // type:func +BgMoriRakkatenjo_SetupFall = 0x809296F4; // type:func +BgMoriRakkatenjo_Fall = 0x80929714; // type:func +BgMoriRakkatenjo_SetupRest = 0x8092988C; // type:func +BgMoriRakkatenjo_Rest = 0x809298B4; // type:func +BgMoriRakkatenjo_SetupRise = 0x809298E4; // type:func +BgMoriRakkatenjo_Rise = 0x80929904; // type:func +BgMoriRakkatenjo_Update = 0x80929984; // type:func +BgMoriRakkatenjo_Draw = 0x80929A5C; // type:func +EnVm_SetupAction = 0x80929CB0; // type:func +EnVm_Init = 0x80929CBC; // type:func +EnVm_Destroy = 0x80929E2C; // type:func +EnVm_SetupWait = 0x80929E58; // type:func +EnVm_Wait = 0x80929EE4; // type:func +EnVm_SetupAttack = 0x8092A238; // type:func +EnVm_Attack = 0x8092A2DC; // type:func +EnVm_SetupStun = 0x8092A52C; // type:func +EnVm_Stun = 0x8092A5D4; // type:func +EnVm_SetupDie = 0x8092A6E0; // type:func +EnVm_Die = 0x8092A7E8; // type:func +EnVm_CheckHealth = 0x8092A89C; // type:func +EnVm_Update = 0x8092A998; // type:func +EnVm_OverrideLimbDraw = 0x8092AB2C; // type:func +EnVm_PostLimbDraw = 0x8092AB94; // type:func +EnVm_Draw = 0x8092AE6C; // type:func +DemoEffect_SetupUpdate = 0x8092B570; // type:func +DemoEffect_InterpolateCsFrames = 0x8092B57C; // type:func +DemoEffect_InitJewel = 0x8092B5DC; // type:func +DemoEffect_InitGetItem = 0x8092B69C; // type:func +DemoEffect_Init = 0x8092B6E8; // type:func +DemoEffect_Destroy = 0x8092BEE8; // type:func +DemoEffect_WaitForObject = 0x8092BF38; // type:func +DemoEffect_UpdatePositionToParent = 0x8092BF90; // type:func +DemoEffect_UpdateCrystalLight = 0x8092BFC0; // type:func +DemoEffect_MedalSparkle = 0x8092BFF4; // type:func +DemoEffect_UpdateGetItem = 0x8092C18C; // type:func +DemoEffect_InitTimeWarp = 0x8092C3CC; // type:func +DemoEffect_UpdateTimeWarpPullMasterSword = 0x8092C588; // type:func +DemoEffect_TimewarpShrink = 0x8092C62C; // type:func +DemoEffect_UpdateTimeWarpReturnFromChamberOfSages = 0x8092C750; // type:func +DemoEffect_UpdateTimeWarpTimeblock = 0x8092C808; // type:func +DemoEffect_InitTimeWarpTimeblock = 0x8092C8C4; // type:func +DemoEffect_UpdateTriforceSpot = 0x8092C948; // type:func +DemoEffect_UpdateLightRingShrinking = 0x8092CC30; // type:func +DemoEffect_UpdateLightRingExpanding = 0x8092CCC0; // type:func +DemoEffect_UpdateLightRingTriforce = 0x8092CD34; // type:func +DemoEffect_UpdateCreationFireball = 0x8092CDF0; // type:func +DemoEffect_InitCreationFireball = 0x8092CF44; // type:func +DemoEffect_UpdateBlueOrbShrink = 0x8092CF94; // type:func +DemoEffect_UpdateBlueOrbGrow = 0x8092CFFC; // type:func +DemoEffect_UpdateLightEffect = 0x8092D0DC; // type:func +DemoEffect_UpdateLgtShower = 0x8092D3D4; // type:func +DemoEffect_UpdateGodLgtDin = 0x8092D440; // type:func +DemoEffect_UpdateGodLgtNayru = 0x8092D5DC; // type:func +DemoEffect_UpdateGodLgtFarore = 0x8092D7D4; // type:func +DemoEffect_MoveTowardTarget = 0x8092D978; // type:func +DemoEffect_InitJewelColor = 0x8092D9D8; // type:func +DemoEffect_SetJewelColor = 0x8092DAD8; // type:func +DemoEffect_MoveJewelSplit = 0x8092E24C; // type:func +DemoEffect_MoveJewelSpherical = 0x8092E2A8; // type:func +DemoEffect_MoveJewelActivateDoorOfTime = 0x8092E48C; // type:func +DemoEffect_JewelSparkle = 0x8092E6F8; // type:func +DemoEffect_PlayJewelSfx = 0x8092E85C; // type:func +DemoEffect_UpdateJewelAdult = 0x8092E8C0; // type:func +DemoEffect_UpdateJewelChild = 0x8092E904; // type:func +DemoEffect_UpdateDust = 0x8092EB18; // type:func +DemoEffect_Update = 0x8092EC3C; // type:func +DemoEffect_CheckForCue = 0x8092EC60; // type:func +DemoEffect_DrawJewel = 0x8092ECA4; // type:func +DemoEffect_DrawCrystalLight = 0x8092F0E4; // type:func +DemoEffect_DrawFireBall = 0x8092F3BC; // type:func +DemoEffect_DrawGodLgt = 0x8092F548; // type:func +DemoEffect_DrawLightEffect = 0x8092F918; // type:func +DemoEffect_DrawBlueOrb = 0x8092FB50; // type:func +DemoEffect_DrawLgtShower = 0x8092FC78; // type:func +DemoEffect_DrawLightRing = 0x8092FDFC; // type:func +DemoEffect_DrawTriforceSpot = 0x8092FF64; // type:func +DemoEffect_DrawGetItem = 0x809304E8; // type:func +DemoEffect_OverrideLimbDrawTimeWarp = 0x80930580; // type:func +DemoEffect_DrawTimeWarp = 0x80930700; // type:func +DemoEffect_FaceTowardPoint = 0x809307D8; // type:func +DemoEffect_SetPosRotFromCue = 0x80930888; // type:func +DemoEffect_MoveTowardCuePos = 0x809309E8; // type:func +DemoEffect_SetStartPosFromCue = 0x80930A94; // type:func +DemoKankyo_SetupAction = 0x80931110; // type:func +DemoKankyo_Init = 0x8093111C; // type:func +DemoKankyo_Destroy = 0x80931500; // type:func +DemoKankyo_SetupType = 0x8093150C; // type:func +DemoKankyo_DoNothing = 0x80931944; // type:func +DemoKankyo_UpdateWarpIn = 0x80931954; // type:func +DemoKankyo_SetPosFromCue = 0x8093197C; // type:func +DemoKankyo_UpdateRock = 0x80931A6C; // type:func +DemoKankyo_UpdateClouds = 0x80931AE4; // type:func +DemoKankyo_UpdateDoorOfTime = 0x80931B30; // type:func +DemoKankyo_KillDoorOfTimeCollision = 0x80931BCC; // type:func +DemoKankyo_Update = 0x80931BF8; // type:func +DemoKankyo_Draw = 0x80931C1C; // type:func +func_80989B54 = 0x80931DC4; // type:func +DemoKankyo_DrawRain = 0x80931F94; // type:func +DemoKankyo_DrawRock = 0x809325A0; // type:func +DemoKankyo_DrawClouds = 0x809326E4; // type:func +DemoKankyo_DrawDoorOfTime = 0x80932A10; // type:func +DemoKankyo_DrawLightPlane = 0x80932B20; // type:func +DemoKankyo_Vec3fCopy = 0x80932C08; // type:func +DemoKankyo_AddVecGeoToVec3f = 0x80932C28; // type:func +DemoKankyo_Vec3fAddPosRot = 0x80932CA8; // type:func +DemoKankyo_DrawWarpSparkles = 0x80932D04; // type:func +DemoKankyo_DrawSparkles = 0x80933460; // type:func +BgHidanFwbig_Init = 0x80934E00; // type:func +BgHidanFwbig_Destroy = 0x80934FA0; // type:func +BgHidanFwbig_UpdatePosition = 0x80934FCC; // type:func +BgHidanFwbig_WaitForSwitch = 0x8093504C; // type:func +BgHidanFwbig_WaitForCs = 0x809350B0; // type:func +BgHidanFwbig_Rise = 0x809350DC; // type:func +BgHidanFwbig_Lower = 0x80935150; // type:func +BgHidanFwbig_WaitForTimer = 0x80935230; // type:func +BgHidanFwbig_WaitForPlayer = 0x80935280; // type:func +BgHidanFwbig_Move = 0x809352E4; // type:func +BgHidanFwbig_MoveCollider = 0x80935384; // type:func +BgHidanFwbig_Update = 0x80935584; // type:func +BgHidanFwbig_Draw = 0x809356FC; // type:func +EnFloormas_Init = 0x80935AE0; // type:func +EnFloormas_Destroy = 0x80935CF4; // type:func +EnFloormas_MakeInvulnerable = 0x80935D20; // type:func +EnFloormas_MakeVulnerable = 0x80935D44; // type:func +EnFloormas_SetupBigDecideAction = 0x80935D60; // type:func +EnFloormas_SetupStand = 0x80935DA8; // type:func +EnFloormas_SetupBigWalk = 0x80935DEC; // type:func +EnFloormas_SetupBigStopWalk = 0x80935E78; // type:func +EnFloormas_SetupRun = 0x80935EC0; // type:func +EnFloormas_SetupTurn = 0x80935EF0; // type:func +EnFloormas_SetupHover = 0x80936020; // type:func +EnFloormas_SetupCharge = 0x809360F8; // type:func +EnFloormas_SetupLand = 0x8093612C; // type:func +EnFloormas_SetupSplit = 0x809361D8; // type:func +EnFloormas_SetupSmallWalk = 0x80936338; // type:func +EnFloormas_SetupSmallDecideAction = 0x80936388; // type:func +EnFloormas_SetupSmallShrink = 0x809363E8; // type:func +EnFloormas_SetupSmallFollowerJumpAtLeader = 0x809364C0; // type:func +EnFloormas_SetupJumpAtLink = 0x8093652C; // type:func +EnFloormas_SetupGrabLink = 0x80936598; // type:func +EnFloormas_SetupMerge = 0x8093676C; // type:func +EnFloormas_SetupSmallWait = 0x809367C4; // type:func +EnFloormas_SetupTakeDamage = 0x80936848; // type:func +EnFloormas_SetupRecover = 0x80936904; // type:func +EnFloormas_SetupFreeze = 0x80936958; // type:func +EnFloormas_Die = 0x80936A58; // type:func +EnFloormas_BigDecideAction = 0x80936AF4; // type:func +EnFloormas_Stand = 0x80936BB8; // type:func +EnFloormas_BigWalk = 0x80936C44; // type:func +EnFloormas_BigStopWalk = 0x80936DA0; // type:func +EnFloormas_Run = 0x80936DDC; // type:func +EnFloormas_Turn = 0x80936EE8; // type:func +EnFloormas_Hover = 0x809370AC; // type:func +EnFloormas_Slide = 0x80937130; // type:func +EnFloormas_Charge = 0x80937270; // type:func +EnFloormas_Land = 0x80937360; // type:func +EnFloormas_Split = 0x80937548; // type:func +EnFloormas_SmallWalk = 0x809375D0; // type:func +EnFloormas_SmallDecideAction = 0x809376C0; // type:func +EnFloormas_SmallShrink = 0x80937828; // type:func +EnFloormas_JumpAtLink = 0x80937880; // type:func +EnFloormas_GrabLink = 0x809379BC; // type:func +EnFloormas_SmallFollowerJumpAtLeader = 0x80937CD8; // type:func +EnFloormas_Merge = 0x80937EE8; // type:func +EnFloormas_SmallWait = 0x80938198; // type:func +EnFloormas_TakeDamage = 0x809381A8; // type:func +EnFloormas_Recover = 0x8093826C; // type:func +EnFloormas_Freeze = 0x809382A8; // type:func +EnFloormas_ColliderCheck = 0x8093831C; // type:func +EnFloormas_Update = 0x809384CC; // type:func +EnFloormas_OverrideLimbDraw = 0x80938734; // type:func +EnFloormas_PostLimbDraw = 0x80938770; // type:func +EnFloormas_Draw = 0x80938860; // type:func +EnFloormas_DrawHighlighted = 0x8093892C; // type:func +EnHeishi1_Init = 0x80938EC0; // type:func +EnHeishi1_Destroy = 0x809390D8; // type:func +EnHeishi1_SetupWalk = 0x809390E8; // type:func +EnHeishi1_Walk = 0x8093919C; // type:func +EnHeishi1_SetupMoveToLink = 0x809394BC; // type:func +EnHeishi1_MoveToLink = 0x80939578; // type:func +EnHeishi1_SetupWait = 0x80939670; // type:func +EnHeishi1_Wait = 0x80939738; // type:func +EnHeishi1_SetupTurnTowardLink = 0x809398F4; // type:func +EnHeishi1_TurnTowardLink = 0x80939990; // type:func +EnHeishi1_SetupKick = 0x80939A3C; // type:func +EnHeishi1_Kick = 0x80939AD0; // type:func +EnHeishi1_SetupWaitNight = 0x80939BA4; // type:func +EnHeishi1_WaitNight = 0x80939C38; // type:func +EnHeishi1_Update = 0x80939CB8; // type:func +EnHeishi1_OverrideLimbDraw = 0x80939FCC; // type:func +EnHeishi1_Draw = 0x8093A010; // type:func +EnRd_SetupAction = 0x8093A3D0; // type:func +EnRd_Init = 0x8093A3DC; // type:func +EnRd_Destroy = 0x8093A5C8; // type:func +EnRd_UpdateMourningTarget = 0x8093A60C; // type:func +EnRd_SetupIdle = 0x8093A678; // type:func +EnRd_Idle = 0x8093A720; // type:func +EnRd_SetupRiseFromCoffin = 0x8093A94C; // type:func +EnRd_RiseFromCoffin = 0x8093A9EC; // type:func +EnRd_SetupWalkToPlayer = 0x8093AB6C; // type:func +EnRd_WalkToPlayer = 0x8093ABF8; // type:func +EnRd_SetupWalkToHome = 0x8093AF2C; // type:func +EnRd_WalkToHome = 0x8093AFAC; // type:func +EnRd_SetupWalkToParent = 0x8093B1C0; // type:func +EnRd_WalkToParent = 0x8093B244; // type:func +EnRd_SetupGrab = 0x8093B3D8; // type:func +EnRd_Grab = 0x8093B43C; // type:func +EnRd_SetupAttemptPlayerFreeze = 0x8093B7A8; // type:func +EnRd_AttemptPlayerFreeze = 0x8093B820; // type:func +EnRd_SetupStandUp = 0x8093B918; // type:func +EnRd_StandUp = 0x8093B964; // type:func +EnRd_SetupCrouch = 0x8093B9C0; // type:func +EnRd_Crouch = 0x8093BA40; // type:func +EnRd_SetupDamaged = 0x8093BA7C; // type:func +EnRd_Damaged = 0x8093BB08; // type:func +EnRd_SetupDead = 0x8093BC18; // type:func +EnRd_Dead = 0x8093BC90; // type:func +EnRd_SetupStunned = 0x8093BDDC; // type:func +EnRd_Stunned = 0x8093BEC8; // type:func +EnRd_TurnTowardsPlayer = 0x8093BF9C; // type:func +EnRd_UpdateDamage = 0x8093C114; // type:func +EnRd_Update = 0x8093C2E0; // type:func +EnRd_OverrideLimbDraw = 0x8093C4CC; // type:func +EnRd_PostLimbDraw = 0x8093C528; // type:func +EnRd_Draw = 0x8093C670; // type:func +EnPoSisters_Init = 0x8093CC90; // type:func +EnPoSisters_Destroy = 0x8093CEDC; // type:func +func_80AD9240 = 0x8093CF44; // type:func +func_80AD9368 = 0x8093D070; // type:func +func_80AD93C4 = 0x8093D0CC; // type:func +func_80AD943C = 0x8093D144; // type:func +func_80AD944C = 0x8093D158; // type:func +func_80AD94E0 = 0x8093D1EC; // type:func +func_80AD9568 = 0x8093D274; // type:func +func_80AD95D8 = 0x8093D2E4; // type:func +func_80AD96A4 = 0x8093D3B0; // type:func +func_80AD9718 = 0x8093D424; // type:func +func_80AD97C8 = 0x8093D4D4; // type:func +func_80AD98F4 = 0x8093D600; // type:func +func_80AD99D4 = 0x8093D6E0; // type:func +func_80AD9A54 = 0x8093D760; // type:func +func_80AD9AA8 = 0x8093D7B4; // type:func +func_80AD9C24 = 0x8093D930; // type:func +func_80AD9D44 = 0x8093DA50; // type:func +func_80AD9DF0 = 0x8093DAFC; // type:func +func_80AD9E60 = 0x8093DB6C; // type:func +func_80AD9F1C = 0x8093DC28; // type:func +func_80AD9F90 = 0x8093DC9C; // type:func +func_80ADA028 = 0x8093DD34; // type:func +func_80ADA094 = 0x8093DDA0; // type:func +func_80ADA10C = 0x8093DE18; // type:func +func_80ADA1B8 = 0x8093DEC8; // type:func +func_80ADA25C = 0x8093DF6C; // type:func +func_80ADA2BC = 0x8093DFCC; // type:func +func_80ADA35C = 0x8093E06C; // type:func +func_80ADA4A8 = 0x8093E1B8; // type:func +func_80ADA530 = 0x8093E240; // type:func +func_80ADA6A0 = 0x8093E3B0; // type:func +func_80ADA7F0 = 0x8093E500; // type:func +func_80ADA8C0 = 0x8093E5D0; // type:func +func_80ADA9E8 = 0x8093E6F8; // type:func +func_80ADAAA4 = 0x8093E7B4; // type:func +func_80ADAC70 = 0x8093E980; // type:func +func_80ADAD54 = 0x8093EA64; // type:func +func_80ADAE6C = 0x8093EB7C; // type:func +func_80ADAFC0 = 0x8093ECD0; // type:func +func_80ADB17C = 0x8093EE8C; // type:func +func_80ADB2B8 = 0x8093EFC8; // type:func +func_80ADB338 = 0x8093F044; // type:func +func_80ADB4B0 = 0x8093F1C0; // type:func +func_80ADB51C = 0x8093F22C; // type:func +func_80ADB770 = 0x8093F480; // type:func +func_80ADB9F0 = 0x8093F700; // type:func +func_80ADBB6C = 0x8093F87C; // type:func +func_80ADBBF4 = 0x8093F904; // type:func +func_80ADBC88 = 0x8093F998; // type:func +func_80ADBD38 = 0x8093FA4C; // type:func +func_80ADBD8C = 0x8093FAA0; // type:func +func_80ADBEE8 = 0x8093FC00; // type:func +func_80ADBF58 = 0x8093FC70; // type:func +func_80ADC034 = 0x8093FD4C; // type:func +func_80ADC10C = 0x8093FE24; // type:func +EnPoSisters_Update = 0x8093FFE8; // type:func +func_80ADC55C = 0x8094027C; // type:func +EnPoSisters_OverrideLimbDraw = 0x8094049C; // type:func +EnPoSisters_PostLimbDraw = 0x8094068C; // type:func +EnPoSisters_Draw = 0x80940D5C; // type:func +BgHeavyBlock_SetPieceRandRot = 0x80941980; // type:func +BgHeavyBlock_InitPiece = 0x80941A10; // type:func +BgHeavyBlock_SetupDynapoly = 0x80941B8C; // type:func +BgHeavyBlock_Init = 0x80941C00; // type:func +BgHeavyBlock_Destroy = 0x80941E44; // type:func +BgHeavyBlock_MovePiece = 0x80941E8C; // type:func +BgHeavyBlock_SpawnDust = 0x80942050; // type:func +BgHeavyBlock_SpawnPieces = 0x809423B4; // type:func +BgHeavyBlock_Wait = 0x809425AC; // type:func +BgHeavyBlock_LiftedUp = 0x809426D4; // type:func +BgHeavyBlock_Fly = 0x8094283C; // type:func +BgHeavyBlock_DoNothing = 0x80942B54; // type:func +BgHeavyBlock_Land = 0x80942B64; // type:func +BgHeavyBlock_Update = 0x80942DD4; // type:func +BgHeavyBlock_Draw = 0x80942DF8; // type:func +BgHeavyBlock_DrawPiece = 0x80942F60; // type:func +BgPoEvent_InitPaintings = 0x80943270; // type:func +BgPoEvent_InitBlocks = 0x809435EC; // type:func +BgPoEvent_Init = 0x8094379C; // type:func +BgPoEvent_Destroy = 0x809438AC; // type:func +BgPoEvent_BlockWait = 0x80943930; // type:func +BgPoEvent_BlockShake = 0x80943A3C; // type:func +BgPoEvent_CheckBlock = 0x80943AF4; // type:func +BgPoEvent_BlockFall = 0x80943C2C; // type:func +BgPoEvent_BlockIdle = 0x80943D30; // type:func +BgPoEvent_BlockPush = 0x80943FE4; // type:func +BgPoEvent_BlockReset = 0x809441A4; // type:func +BgPoEvent_BlockSolved = 0x809442A4; // type:func +BgPoEvent_AmyWait = 0x8094431C; // type:func +BgPoEvent_AmyPuzzle = 0x80944398; // type:func +BgPoEvent_NextPainting = 0x809444B4; // type:func +BgPoEvent_PaintingEmpty = 0x80944570; // type:func +BgPoEvent_PaintingAppear = 0x809445A0; // type:func +BgPoEvent_PaintingVanish = 0x809445D8; // type:func +BgPoEvent_PaintingPresent = 0x80944628; // type:func +BgPoEvent_PaintingBurn = 0x80944884; // type:func +BgPoEvent_Update = 0x80944A30; // type:func +BgPoEvent_Draw = 0x80944AA0; // type:func +ObjMure_SetCullingImpl = 0x809450B0; // type:func +ObjMure_SetCulling = 0x80945108; // type:func +ObjMure_Init = 0x80945134; // type:func +ObjMure_Destroy = 0x809451E4; // type:func +ObjMure_GetMaxChildSpawns = 0x809451F4; // type:func +ObjMure_GetSpawnPos = 0x80945220; // type:func +ObjMure_SpawnActors0 = 0x80945248; // type:func +ObjMure_SpawnActors1 = 0x80945410; // type:func +ObjMure_SpawnActors = 0x8094555C; // type:func +ObjMure_KillActorsImpl = 0x809455AC; // type:func +ObjMure_KillActors = 0x809456A4; // type:func +ObjMure_CheckChildren = 0x809456C4; // type:func +ObjMure_InitialAction = 0x80945788; // type:func +ObjMure_CulledState = 0x809457A0; // type:func +ObjMure_SetFollowTargets = 0x80945800; // type:func +ObjMure_SetChildToFollowPlayer = 0x809458D8; // type:func +ObjMure_GroupBehavior0 = 0x80945A58; // type:func +ObjMure_GroupBehavior1 = 0x80945C80; // type:func +ObjMure_ActiveState = 0x80945E04; // type:func +ObjMure_Update = 0x80945EAC; // type:func +EnSw_CrossProduct = 0x809460C0; // type:func +func_80B0BE20 = 0x80946134; // type:func +func_80B0C020 = 0x80946334; // type:func +func_80B0C0CC = 0x809463E4; // type:func +EnSw_Init = 0x80946818; // type:func +EnSw_Destroy = 0x80946CE0; // type:func +func_80B0C9F0 = 0x80946D0C; // type:func +func_80B0CBE8 = 0x80946F08; // type:func +func_80B0CCF4 = 0x80947014; // type:func +func_80B0CEA8 = 0x809471C8; // type:func +func_80B0CF44 = 0x80947268; // type:func +func_80B0D14C = 0x80947470; // type:func +func_80B0D364 = 0x80947688; // type:func +func_80B0D3AC = 0x809476D0; // type:func +func_80B0D590 = 0x809478B8; // type:func +func_80B0D878 = 0x80947BA0; // type:func +func_80B0DB00 = 0x80947E28; // type:func +func_80B0DC7C = 0x80947FA8; // type:func +func_80B0DE34 = 0x80948164; // type:func +func_80B0DEA8 = 0x809481E0; // type:func +func_80B0DFFC = 0x80948334; // type:func +func_80B0E314 = 0x8094864C; // type:func +func_80B0E430 = 0x80948764; // type:func +func_80B0E5E0 = 0x80948914; // type:func +func_80B0E728 = 0x80948A60; // type:func +func_80B0E90C = 0x80948C44; // type:func +func_80B0E9BC = 0x80948CF4; // type:func +EnSw_Update = 0x80948DA4; // type:func +EnSw_OverrideLimbDraw = 0x80948E00; // type:func +EnSw_PostLimbDraw = 0x809490A4; // type:func +func_80B0EDB8 = 0x809490BC; // type:func +func_80B0EEA4 = 0x80949174; // type:func +EnSw_Draw = 0x809491A0; // type:func +BossFd_SpawnEmber = 0x809498B0; // type:func +BossFd_SpawnDebris = 0x8094997C; // type:func +BossFd_SpawnDust = 0x80949A4C; // type:func +BossFd_SpawnFireBreath = 0x80949AE4; // type:func +BossFd_SetCameraSpeed = 0x80949BF0; // type:func +BossFd_UpdateCamera = 0x80949C90; // type:func +BossFd_Init = 0x80949DFC; // type:func +BossFd_Destroy = 0x8094A11C; // type:func +BossFd_IsFacingLink = 0x8094A17C; // type:func +BossFd_SetupFly = 0x8094A1AC; // type:func +BossFd_Fly = 0x8094A21C; // type:func +BossFd_Wait = 0x8094C8A4; // type:func +BossFd_Effects = 0x8094CA94; // type:func +BossFd_CollisionCheck = 0x8094D6B4; // type:func +BossFd_Update = 0x8094D768; // type:func +BossFd_UpdateEffects = 0x8094DEA8; // type:func +BossFd_DrawEffects = 0x8094E300; // type:func +BossFd_Draw = 0x8094E9A0; // type:func +BossFd_OverrideRightArmDraw = 0x8094EA58; // type:func +BossFd_OverrideLeftArmDraw = 0x8094EB78; // type:func +BossFd_DrawMane = 0x8094EC98; // type:func +BossFd_OverrideHeadDraw = 0x8094F11C; // type:func +BossFd_PostHeadDraw = 0x8094F214; // type:func +BossFd_DrawBody = 0x8094F268; // type:func +ObjectKankyo_SetupAction = 0x80950C10; // type:func +ObjectKankyo_Init = 0x80950C1C; // type:func +ObjectKankyo_Destroy = 0x80950F1C; // type:func +ObjectKankyo_Snow = 0x80950F40; // type:func +ObjectKankyo_Fairies = 0x80950F50; // type:func +ObjectKankyo_Update = 0x80951D68; // type:func +ObjectKankyo_Draw = 0x80951D8C; // type:func +ObjectKankyo_DrawFairies = 0x80951E10; // type:func +ObjectKankyo_DrawSnow = 0x80952298; // type:func +ObjectKankyo_Lightning = 0x80952A60; // type:func +ObjectKankyo_DrawLightning = 0x80952B08; // type:func +ObjectKankyo_SunGraveSparkInit = 0x80952D04; // type:func +ObjectKankyo_WaitForSunGraveSparkObject = 0x80952D50; // type:func +ObjectKankyo_SunGraveSpark = 0x80952DC0; // type:func +ObjectKankyo_DrawSunGraveSpark = 0x80952E6C; // type:func +ObjectKankyo_InitBeams = 0x809533B4; // type:func +ObjectKankyo_WaitForBeamObject = 0x80953400; // type:func +ObjectKankyo_Beams = 0x80953460; // type:func +ObjectKankyo_DrawBeams = 0x80953540; // type:func +EnDu_SetupAction = 0x80953E90; // type:func +EnDu_GetTextId = 0x80953E9C; // type:func +EnDu_UpdateTalkState = 0x80953F40; // type:func +func_809FDDB4 = 0x8095401C; // type:func +func_809FDE24 = 0x8095408C; // type:func +func_809FDE9C = 0x80954104; // type:func +func_809FDFC0 = 0x80954228; // type:func +func_809FE000 = 0x8095426C; // type:func +func_809FE040 = 0x809542B0; // type:func +func_809FE104 = 0x80954374; // type:func +EnDu_Init = 0x8095441C; // type:func +EnDu_Destroy = 0x809545EC; // type:func +func_809FE3B4 = 0x8095462C; // type:func +func_809FE3C0 = 0x8095463C; // type:func +func_809FE4A4 = 0x80954724; // type:func +func_809FE638 = 0x809548BC; // type:func +func_809FE6CC = 0x80954954; // type:func +func_809FE740 = 0x809549C8; // type:func +func_809FE798 = 0x80954A20; // type:func +func_809FE890 = 0x80954B18; // type:func +func_809FEB08 = 0x80954D94; // type:func +func_809FEC14 = 0x80954EA0; // type:func +func_809FEC70 = 0x80954EFC; // type:func +func_809FECE4 = 0x80954F74; // type:func +EnDu_Update = 0x80954FAC; // type:func +EnDu_OverrideLimbDraw = 0x80955138; // type:func +EnDu_PostLimbDraw = 0x809552B4; // type:func +EnDu_Draw = 0x80955310; // type:func +EnFd_SpawnCore = 0x80955920; // type:func +EnFd_SpawnChildFire = 0x80955A18; // type:func +EnFd_SpawnDot = 0x80955B38; // type:func +EnFd_CheckHammer = 0x80955CA4; // type:func +EnFd_ColliderCheck = 0x80955D40; // type:func +EnFd_CanSeeActor = 0x80955ED8; // type:func +EnFd_FindBomb = 0x80955FE8; // type:func +EnFd_FindPotentialTheat = 0x809560A8; // type:func +EnFd_GetPosAdjAroundCircle = 0x8095611C; // type:func +EnFd_ShouldStopRunning = 0x809561E4; // type:func +EnFd_Fade = 0x80956318; // type:func +EnFd_Init = 0x80956428; // type:func +EnFd_Destroy = 0x80956564; // type:func +EnFd_Reappear = 0x80956590; // type:func +EnFd_SpinAndGrow = 0x80956620; // type:func +EnFd_JumpToGround = 0x809566F4; // type:func +EnFd_Land = 0x80956770; // type:func +EnFd_SpinAndSpawnFire = 0x80956850; // type:func +EnFd_Run = 0x80956A70; // type:func +EnFd_WaitForCore = 0x80956CD0; // type:func +EnFd_Update = 0x80956D48; // type:func +EnFd_OverrideLimbDraw = 0x80956F44; // type:func +EnFd_PostLimbDraw = 0x80956F80; // type:func +EnFd_Draw = 0x809572AC; // type:func +EnFd_SpawnEffect = 0x80957658; // type:func +EnFd_UpdateEffectsFlames = 0x80957748; // type:func +EnFd_UpdateEffectsDots = 0x80957860; // type:func +EnFd_DrawEffectsFlames = 0x8095797C; // type:func +EnFd_DrawEffectsDots = 0x80957D50; // type:func +func_80A693D0 = 0x809585C0; // type:func +func_80A6948C = 0x8095867C; // type:func +func_80A695A4 = 0x80958794; // type:func +EnHorseLinkChild_Init = 0x8095885C; // type:func +EnHorseLinkChild_Destroy = 0x80958A34; // type:func +func_80A6988C = 0x80958A84; // type:func +func_80A698F4 = 0x80958AE8; // type:func +func_80A6993C = 0x80958B30; // type:func +func_80A699FC = 0x80958BF0; // type:func +func_80A69B7C = 0x80958D78; // type:func +func_80A69C18 = 0x80958E18; // type:func +func_80A69EC0 = 0x809590C0; // type:func +func_80A69F5C = 0x80959160; // type:func +func_80A6A068 = 0x8095926C; // type:func +func_80A6A4DC = 0x809596E8; // type:func +func_80A6A5A4 = 0x809597B0; // type:func +func_80A6A724 = 0x80959930; // type:func +func_80A6A7D0 = 0x809599E0; // type:func +EnHorseLinkChild_Update = 0x80959CBC; // type:func +EnHorseLinkChild_PostDraw = 0x80959E14; // type:func +EnHorseLinkChild_OverrideLimbDraw = 0x80959FA0; // type:func +EnHorseLinkChild_Draw = 0x8095A028; // type:func +DoorAna_SetupAction = 0x8095A3C0; // type:func +DoorAna_Init = 0x8095A3CC; // type:func +DoorAna_Destroy = 0x8095A488; // type:func +DoorAna_WaitClosed = 0x8095A4C4; // type:func +DoorAna_WaitOpen = 0x8095A5FC; // type:func +DoorAna_GrabPlayer = 0x8095A7B0; // type:func +DoorAna_Update = 0x8095A85C; // type:func +DoorAna_Draw = 0x8095A8B0; // type:func +BgSpot02Objects_Init = 0x8095AA30; // type:func +BgSpot02Objects_Destroy = 0x8095ACA0; // type:func +func_808AC8FC = 0x8095ACD4; // type:func +func_808AC908 = 0x8095ACE4; // type:func +func_808ACA08 = 0x8095ADE4; // type:func +func_808ACAFC = 0x8095AEDC; // type:func +func_808ACB58 = 0x8095AF38; // type:func +BgSpot02Objects_Update = 0x8095AFB8; // type:func +BgSpot02Objects_Draw = 0x8095AFDC; // type:func +func_808ACC34 = 0x8095B018; // type:func +func_808ACCB8 = 0x8095B09C; // type:func +func_808AD3D4 = 0x8095B788; // type:func +func_808AD450 = 0x8095B804; // type:func +BgHaka_Init = 0x8095BD90; // type:func +BgHaka_Destroy = 0x8095BE0C; // type:func +BgHaka_CheckPlayerOnDirtPatch = 0x8095BE40; // type:func +BgHaka_IdleClosed = 0x8095BED0; // type:func +BgHaka_Pull = 0x8095C024; // type:func +BgHaka_IdleOpened = 0x8095C19C; // type:func +BgHaka_IdleLockedClosed = 0x8095C1D8; // type:func +BgHaka_Update = 0x8095C250; // type:func +BgHaka_Draw = 0x8095C274; // type:func +MagicWind_SetupAction = 0x8095C450; // type:func +MagicWind_Init = 0x8095C45C; // type:func +MagicWind_Destroy = 0x8095C568; // type:func +MagicWind_UpdateAlpha = 0x8095C59C; // type:func +MagicWind_WaitForTimer = 0x8095C6BC; // type:func +MagicWind_Grow = 0x8095C738; // type:func +MagicWind_WaitAtFullSize = 0x8095C788; // type:func +MagicWind_FadeOut = 0x8095C7D4; // type:func +MagicWind_Shrink = 0x8095C838; // type:func +MagicWind_Update = 0x8095C878; // type:func +MagicWind_OverrideLimbDraw = 0x8095C8CC; // type:func +MagicWind_Draw = 0x8095CA50; // type:func +MagicFire_Init = 0x8095E150; // type:func +MagicFire_Destroy = 0x8095E1FC; // type:func +MagicFire_UpdateBeforeCast = 0x8095E220; // type:func +MagicFire_Update = 0x8095E2C4; // type:func +MagicFire_Draw = 0x8095E658; // type:func +func_80AEAC10 = 0x80960450; // type:func +func_80AEAC54 = 0x80960494; // type:func +func_80AEACDC = 0x8096051C; // type:func +func_80AEAD20 = 0x80960560; // type:func +EnRu1_DestroyColliders = 0x809605D8; // type:func +func_80AEADD8 = 0x80960618; // type:func +func_80AEADE0 = 0x80960624; // type:func +func_80AEADF0 = 0x80960638; // type:func +EnRu1_Destroy = 0x80960648; // type:func +EnRu1_UpdateEyes = 0x80960668; // type:func +EnRu1_SetEyeIndex = 0x809606F0; // type:func +EnRu1_SetMouthIndex = 0x80960708; // type:func +func_80AEAECC = 0x80960720; // type:func +EnRu1_IsCsStateIdle = 0x80960788; // type:func +EnRu1_GetCue = 0x809607A8; // type:func +func_80AEAFA0 = 0x809607F4; // type:func +func_80AEAFE0 = 0x80960834; // type:func +func_80AEB020 = 0x80960874; // type:func +EnRu1_FindSwitch = 0x809608DC; // type:func +func_80AEB0EC = 0x80960924; // type:func +func_80AEB104 = 0x8096093C; // type:func +func_80AEB124 = 0x8096095C; // type:func +func_80AEB174 = 0x809609AC; // type:func +func_80AEB1B4 = 0x809609F0; // type:func +func_80AEB264 = 0x80960A1C; // type:func +EnRu1_UpdateSkelAnime = 0x80960AD8; // type:func +func_80AEB364 = 0x80960B1C; // type:func +func_80AEB3A4 = 0x80960B5C; // type:func +func_80AEB3CC = 0x80960B84; // type:func +func_80AEB3DC = 0x80960B98; // type:func +EnRu1_GetCueChannel3 = 0x80960BF4; // type:func +func_80AEB458 = 0x80960C14; // type:func +func_80AEB480 = 0x80960C3C; // type:func +EnRu1_SpawnRipple = 0x80960C64; // type:func +func_80AEB50C = 0x80960CCC; // type:func +func_80AEB59C = 0x80960D5C; // type:func +EnRu1_SpawnSplash = 0x80960E48; // type:func +func_80AEB6E0 = 0x80960EAC; // type:func +func_80AEB738 = 0x80960F08; // type:func +func_80AEB7D0 = 0x80960FA0; // type:func +func_80AEB7E0 = 0x80960FB4; // type:func +func_80AEB87C = 0x80961050; // type:func +func_80AEB89C = 0x80961074; // type:func +func_80AEB914 = 0x809610EC; // type:func +func_80AEB934 = 0x8096110C; // type:func +func_80AEB954 = 0x8096112C; // type:func +func_80AEB974 = 0x8096114C; // type:func +func_80AEBA0C = 0x809611E4; // type:func +func_80AEBA2C = 0x80961204; // type:func +func_80AEBAFC = 0x809612D4; // type:func +func_80AEBB3C = 0x80961318; // type:func +func_80AEBB78 = 0x80961358; // type:func +func_80AEBBF4 = 0x809613D8; // type:func +func_80AEBC30 = 0x80961418; // type:func +func_80AEBC84 = 0x80961470; // type:func +func_80AEBCB8 = 0x809614A8; // type:func +func_80AEBD1C = 0x8096150C; // type:func +func_80AEBD94 = 0x80961584; // type:func +func_80AEBE3C = 0x8096162C; // type:func +func_80AEBEC8 = 0x809616BC; // type:func +func_80AEBF60 = 0x80961754; // type:func +func_80AEBFD8 = 0x809617D0; // type:func +func_80AEC070 = 0x80961868; // type:func +func_80AEC0B4 = 0x809618B0; // type:func +func_80AEC100 = 0x80961904; // type:func +func_80AEC130 = 0x80961938; // type:func +func_80AEC17C = 0x80961988; // type:func +func_80AEC1D4 = 0x809619E8; // type:func +func_80AEC244 = 0x80961A5C; // type:func +func_80AEC2C0 = 0x80961ADC; // type:func +func_80AEC320 = 0x80961B40; // type:func +func_80AEC40C = 0x80961C34; // type:func +func_80AEC4CC = 0x80961CF4; // type:func +func_80AEC4F4 = 0x80961D1C; // type:func +func_80AEC5FC = 0x80961E24; // type:func +func_80AEC650 = 0x80961E78; // type:func +func_80AEC6B0 = 0x80961EDC; // type:func +func_80AEC6E4 = 0x80961F14; // type:func +func_80AEC780 = 0x80961FB4; // type:func +func_80AEC81C = 0x80962054; // type:func +func_80AEC8B8 = 0x809620F0; // type:func +func_80AEC93C = 0x80962178; // type:func +func_80AEC9C4 = 0x80962200; // type:func +func_80AECA18 = 0x80962254; // type:func +func_80AECA44 = 0x80962284; // type:func +func_80AECA94 = 0x809622D8; // type:func +func_80AECAB4 = 0x809622F8; // type:func +func_80AECAD4 = 0x80962318; // type:func +func_80AECB18 = 0x80962360; // type:func +func_80AECB60 = 0x809623AC; // type:func +func_80AECBB8 = 0x80962408; // type:func +func_80AECC1C = 0x80962470; // type:func +func_80AECC84 = 0x809624DC; // type:func +func_80AECCB0 = 0x80962508; // type:func +func_80AECDA0 = 0x809625F8; // type:func +func_80AECE04 = 0x8096265C; // type:func +func_80AECE20 = 0x8096267C; // type:func +func_80AECEB4 = 0x8096270C; // type:func +func_80AECF6C = 0x809627C4; // type:func +func_80AED084 = 0x809628DC; // type:func +func_80AED0B0 = 0x80962908; // type:func +func_80AED0C8 = 0x80962920; // type:func +func_80AED0D8 = 0x80962934; // type:func +func_80AED110 = 0x8096296C; // type:func +func_80AED154 = 0x809629B0; // type:func +func_80AED19C = 0x809629F8; // type:func +func_80AED218 = 0x80962A74; // type:func +func_80AED304 = 0x80962B64; // type:func +func_80AED324 = 0x80962B84; // type:func +func_80AED344 = 0x80962BA4; // type:func +func_80AED374 = 0x80962BD8; // type:func +func_80AED3A4 = 0x80962C0C; // type:func +func_80AED3E0 = 0x80962C4C; // type:func +func_80AED414 = 0x80962C84; // type:func +func_80AED44C = 0x80962CC4; // type:func +func_80AED4FC = 0x80962D78; // type:func +func_80AED520 = 0x80962DA0; // type:func +func_80AED57C = 0x80962E00; // type:func +func_80AED5B8 = 0x80962E40; // type:func +func_80AED5DC = 0x80962E68; // type:func +func_80AED600 = 0x80962E90; // type:func +func_80AED624 = 0x80962EB8; // type:func +func_80AED6DC = 0x80962F70; // type:func +func_80AED6F8 = 0x80962F90; // type:func +func_80AED738 = 0x80962FD0; // type:func +func_80AED83C = 0x809630D8; // type:func +func_80AED8DC = 0x8096317C; // type:func +func_80AEDAE0 = 0x80963380; // type:func +func_80AEDB30 = 0x809633D4; // type:func +func_80AEDEF4 = 0x80963794; // type:func +func_80AEDFF4 = 0x80963898; // type:func +func_80AEE02C = 0x809638D8; // type:func +func_80AEE050 = 0x80963900; // type:func +func_80AEE264 = 0x80963B1C; // type:func +func_80AEE2F8 = 0x80963BB0; // type:func +func_80AEE394 = 0x80963C4C; // type:func +func_80AEE488 = 0x80963D40; // type:func +func_80AEE568 = 0x80963E20; // type:func +func_80AEE628 = 0x80963EE4; // type:func +func_80AEE6D0 = 0x80963F88; // type:func +func_80AEE7C4 = 0x8096407C; // type:func +func_80AEEAC8 = 0x8096439C; // type:func +func_80AEEB24 = 0x809643F8; // type:func +func_80AEEBB4 = 0x80964488; // type:func +func_80AEEBD4 = 0x809644A8; // type:func +func_80AEEC5C = 0x80964534; // type:func +func_80AEECF0 = 0x809645CC; // type:func +func_80AEED58 = 0x80964638; // type:func +func_80AEEDCC = 0x809646B0; // type:func +func_80AEEE34 = 0x8096471C; // type:func +func_80AEEE9C = 0x80964788; // type:func +func_80AEEF08 = 0x809647F8; // type:func +func_80AEEF5C = 0x80964850; // type:func +func_80AEEF68 = 0x80964860; // type:func +func_80AEEFEC = 0x809648E8; // type:func +func_80AEF080 = 0x8096497C; // type:func +func_80AEF0BC = 0x809649BC; // type:func +func_80AEF170 = 0x80964A74; // type:func +func_80AEF188 = 0x80964A8C; // type:func +func_80AEF1F0 = 0x80964AF4; // type:func +func_80AEF29C = 0x80964BA0; // type:func +func_80AEF2AC = 0x80964BB4; // type:func +func_80AEF2D0 = 0x80964BDC; // type:func +func_80AEF354 = 0x80964C68; // type:func +func_80AEF3A8 = 0x80964CC4; // type:func +func_80AEF40C = 0x80964D2C; // type:func +func_80AEF4A8 = 0x80964DCC; // type:func +func_80AEF4E0 = 0x80964E04; // type:func +func_80AEF51C = 0x80964E44; // type:func +func_80AEF540 = 0x80964E6C; // type:func +func_80AEF5B8 = 0x80964EE8; // type:func +func_80AEF624 = 0x80964F58; // type:func +func_80AEF728 = 0x8096505C; // type:func +func_80AEF79C = 0x809650D0; // type:func +func_80AEF820 = 0x80965158; // type:func +func_80AEF890 = 0x809651C8; // type:func +func_80AEF930 = 0x80965254; // type:func +func_80AEF99C = 0x809652C4; // type:func +func_80AEF9D8 = 0x80965300; // type:func +func_80AEFA2C = 0x80965344; // type:func +func_80AEFAAC = 0x809653BC; // type:func +func_80AEFB04 = 0x80965404; // type:func +func_80AEFB68 = 0x80965460; // type:func +func_80AEFBC8 = 0x809654B8; // type:func +func_80AEFC24 = 0x80965518; // type:func +func_80AEFC54 = 0x8096554C; // type:func +func_80AEFCE8 = 0x809655E8; // type:func +func_80AEFD38 = 0x80965638; // type:func +func_80AEFDC0 = 0x809656C4; // type:func +func_80AEFE38 = 0x80965748; // type:func +func_80AEFE84 = 0x80965794; // type:func +func_80AEFE9C = 0x809657AC; // type:func +func_80AEFECC = 0x809657E0; // type:func +func_80AEFF40 = 0x8096585C; // type:func +func_80AEFF94 = 0x809658B8; // type:func +EnRu1_Update = 0x80965954; // type:func +EnRu1_Init = 0x8096599C; // type:func +func_80AF0278 = 0x80965AD8; // type:func +EnRu1_OverrideLimbDraw = 0x80965B48; // type:func +EnRu1_PostLimbDraw = 0x80965BB4; // type:func +EnRu1_DrawNothing = 0x80965C40; // type:func +EnRu1_DrawOpa = 0x80965C50; // type:func +EnRu1_DrawXlu = 0x80965DF4; // type:func +EnRu1_Draw = 0x80965F94; // type:func +BossFd2_SpawnDebris = 0x80967AF0; // type:func +BossFd2_SpawnFireBreath = 0x80967BC8; // type:func +BossFd2_SpawnEmber = 0x80967CDC; // type:func +BossFd2_SpawnSkullPiece = 0x80967DB0; // type:func +BossFd2_SpawnDust = 0x80967E88; // type:func +BossFd2_Init = 0x80967F20; // type:func +BossFd2_Destroy = 0x8096801C; // type:func +BossFd2_SetupEmerge = 0x8096805C; // type:func +BossFd2_Emerge = 0x80968154; // type:func +BossFd2_SetupIdle = 0x80968494; // type:func +BossFd2_Idle = 0x8096853C; // type:func +BossFd2_SetupBurrow = 0x80968690; // type:func +BossFd2_Burrow = 0x80968708; // type:func +BossFd2_SetupBreatheFire = 0x809687D8; // type:func +BossFd2_BreatheFire = 0x8096883C; // type:func +BossFd2_SetupClawSwipe = 0x80968D80; // type:func +BossFd2_ClawSwipe = 0x80968DE0; // type:func +BossFd2_SetupVulnerable = 0x80968E58; // type:func +BossFd2_Vulnerable = 0x80968EB4; // type:func +BossFd2_SetupDamaged = 0x8096910C; // type:func +BossFd2_Damaged = 0x80969168; // type:func +BossFd2_SetupDeath = 0x80969298; // type:func +BossFd2_UpdateCamera = 0x80969328; // type:func +BossFd2_Death = 0x80969498; // type:func +BossFd2_Wait = 0x80969B1C; // type:func +BossFd2_CollisionCheck = 0x80969B64; // type:func +BossFd2_UpdateFace = 0x8096A004; // type:func +BossFd2_Update = 0x8096A170; // type:func +BossFd2_OverrideLimbDraw = 0x8096A324; // type:func +BossFd2_PostLimbDraw = 0x8096A518; // type:func +BossFd2_UpdateMane = 0x8096A5C0; // type:func +BossFd2_DrawMane = 0x8096AB94; // type:func +BossFd2_Draw = 0x8096AFD8; // type:func +EnFdFire_UpdatePos = 0x8096B820; // type:func +EnFdFire_CheckCollider = 0x8096B8E8; // type:func +EnFdFire_Init = 0x8096B94C; // type:func +EnFdFire_Destroy = 0x8096BA54; // type:func +func_80A0E70C = 0x8096BA80; // type:func +EnFdFire_WaitToDie = 0x8096BBBC; // type:func +EnFdFire_DanceTowardsPlayer = 0x8096BBF8; // type:func +EnFdFire_Disappear = 0x8096BDA8; // type:func +EnFdFire_Update = 0x8096BE5C; // type:func +EnFdFire_Draw = 0x8096BF58; // type:func +EnDh_SetupAction = 0x8096C530; // type:func +EnDh_Init = 0x8096C53C; // type:func +EnDh_Destroy = 0x8096C678; // type:func +EnDh_SpawnDebris = 0x8096C6C0; // type:func +EnDh_SetupWait = 0x8096C858; // type:func +EnDh_Wait = 0x8096C90C; // type:func +EnDh_SetupWalk = 0x8096CB30; // type:func +EnDh_Walk = 0x8096CBCC; // type:func +EnDh_SetupRetreat = 0x8096CCD4; // type:func +EnDh_Retreat = 0x8096CD38; // type:func +EnDh_SetupAttack = 0x8096CDC4; // type:func +EnDh_Attack = 0x8096CE24; // type:func +EnDh_SetupBurrow = 0x8096D134; // type:func +EnDh_Burrow = 0x8096D1B8; // type:func +EnDh_SetupDamage = 0x8096D348; // type:func +EnDh_Damage = 0x8096D3C8; // type:func +EnDh_SetupDeath = 0x8096D4F0; // type:func +EnDh_Death = 0x8096D578; // type:func +EnDh_CollisionCheck = 0x8096D6A8; // type:func +EnDh_Update = 0x8096D7F8; // type:func +EnDh_PostLimbDraw = 0x8096D9A8; // type:func +EnDh_Draw = 0x8096DA38; // type:func +EnDha_SetupAction = 0x8096E010; // type:func +EnDha_Init = 0x8096E01C; // type:func +EnDha_Destroy = 0x8096E138; // type:func +EnDha_SetupWait = 0x8096E164; // type:func +EnDha_Wait = 0x8096E1EC; // type:func +EnDha_SetupTakeDamage = 0x8096E6FC; // type:func +EnDha_TakeDamage = 0x8096E728; // type:func +EnDha_SetupDeath = 0x8096E7F0; // type:func +EnDha_Die = 0x8096E860; // type:func +EnDha_UpdateHealth = 0x8096EA1C; // type:func +EnDha_Update = 0x8096EB10; // type:func +EnDha_OverrideLimbDraw = 0x8096EBB8; // type:func +EnDha_PostLimbDraw = 0x8096EC58; // type:func +EnDha_Draw = 0x8096ED70; // type:func +EnRl_Destroy = 0x8096F010; // type:func +func_80AE72D0 = 0x8096F034; // type:func +func_80AE744C = 0x8096F0BC; // type:func +func_80AE7494 = 0x8096F104; // type:func +func_80AE74B4 = 0x8096F128; // type:func +func_80AE74FC = 0x8096F174; // type:func +func_80AE7544 = 0x8096F1C0; // type:func +func_80AE7590 = 0x8096F20C; // type:func +func_80AE7668 = 0x8096F2EC; // type:func +func_80AE7698 = 0x8096F320; // type:func +func_80AE772C = 0x8096F3B4; // type:func +func_80AE7798 = 0x8096F420; // type:func +func_80AE77B8 = 0x8096F440; // type:func +func_80AE77F8 = 0x8096F488; // type:func +func_80AE7838 = 0x8096F4CC; // type:func +func_80AE7878 = 0x8096F514; // type:func +func_80AE78D4 = 0x8096F56C; // type:func +func_80AE7954 = 0x8096F5EC; // type:func +func_80AE79A4 = 0x8096F63C; // type:func +func_80AE7AF8 = 0x8096F790; // type:func +func_80AE7BF8 = 0x8096F89C; // type:func +func_80AE7C64 = 0x8096F908; // type:func +func_80AE7C94 = 0x8096F928; // type:func +func_80AE7CE8 = 0x8096F970; // type:func +func_80AE7D40 = 0x8096F9B4; // type:func +func_80AE7D94 = 0x8096F9FC; // type:func +EnRl_Update = 0x8096FB44; // type:func +EnRl_Init = 0x8096FB8C; // type:func +func_80AE7FD0 = 0x8096FBF8; // type:func +func_80AE7FDC = 0x8096FC08; // type:func +EnRl_Draw = 0x8096FD3C; // type:func +EnEncount1_Init = 0x8096FEF0; // type:func +EnEncount1_SpawnLeevers = 0x80970024; // type:func +EnEncount1_SpawnTektites = 0x80970380; // type:func +EnEncount1_SpawnStalchildOrWolfos = 0x80970518; // type:func +EnEncount1_Update = 0x8097096C; // type:func +DemoDu_Destroy = 0x80970A50; // type:func +DemoDu_UpdateEyes = 0x80970A74; // type:func +DemoDu_SetEyeTexIndex = 0x80970AFC; // type:func +DemoDu_SetMouthTexIndex = 0x80970B14; // type:func +DemoDu_UpdateSkelAnime = 0x80970B2C; // type:func +DemoDu_UpdateBgCheckInfo = 0x80970B50; // type:func +DemoDu_GetCue = 0x80970B98; // type:func +DemoDu_CheckForCue = 0x80970BC0; // type:func +DemoDu_CheckForNoCue = 0x80970C0C; // type:func +DemoDu_SetStartPosRotFromCue = 0x80970C58; // type:func +func_80969DDC = 0x80970CD8; // type:func +DemoDu_InitCs_FireMedallion = 0x80970D68; // type:func +DemoDu_CsFireMedallion_SpawnDoorWarp = 0x80970DD8; // type:func +func_80969F38 = 0x80970E34; // type:func +func_80969FB4 = 0x80970EB0; // type:func +DemoDu_CsFireMedallion_AdvanceTo01 = 0x80970ED0; // type:func +DemoDu_CsFireMedallion_AdvanceTo02 = 0x80970F68; // type:func +DemoDu_CsFireMedallion_AdvanceTo03 = 0x80970FB8; // type:func +DemoDu_CsFireMedallion_AdvanceTo04 = 0x80970FE4; // type:func +DemoDu_CsFireMedallion_AdvanceTo05 = 0x80971078; // type:func +DemoDu_CsFireMedallion_AdvanceTo06 = 0x809710E4; // type:func +DemoDu_UpdateCs_FM_00 = 0x80971130; // type:func +DemoDu_UpdateCs_FM_01 = 0x80971150; // type:func +DemoDu_UpdateCs_FM_02 = 0x80971170; // type:func +DemoDu_UpdateCs_FM_03 = 0x809711A4; // type:func +DemoDu_UpdateCs_FM_04 = 0x809711E4; // type:func +DemoDu_UpdateCs_FM_05 = 0x8097121C; // type:func +DemoDu_UpdateCs_FM_06 = 0x8097125C; // type:func +DemoDu_InitCs_GoronsRuby = 0x80971288; // type:func +DemoDu_CsPlaySfx_GoronLanding = 0x809712D8; // type:func +DemoDu_CsPlaySfx_DaruniaFalling = 0x80971300; // type:func +DemoDu_CsPlaySfx_DaruniaHitsLink = 0x80971330; // type:func +DemoDu_CsPlaySfx_HitBreast = 0x80971388; // type:func +DemoDu_CsPlaySfx_LinkEscapeFromGorons = 0x809713B0; // type:func +DemoDu_CsPlaySfx_LinkSurprised = 0x80971408; // type:func +DemoDu_CsGoronsRuby_UpdateFaceTextures = 0x80971460; // type:func +func_8096A630 = 0x80971568; // type:func +DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink = 0x8097161C; // type:func +DemoDu_CsGoronsRuby_DaruniaFalling = 0x809718B0; // type:func +DemoDu_CsGoronsRuby_AdvanceTo01 = 0x8097198C; // type:func +DemoDu_CsGoronsRuby_AdvanceTo02 = 0x809719A0; // type:func +DemoDu_CsGoronsRuby_AdvanceTo03 = 0x80971A44; // type:func +DemoDu_CsGoronsRuby_AdvanceTo04 = 0x80971A98; // type:func +DemoDu_CsGoronsRuby_AdvanceTo05 = 0x80971AD0; // type:func +DemoDu_CsGoronsRuby_AdvanceTo06 = 0x80971B3C; // type:func +DemoDu_CsGoronsRuby_AdvanceTo07 = 0x80971BD4; // type:func +DemoDu_CsGoronsRuby_AdvanceTo08 = 0x80971C40; // type:func +DemoDu_CsGoronsRuby_AdvanceTo09 = 0x80971CD4; // type:func +DemoDu_CsGoronsRuby_AdvanceTo10 = 0x80971D44; // type:func +DemoDu_CsGoronsRuby_AdvanceTo11 = 0x80971DB0; // type:func +DemoDu_CsGoronsRuby_AdvanceTo12 = 0x80971E44; // type:func +DemoDu_CsGoronsRuby_AdvanceTo13 = 0x80971EB0; // type:func +DemoDu_UpdateCs_GR_00 = 0x80971F40; // type:func +DemoDu_UpdateCs_GR_01 = 0x80971F74; // type:func +DemoDu_UpdateCs_GR_02 = 0x80971FB0; // type:func +DemoDu_UpdateCs_GR_03 = 0x8097200C; // type:func +DemoDu_UpdateCs_GR_04 = 0x8097204C; // type:func +DemoDu_UpdateCs_GR_05 = 0x8097209C; // type:func +DemoDu_UpdateCs_GR_06 = 0x809720E8; // type:func +DemoDu_UpdateCs_GR_07 = 0x80972148; // type:func +DemoDu_UpdateCs_GR_08 = 0x80972194; // type:func +DemoDu_UpdateCs_GR_09 = 0x809721F8; // type:func +DemoDu_UpdateCs_GR_10 = 0x80972258; // type:func +DemoDu_UpdateCs_GR_11 = 0x809722A4; // type:func +DemoDu_UpdateCs_GR_12 = 0x809722F4; // type:func +DemoDu_UpdateCs_GR_13 = 0x80972340; // type:func +DemoDu_InitCs_AfterGanon = 0x80972388; // type:func +DemoDu_CsPlaySfx_WhiteOut = 0x80972428; // type:func +DemoDu_CsAfterGanon_SpawnDemo6K = 0x80972448; // type:func +DemoDu_CsAfterGanon_AdvanceTo01 = 0x809724C8; // type:func +DemoDu_CsAfterGanon_AdvanceTo02 = 0x8097251C; // type:func +DemoDu_CsAfterGanon_BackTo01 = 0x80972670; // type:func +DemoDu_UpdateCs_AG_00 = 0x8097270C; // type:func +DemoDu_UpdateCs_AG_01 = 0x8097272C; // type:func +DemoDu_UpdateCs_AG_02 = 0x80972774; // type:func +DemoDu_Draw_02 = 0x809727BC; // type:func +DemoDu_InitCs_Credits = 0x80972978; // type:func +DemoDu_CsCredits_UpdateShadowAlpha = 0x809729E4; // type:func +DemoDu_CsCredits_AdvanceTo01 = 0x80972A70; // type:func +DemoDu_CsCredits_AdvanceTo02 = 0x80972AA8; // type:func +DemoDu_CsCredits_AdvanceTo03 = 0x80972AF4; // type:func +DemoDu_CsCredits_AdvanceTo04 = 0x80972B34; // type:func +DemoDu_CsCredits_BackTo02 = 0x80972B74; // type:func +DemoDu_CsCredits_HandleCues = 0x80972BBC; // type:func +DemoDu_UpdateCs_CR_00 = 0x80972C68; // type:func +DemoDu_UpdateCs_CR_01 = 0x80972C88; // type:func +DemoDu_UpdateCs_CR_02 = 0x80972CD4; // type:func +DemoDu_UpdateCs_CR_03 = 0x80972D1C; // type:func +DemoDu_UpdateCs_CR_04 = 0x80972D64; // type:func +DemoDu_Update = 0x80972DA8; // type:func +DemoDu_Init = 0x80972DF0; // type:func +DemoDu_Draw_NoDraw = 0x80972E94; // type:func +DemoDu_Draw_01 = 0x80972EA4; // type:func +DemoDu_Draw = 0x8097304C; // type:func +func_80984BE0 = 0x80974230; // type:func +DemoIm_InitCollider = 0x809742B8; // type:func +DemoIm_DestroyCollider = 0x80974304; // type:func +DemoIm_UpdateCollider = 0x80974330; // type:func +func_80984DB8 = 0x80974374; // type:func +func_80984E58 = 0x80974418; // type:func +func_80984F10 = 0x809744D0; // type:func +func_80984F94 = 0x80974558; // type:func +DemoIm_UpdateBgCheckInfo = 0x809745E0; // type:func +DemoIm_UpdateSkelAnime = 0x80974628; // type:func +DemoIm_IsCutsceneIdle = 0x8097464C; // type:func +DemoIm_GetCue = 0x8097466C; // type:func +func_809850E8 = 0x809746B8; // type:func +func_80985134 = 0x80974704; // type:func +func_80985180 = 0x80974750; // type:func +func_80985200 = 0x809747D0; // type:func +DemoIm_ChangeAnim = 0x80974850; // type:func +func_80985310 = 0x809748E0; // type:func +func_80985358 = 0x80974928; // type:func +func_809853B4 = 0x80974984; // type:func +func_80985430 = 0x80974A00; // type:func +func_8098544C = 0x80974A20; // type:func +func_809854DC = 0x80974ABC; // type:func +func_8098557C = 0x80974B5C; // type:func +func_809855A8 = 0x80974B88; // type:func +func_80985640 = 0x80974C20; // type:func +func_809856AC = 0x80974C8C; // type:func +func_809856F8 = 0x80974CD8; // type:func +func_80985718 = 0x80974CF8; // type:func +func_80985738 = 0x80974D18; // type:func +func_80985770 = 0x80974D54; // type:func +func_809857B0 = 0x80974D9C; // type:func +func_809857F0 = 0x80974DE0; // type:func +func_80985830 = 0x80974E28; // type:func +func_80985860 = 0x80974E5C; // type:func +func_809858A8 = 0x80974EA0; // type:func +DemoIm_SpawnLightBall = 0x80974EC0; // type:func +func_80985948 = 0x80974F40; // type:func +func_809859E0 = 0x80974FDC; // type:func +func_80985B34 = 0x80975130; // type:func +func_80985C10 = 0x80975214; // type:func +func_80985C40 = 0x80975234; // type:func +func_80985C94 = 0x8097527C; // type:func +DemoIm_DrawTranslucent = 0x809752C4; // type:func +func_80985E60 = 0x8097540C; // type:func +func_80985EAC = 0x80975458; // type:func +func_80985EF4 = 0x809754A0; // type:func +func_80985F54 = 0x80975500; // type:func +func_80985F64 = 0x80975514; // type:func +func_80985FE8 = 0x80975598; // type:func +func_8098604C = 0x809755FC; // type:func +func_809860C8 = 0x80975678; // type:func +func_809860DC = 0x80975690; // type:func +func_80986148 = 0x809756FC; // type:func +func_809861C4 = 0x80975778; // type:func +func_8098629C = 0x8097583C; // type:func +func_809862E0 = 0x80975880; // type:func +func_809863BC = 0x80975948; // type:func +func_809863DC = 0x80975968; // type:func +func_80986430 = 0x809759C4; // type:func +func_80986494 = 0x80975A30; // type:func +func_809864D4 = 0x80975A78; // type:func +func_8098652C = 0x80975AD8; // type:func +func_80986570 = 0x80975B1C; // type:func +func_809865F8 = 0x80975BA4; // type:func +func_80986700 = 0x80975CB4; // type:func +func_80986710 = 0x80975CC8; // type:func +func_80986794 = 0x80975D4C; // type:func +func_8098680C = 0x80975DC4; // type:func +func_809868E8 = 0x80975E8C; // type:func +func_80986908 = 0x80975EAC; // type:func +func_80986948 = 0x80975EF4; // type:func +func_809869B0 = 0x80975F64; // type:func +func_809869F8 = 0x80975FA8; // type:func +func_80986A5C = 0x8097600C; // type:func +func_80986AD0 = 0x80976080; // type:func +func_80986B2C = 0x809760DC; // type:func +func_80986BA0 = 0x80976150; // type:func +func_80986BE4 = 0x80976194; // type:func +func_80986BF8 = 0x809761A8; // type:func +func_80986C30 = 0x809761E0; // type:func +func_80986CC8 = 0x80976284; // type:func +func_80986CFC = 0x809762B8; // type:func +func_80986D40 = 0x80976300; // type:func +func_80986DC8 = 0x80976368; // type:func +func_80986E20 = 0x809763C4; // type:func +func_80986E40 = 0x809763E4; // type:func +func_80986EAC = 0x80976458; // type:func +func_80986F08 = 0x809764BC; // type:func +func_80986F28 = 0x809764DC; // type:func +func_80986F88 = 0x80976544; // type:func +func_80986FA8 = 0x80976568; // type:func +func_80987018 = 0x809765E0; // type:func +func_80987064 = 0x80976628; // type:func +func_809870F0 = 0x809766B4; // type:func +func_80987128 = 0x809766EC; // type:func +func_80987174 = 0x80976738; // type:func +func_809871B4 = 0x80976778; // type:func +func_809871E8 = 0x809767AC; // type:func +func_80987288 = 0x80976838; // type:func +func_809872A8 = 0x80976858; // type:func +func_809872F0 = 0x809768A4; // type:func +func_80987330 = 0x809768EC; // type:func +DemoIm_Update = 0x80976930; // type:func +DemoIm_Init = 0x80976978; // type:func +DemoIm_Destroy = 0x80976AA0; // type:func +DemoIm_OverrideLimbDraw = 0x80976AC0; // type:func +DemoIm_PostLimbDraw = 0x80976B70; // type:func +DemoIm_DrawNothing = 0x80976BFC; // type:func +DemoIm_DrawSolid = 0x80976C0C; // type:func +DemoIm_Draw = 0x80976D50; // type:func +DemoTreLgt_Init = 0x809781A0; // type:func +DemoTreLgt_Destroy = 0x809781FC; // type:func +func_80993754 = 0x80978228; // type:func +func_8099375C = 0x80978234; // type:func +func_809937B4 = 0x8097828C; // type:func +func_80993848 = 0x80978324; // type:func +DemoTreLgt_Update = 0x809785D8; // type:func +DemoTreLgt_OverrideLimbDraw = 0x8097860C; // type:func +DemoTreLgt_Draw = 0x80978760; // type:func +EnFw_DoBounce = 0x809788B0; // type:func +EnFw_PlayerInRange = 0x80978978; // type:func +EnFw_GetPosAdjAroundCircle = 0x80978A74; // type:func +EnFw_CheckCollider = 0x80978B48; // type:func +EnFw_SpawnDust = 0x80978C08; // type:func +EnFw_Init = 0x80978E50; // type:func +EnFw_Destroy = 0x80978F58; // type:func +EnFw_Bounce = 0x80978F84; // type:func +EnFw_Run = 0x80978FF0; // type:func +EnFw_TurnToParentInitPos = 0x809795C4; // type:func +EnFw_JumpToParentInitPos = 0x809796B8; // type:func +EnFw_Update = 0x8097976C; // type:func +EnFw_OverrideLimbDraw = 0x8097984C; // type:func +EnFw_PostLimbDraw = 0x80979868; // type:func +EnFw_Draw = 0x80979904; // type:func +EnFw_SpawnEffectDust = 0x8097998C; // type:func +EnFw_UpdateEffects = 0x80979A30; // type:func +EnFw_DrawEffects = 0x80979B3C; // type:func +BgVbSima_Init = 0x8097A070; // type:func +BgVbSima_Destroy = 0x8097A0D8; // type:func +BgVbSima_SpawnEmber = 0x8097A10C; // type:func +BgVbSima_Update = 0x8097A1D8; // type:func +BgVbSima_Draw = 0x8097A638; // type:func +EnVbBall_Init = 0x8097A790; // type:func +EnVbBall_Destroy = 0x8097A910; // type:func +EnVbBall_SpawnDebris = 0x8097A94C; // type:func +EnVbBall_SpawnDust = 0x8097AA24; // type:func +EnVbBall_UpdateBones = 0x8097AAC4; // type:func +EnVbBall_Update = 0x8097ADA8; // type:func +EnVbBall_Draw = 0x8097B574; // type:func +BgHakaMegane_Init = 0x8097B940; // type:func +BgHakaMegane_Destroy = 0x8097B9F8; // type:func +func_8087DB24 = 0x8097BA2C; // type:func +func_8087DBF0 = 0x8097BAFC; // type:func +BgHakaMegane_DoNothing = 0x8097BB70; // type:func +BgHakaMegane_Update = 0x8097BB80; // type:func +BgHakaMegane_Draw = 0x8097BBA4; // type:func +BgHakaMeganeBG_Init = 0x8097BD40; // type:func +BgHakaMeganeBG_Destroy = 0x8097BEDC; // type:func +func_8087DFF8 = 0x8097BF10; // type:func +func_8087E040 = 0x8097BF58; // type:func +func_8087E10C = 0x8097C024; // type:func +func_8087E1E0 = 0x8097C0F8; // type:func +func_8087E258 = 0x8097C170; // type:func +func_8087E288 = 0x8097C1A0; // type:func +func_8087E2D8 = 0x8097C1F0; // type:func +func_8087E34C = 0x8097C264; // type:func +BgHakaMeganeBG_Update = 0x8097C274; // type:func +BgHakaMeganeBG_Draw = 0x8097C298; // type:func +BgHakaShip_Init = 0x8097C400; // type:func +BgHakaShip_Destroy = 0x8097C544; // type:func +BgHakaShip_ChildUpdatePosition = 0x8097C584; // type:func +BgHakaShip_WaitForSong = 0x8097C5E0; // type:func +BgHakaShip_CutsceneStationary = 0x8097C658; // type:func +BgHakaShip_Move = 0x8097C6F4; // type:func +BgHakaShip_SetupCrash = 0x8097C8B8; // type:func +BgHakaShip_CrashShake = 0x8097C914; // type:func +BgHakaShip_CrashFall = 0x8097C9A4; // type:func +BgHakaShip_Update = 0x8097CA64; // type:func +BgHakaShip_Draw = 0x8097CAA4; // type:func +BgHakaSgami_Init = 0x8097CE50; // type:func +BgHakaSgami_Destroy = 0x8097D0F8; // type:func +BgHakaSgami_SetupSpin = 0x8097D158; // type:func +BgHakaSgami_Spin = 0x8097D1D0; // type:func +BgHakaSgami_Update = 0x8097D6E4; // type:func +BgHakaSgami_Draw = 0x8097D738; // type:func +EnHeishi2_Init = 0x8097DA70; // type:func +EnHeishi2_Destroy = 0x8097DCF0; // type:func +EnHeishi2_DoNothing1 = 0x8097DD34; // type:func +EnHeishi_DoNothing2 = 0x8097DD44; // type:func +func_80A531E4 = 0x8097DD54; // type:func +func_80A53278 = 0x8097DDE8; // type:func +func_80A5344C = 0x8097DF68; // type:func +func_80A53538 = 0x8097E054; // type:func +func_80A535BC = 0x8097E0DC; // type:func +func_80A53638 = 0x8097E158; // type:func +func_80A5372C = 0x8097E244; // type:func +func_80A53850 = 0x8097E368; // type:func +func_80A53908 = 0x8097E420; // type:func +func_80A5399C = 0x8097E4B4; // type:func +func_80A53AD4 = 0x8097E5D8; // type:func +func_80A53C0C = 0x8097E714; // type:func +func_80A53C90 = 0x8097E79C; // type:func +func_80A53D0C = 0x8097E818; // type:func +func_80A53DF8 = 0x8097E8FC; // type:func +func_80A53F30 = 0x8097EA34; // type:func +func_80A54038 = 0x8097EB3C; // type:func +func_80A540C0 = 0x8097EBC8; // type:func +func_80A541FC = 0x8097ED04; // type:func +func_80A5427C = 0x8097ED88; // type:func +func_80A54320 = 0x8097EE2C; // type:func +func_80A543A0 = 0x8097EEAC; // type:func +func_80A544AC = 0x8097EFB8; // type:func +func_80A5455C = 0x8097F068; // type:func +func_80A546DC = 0x8097F1DC; // type:func +func_80A5475C = 0x8097F25C; // type:func +func_80A54954 = 0x8097F454; // type:func +func_80A549E8 = 0x8097F4E8; // type:func +EnHeishi2_Update = 0x8097F578; // type:func +EnHeishi2_OverrideLimbDraw = 0x8097F6C4; // type:func +EnHeishi2_PostLimbDraw = 0x8097F73C; // type:func +EnHeishi2_DrawKingGuard = 0x8097F774; // type:func +EnHeishi2_Draw = 0x8097F7E8; // type:func +EnEncount2_Init = 0x8097FC70; // type:func +EnEncount2_Wait = 0x8097FCE4; // type:func +EnEncount2_SpawnRocks = 0x8097FF3C; // type:func +EnEncount2_Update = 0x80980504; // type:func +EnEncount2_Draw = 0x809808D0; // type:func +EnEncount2_SpawnEffect = 0x809808F0; // type:func +EnEncount2_UpdateEffects = 0x809809A4; // type:func +EnEncount2_DrawEffects = 0x80980B78; // type:func +EnFireRock_Init = 0x80980EA0; // type:func +EnFireRock_Destroy = 0x80981290; // type:func +EnFireRock_Fall = 0x809812F4; // type:func +EnFireRock_SpawnMoreBrokenPieces = 0x80981648; // type:func +FireRock_WaitSpawnRocksFromCeiling = 0x809817C8; // type:func +FireRock_WaitOnFloor = 0x809818B8; // type:func +EnFireRock_Update = 0x8098199C; // type:func +EnFireRock_Draw = 0x80981C48; // type:func +EnBrob_Init = 0x80981FB0; // type:func +EnBrob_Destroy = 0x80982224; // type:func +EnBrob_SetupIdle = 0x8098227C; // type:func +EnBrob_SetupMoveUp = 0x809822E4; // type:func +EnBrob_SetupWobble = 0x80982344; // type:func +EnBrob_SetupStunned = 0x80982398; // type:func +EnBrob_SetupMoveDown = 0x8098242C; // type:func +EnBrob_SetupShock = 0x809824AC; // type:func +EnBrob_Idle = 0x809824F8; // type:func +EnBrob_MoveUp = 0x809825B8; // type:func +EnBrob_Wobble = 0x809826BC; // type:func +EnBrob_Stunned = 0x8098275C; // type:func +EnBrob_MoveDown = 0x809827F8; // type:func +EnBrob_Shock = 0x809828FC; // type:func +EnBrob_Update = 0x80982B14; // type:func +EnBrob_PostLimbDraw = 0x80982DB0; // type:func +EnBrob_Draw = 0x80982E84; // type:func +MirRay_SetupCollider = 0x809830A0; // type:func +MirRay_MakeShieldLight = 0x80983168; // type:func +MirRay_Init = 0x8098330C; // type:func +MirRay_Destroy = 0x809835A4; // type:func +MirRay_Update = 0x8098361C; // type:func +MirRay_SetIntensity = 0x80983708; // type:func +MirRay_SetupReflectionPolys = 0x809838BC; // type:func +MirRay_RemoveSimilarReflections = 0x80983A98; // type:func +MirRay_ReflectedBeam = 0x80983B9C; // type:func +MirRay_Draw = 0x8098410C; // type:func +MirRay_CheckInFrustum = 0x809843E8; // type:func +func_808B1AE0 = 0x80984950; // type:func +func_808B1BA0 = 0x80984A10; // type:func +func_808B1BEC = 0x80984A5C; // type:func +func_808B1C70 = 0x80984AE8; // type:func +func_808B1CEC = 0x80984B64; // type:func +func_808B1D18 = 0x80984B90; // type:func +func_808B1D44 = 0x80984BBC; // type:func +BgSpot09Obj_Init = 0x80984BFC; // type:func +BgSpot09Obj_Destroy = 0x80984C64; // type:func +BgSpot09Obj_Update = 0x80984CA4; // type:func +BgSpot09Obj_Draw = 0x80984CB4; // type:func +func_808B8910 = 0x80984E70; // type:func +func_808B8A5C = 0x80984F28; // type:func +func_808B8A98 = 0x80984F64; // type:func +func_808B8B08 = 0x80984FD4; // type:func +func_808B8B38 = 0x80985008; // type:func +func_808B8BB4 = 0x80985084; // type:func +func_808B8C90 = 0x80985168; // type:func +func_808B8CC8 = 0x809851A4; // type:func +BgSpot18Obj_Init = 0x809851F8; // type:func +BgSpot18Obj_Destroy = 0x80985254; // type:func +func_808B8DC0 = 0x80985288; // type:func +func_808B8DD0 = 0x8098529C; // type:func +func_808B8DDC = 0x809852AC; // type:func +func_808B8E20 = 0x809852F0; // type:func +func_808B8E64 = 0x80985334; // type:func +func_808B8E7C = 0x80985350; // type:func +func_808B8EE0 = 0x809853B4; // type:func +func_808B8F08 = 0x809853E0; // type:func +func_808B9030 = 0x8098550C; // type:func +func_808B9040 = 0x80985520; // type:func +BgSpot18Obj_Update = 0x80985540; // type:func +BgSpot18Obj_Draw = 0x80985574; // type:func +BossVa_SetupAction = 0x80985740; // type:func +BossVa_AttachToBody = 0x8098574C; // type:func +BossVa_BloodDroplets = 0x80985990; // type:func +BossVa_BloodSplatter = 0x80985A90; // type:func +BossVa_Gore = 0x80985BBC; // type:func +BossVa_Spark = 0x80985CEC; // type:func +BossVa_Tumor = 0x80985E70; // type:func +BossVa_SetSparkEnv = 0x80985FF4; // type:func +BossVa_SetDeathEnv = 0x80986040; // type:func +BossVa_FindBoomerang = 0x809860C0; // type:func +BossVa_KillBari = 0x80986100; // type:func +BossVa_Init = 0x809862EC; // type:func +BossVa_Destroy = 0x80986B3C; // type:func +BossVa_SetupIntro = 0x80986B8C; // type:func +BossVa_BodyIntro = 0x80986C1C; // type:func +BossVa_SetupBodyPhase1 = 0x80987C3C; // type:func +BossVa_BodyPhase1 = 0x80987CE0; // type:func +BossVa_SetupBodyPhase2 = 0x80987F78; // type:func +BossVa_BodyPhase2 = 0x809880A4; // type:func +BossVa_SetupBodyPhase3 = 0x809885A8; // type:func +BossVa_BodyPhase3 = 0x809885E4; // type:func +BossVa_SetupBodyPhase4 = 0x80988C4C; // type:func +BossVa_BodyPhase4 = 0x80988D00; // type:func +BossVa_SetupBodyDeath = 0x80989808; // type:func +BossVa_BodyDeath = 0x809898A0; // type:func +BossVa_SetupSupportIntro = 0x8098A3F8; // type:func +BossVa_SupportIntro = 0x8098A470; // type:func +BossVa_SetupSupportAttached = 0x8098A594; // type:func +BossVa_SupportAttached = 0x8098A618; // type:func +BossVa_SetupSupportCut = 0x8098A840; // type:func +BossVa_SupportCut = 0x8098A908; // type:func +BossVa_SetupStump = 0x8098ADDC; // type:func +BossVa_Stump = 0x8098AE60; // type:func +BossVa_SetupZapperIntro = 0x8098AEF8; // type:func +BossVa_ZapperIntro = 0x8098AF8C; // type:func +BossVa_SetupZapperAttack = 0x8098B04C; // type:func +BossVa_ZapperAttack = 0x8098B0E0; // type:func +BossVa_SetupZapperDamaged = 0x8098BB14; // type:func +BossVa_ZapperDamaged = 0x8098BC1C; // type:func +BossVa_SetupZapperDeath = 0x8098BD30; // type:func +BossVa_ZapperDeath = 0x8098BE04; // type:func +BossVa_SetupZapperEnraged = 0x8098C32C; // type:func +BossVa_ZapperEnraged = 0x8098C3B4; // type:func +BossVa_SetupZapperHold = 0x8098CB0C; // type:func +BossVa_ZapperHold = 0x8098CB8C; // type:func +BossVa_SetupBariIntro = 0x8098CC98; // type:func +BossVa_BariIntro = 0x8098CDA8; // type:func +BossVa_SetupBariPhase3Attack = 0x8098D300; // type:func +BossVa_BariPhase3Attack = 0x8098D3A8; // type:func +BossVa_SetupBariPhase2Attack = 0x8098D7A8; // type:func +BossVa_BariPhase2Attack = 0x8098D850; // type:func +BossVa_SetupBariPhase3Stunned = 0x8098DE68; // type:func +BossVa_BariPhase3Stunned = 0x8098DEC4; // type:func +BossVa_SetupBariDeath = 0x8098E0E0; // type:func +BossVa_BariDeath = 0x8098E138; // type:func +BossVa_SetupDoor = 0x8098E16C; // type:func +BossVa_Door = 0x8098E1BC; // type:func +BossVa_Update = 0x8098E230; // type:func +BossVa_BodyOverrideLimbDraw = 0x8098E43C; // type:func +BossVa_BodyPostLimbDraw = 0x8098E5E0; // type:func +BossVa_SupportOverrideLimbDraw = 0x8098EAE4; // type:func +BossVa_SupportPostLimbDraw = 0x8098EB28; // type:func +BossVa_ZapperOverrideLimbDraw = 0x8098ED78; // type:func +BossVa_ZapperPostLimbDraw = 0x8098EF54; // type:func +BossVa_BariOverrideLimbDraw = 0x8098F3B4; // type:func +BossVa_BariPostLimbDraw = 0x8098F444; // type:func +BossVa_Draw = 0x8098F5D0; // type:func +BossVa_UpdateEffects = 0x8098FBC8; // type:func +BossVa_DrawEffects = 0x80990568; // type:func +BossVa_SpawnSpark = 0x80991370; // type:func +BossVa_SpawnSparkBall = 0x80991660; // type:func +BossVa_SpawnBloodDroplets = 0x809917EC; // type:func +BossVa_SpawnBloodSplatter = 0x809919B8; // type:func +BossVa_SpawnTumor = 0x80991B54; // type:func +BossVa_SpawnGore = 0x80991CF8; // type:func +BossVa_SpawnZapperCharge = 0x80991F18; // type:func +BossVa_DrawDoor = 0x8099206C; // type:func +BgHakaTubo_Init = 0x8099C9D0; // type:func +BgHakaTubo_Destroy = 0x8099CACC; // type:func +BgHakaTubo_Idle = 0x8099CB24; // type:func +BgHakaTubo_DropCollectible = 0x8099CD90; // type:func +BgHakaTubo_Update = 0x8099D054; // type:func +BgHakaTubo_DrawFlameCircle = 0x8099D088; // type:func +BgHakaTubo_Draw = 0x8099D234; // type:func +BgHakaTrap_Init = 0x8099D3F0; // type:func +BgHakaTrap_Destroy = 0x8099D690; // type:func +func_8087FFC0 = 0x8099D714; // type:func +func_808801B8 = 0x8099D914; // type:func +func_808802D8 = 0x8099DA38; // type:func +func_80880484 = 0x8099DBE4; // type:func +func_808805C0 = 0x8099DD20; // type:func +func_808806BC = 0x8099DE1C; // type:func +func_808808F4 = 0x8099E054; // type:func +func_808809B0 = 0x8099E114; // type:func +func_808809E4 = 0x8099E148; // type:func +func_80880AE8 = 0x8099E254; // type:func +func_80880C0C = 0x8099E378; // type:func +BgHakaTrap_Update = 0x8099E3EC; // type:func +func_80880D68 = 0x8099E4DC; // type:func +BgHakaTrap_Draw = 0x8099E578; // type:func +BgHakaHuta_Init = 0x8099E9C0; // type:func +BgHakaHuta_Destroy = 0x8099EA80; // type:func +BgHakaHuta_SpawnDust = 0x8099EAB4; // type:func +BgHakaHuta_PlaySfx = 0x8099EC70; // type:func +BgHakaHuta_SpawnEnemies = 0x8099ECFC; // type:func +BgHakaHuta_Open = 0x8099EFC4; // type:func +BgHakaHuta_SlideOpen = 0x8099F078; // type:func +func_8087D720 = 0x8099F12C; // type:func +BgHakaHuta_DoNothing = 0x8099F2D0; // type:func +BgHakaHuta_Update = 0x8099F2E0; // type:func +BgHakaHuta_Draw = 0x8099F304; // type:func +BgHakaZou_Init = 0x8099F460; // type:func +BgHakaZou_Destroy = 0x8099F748; // type:func +func_808828F4 = 0x8099F798; // type:func +BgHakaZou_Wait = 0x8099F914; // type:func +func_80882BDC = 0x8099FA84; // type:func +func_80882CC4 = 0x8099FB6C; // type:func +func_80882E54 = 0x8099FCFC; // type:func +func_80883000 = 0x8099FEAC; // type:func +func_80883104 = 0x8099FFB0; // type:func +func_80883144 = 0x8099FFF0; // type:func +func_80883254 = 0x809A0100; // type:func +func_80883328 = 0x809A01D8; // type:func +func_808834D8 = 0x809A0388; // type:func +BgHakaZou_DoNothing = 0x809A0418; // type:func +BgHakaZou_Update = 0x809A0428; // type:func +BgHakaZou_Draw = 0x809A046C; // type:func +BgSpot17Funen_Init = 0x809A0650; // type:func +BgSpot17Funen_Destroy = 0x809A0678; // type:func +BgSpot17Funen_Update = 0x809A0688; // type:func +func_808B746C = 0x809A06AC; // type:func +func_808B7478 = 0x809A06BC; // type:func +EnSyatekiItm_Init = 0x809A08A0; // type:func +EnSyatekiItm_Destroy = 0x809A0A04; // type:func +EnSyatekiItm_Idle = 0x809A0A14; // type:func +EnSyatekiItm_StartRound = 0x809A0B24; // type:func +EnSyatekiItm_SpawnTargets = 0x809A0CA0; // type:func +EnSyatekiItm_CheckTargets = 0x809A1120; // type:func +EnSyatekiItm_CleanupGame = 0x809A11C4; // type:func +EnSyatekiItm_EndGame = 0x809A124C; // type:func +EnSyatekiItm_Update = 0x809A1298; // type:func +EnSyatekiMan_Init = 0x809A1640; // type:func +EnSyatekiMan_Destroy = 0x809A16F4; // type:func +EnSyatekiMan_Start = 0x809A1704; // type:func +EnSyatekiMan_SetupIdle = 0x809A1798; // type:func +EnSyatekiMan_Idle = 0x809A17F0; // type:func +EnSyatekiMan_Talk = 0x809A184C; // type:func +EnSyatekiMan_StopTalk = 0x809A19F4; // type:func +EnSyatekiMan_StartGame = 0x809A1A9C; // type:func +EnSyatekiMan_WaitForGame = 0x809A1B5C; // type:func +EnSyatekiMan_EndGame = 0x809A1C78; // type:func +EnSyatekiMan_GivePrize = 0x809A1EC8; // type:func +EnSyatekiMan_FinishPrize = 0x809A1F38; // type:func +EnSyatekiMan_RestartGame = 0x809A1FFC; // type:func +EnSyatekiMan_BlinkWait = 0x809A2064; // type:func +EnSyatekiMan_Blink = 0x809A2098; // type:func +EnSyatekiMan_Update = 0x809A2138; // type:func +EnSyatekiMan_OverrideLimbDraw = 0x809A21D8; // type:func +EnSyatekiMan_Draw = 0x809A2268; // type:func +EnTana_Init = 0x809A2400; // type:func +EnTana_Destroy = 0x809A2450; // type:func +EnTana_Update = 0x809A2460; // type:func +EnTana_DrawWoodenShelves = 0x809A2470; // type:func +EnTana_DrawStoneShelves = 0x809A2508; // type:func +EnNb_GetPath = 0x809A26B0; // type:func +EnNb_GetType = 0x809A26C4; // type:func +EnNb_UpdatePath = 0x809A26D4; // type:func +EnNb_SetupCollider = 0x809A2800; // type:func +EnNb_UpdateCollider = 0x809A284C; // type:func +EnNb_Destroy = 0x809A2890; // type:func +func_80AB0FBC = 0x809A28BC; // type:func +func_80AB1040 = 0x809A2944; // type:func +func_80AB10C4 = 0x809A29CC; // type:func +EnNb_UpdateEyes = 0x809A2A70; // type:func +func_80AB1284 = 0x809A2AF8; // type:func +EnNb_UpdateSkelAnime = 0x809A2B40; // type:func +EnNb_GetCue = 0x809A2B64; // type:func +EnNb_SetStartPosRotFromCue1 = 0x809A2B8C; // type:func +func_80AB1390 = 0x809A2C0C; // type:func +func_80AB13D8 = 0x809A2C58; // type:func +EnNb_SetStartPosRotFromCue2 = 0x809A2CA4; // type:func +EnNb_SetCurrentAnim = 0x809A2D24; // type:func +EnNb_SetChamberAnim = 0x809A2DB4; // type:func +EnNb_SpawnBlueWarp = 0x809A2DFC; // type:func +EnNb_GiveMedallion = 0x809A2E58; // type:func +EnNb_ComeUpImpl = 0x809A2ED4; // type:func +EnNb_SetupChamberCsImpl = 0x809A2EF4; // type:func +EnNb_SetupChamberWarpImpl = 0x809A2F90; // type:func +EnNb_SetupDefaultChamberIdle = 0x809A2FE0; // type:func +EnNb_SetupArmRaise = 0x809A300C; // type:func +EnNb_SetupRaisedArmTransition = 0x809A30A0; // type:func +EnNb_SetupMedallion = 0x809A310C; // type:func +EnNb_SetupChamberCs = 0x809A3158; // type:func +EnNb_SetupChamberWarp = 0x809A3178; // type:func +EnNb_ComeUp = 0x809A3198; // type:func +func_80AB193C = 0x809A31D4; // type:func +EnNb_RaiseArm = 0x809A321C; // type:func +func_80AB19BC = 0x809A3260; // type:func +func_80AB19FC = 0x809A32A8; // type:func +EnNb_SetupLightArrowOrSealingCs = 0x809A32DC; // type:func +EnNb_PlaySealingSfx = 0x809A3320; // type:func +EnNb_InitializeDemo6K = 0x809A3340; // type:func +EnNb_SetupHide = 0x809A33C0; // type:func +EnNb_CheckToFade = 0x809A3414; // type:func +EnNb_SetupLightOrb = 0x809A3568; // type:func +EnNb_Hide = 0x809A3604; // type:func +EnNb_Fade = 0x809A3624; // type:func +EnNb_CreateLightOrb = 0x809A366C; // type:func +EnNb_DrawTransparency = 0x809A36B4; // type:func +EnNb_InitKidnap = 0x809A37FC; // type:func +EnNb_PlayCrySFX = 0x809A3854; // type:func +EnNb_PlayAgonySFX = 0x809A388C; // type:func +EnNb_SetPosInPortal = 0x809A38C4; // type:func +EnNb_SetupCaptureCutsceneState = 0x809A39A8; // type:func +EnNb_SetRaisedArmCaptureAnim = 0x809A39DC; // type:func +EnNb_SetupLookAroundInKidnap = 0x809A3A3C; // type:func +EnNb_SetupKidnap = 0x809A3AB0; // type:func +EnNb_CheckKidnapCsMode = 0x809A3B28; // type:func +func_80AB23A8 = 0x809A3BF0; // type:func +EnNb_MovingInPortal = 0x809A3C28; // type:func +EnNb_SuckedInByPortal = 0x809A3C84; // type:func +EnNb_SetupConfrontation = 0x809A3CE0; // type:func +EnNb_PlayKnuckleDefeatSFX = 0x809A3D24; // type:func +EnNb_PlayKneelingOnGroundSFX = 0x809A3D68; // type:func +EnNb_PlayLookRightSFX = 0x809A3DCC; // type:func +EnNb_PlayLookLeftSFX = 0x809A3E18; // type:func +EnNb_InitDemo6KInConfrontation = 0x809A3E70; // type:func +func_80AB2688 = 0x809A3EE8; // type:func +func_80AB26C8 = 0x809A3F28; // type:func +func_80AB26DC = 0x809A3F40; // type:func +EnNb_SetupKneel = 0x809A3FD8; // type:func +EnNb_CheckIfKneeling = 0x809A4054; // type:func +EnNb_SetupLookRight = 0x809A40C0; // type:func +EnNb_CheckIfLookingRight = 0x809A4140; // type:func +EnNb_SetupLookLeft = 0x809A41AC; // type:func +EnNb_CheckIfLookLeft = 0x809A422C; // type:func +EnNb_SetupDemo6KInConfrontation = 0x809A428C; // type:func +EnNb_SetupRun = 0x809A42CC; // type:func +EnNb_SetupConfrontationDestroy = 0x809A434C; // type:func +EnNb_CheckConfrontationCsMode = 0x809A4364; // type:func +EnNb_CheckConfrontationCsModeWrapper = 0x809A444C; // type:func +func_80AB2C18 = 0x809A446C; // type:func +EnNb_Kneel = 0x809A44B8; // type:func +EnNb_LookRight = 0x809A4528; // type:func +EnNb_LookLeft = 0x809A4598; // type:func +EnNb_Run = 0x809A4600; // type:func +EnNb_ConfrontationDestroy = 0x809A4688; // type:func +func_80AB2E70 = 0x809A46DC; // type:func +func_80AB2FC0 = 0x809A47F8; // type:func +func_80AB2FE4 = 0x809A4820; // type:func +EnNb_SetupCreditsSpawn = 0x809A495C; // type:func +EnNb_SetAlphaInCredits = 0x809A49A4; // type:func +EnNb_SetupCreditsFadeIn = 0x809A4A30; // type:func +EnNb_SetupCreditsSit = 0x809A4A68; // type:func +EnNb_SetupCreditsHeadTurn = 0x809A4AB4; // type:func +EnNb_CheckIfLookingUp = 0x809A4AF4; // type:func +EnNb_CheckCreditsCsModeImpl = 0x809A4B28; // type:func +EnNb_CheckCreditsCsMode = 0x809A4BB4; // type:func +EnNb_CreditsFade = 0x809A4BD4; // type:func +func_80AB3428 = 0x809A4C20; // type:func +EnNb_LookUp = 0x809A4C68; // type:func +EnNb_CrawlspaceSpawnCheck = 0x809A4CAC; // type:func +func_80AB359C = 0x809A4DA8; // type:func +EnNb_SetNoticeSFX = 0x809A4E6C; // type:func +EnNb_GetNoticedStatus = 0x809A4E94; // type:func +func_80AB36DC = 0x809A4EEC; // type:func +EnNb_CheckNoticed = 0x809A4F9C; // type:func +EnNb_SetupIdleCrawlspace = 0x809A4FF4; // type:func +func_80AB3838 = 0x809A504C; // type:func +EnNb_SetupPathMovement = 0x809A50C8; // type:func +EnNb_SetTextIdAsChild = 0x809A5130; // type:func +func_80AB3A7C = 0x809A529C; // type:func +func_80AB3B04 = 0x809A5328; // type:func +func_80AB3B7C = 0x809A53B0; // type:func +EnNb_WaitForNotice = 0x809A53FC; // type:func +EnNb_StandUpAfterNotice = 0x809A5458; // type:func +EnNb_BlockCrawlspace = 0x809A54B8; // type:func +EnNb_InitCrawlspaceDialogue = 0x809A5520; // type:func +EnNb_FollowPath = 0x809A5588; // type:func +func_80AB3DB0 = 0x809A5608; // type:func +func_80AB3E10 = 0x809A5670; // type:func +EnNb_Update = 0x809A56D8; // type:func +EnNb_Init = 0x809A5720; // type:func +EnNb_OverrideLimbDraw = 0x809A583C; // type:func +EnNb_PostLimbDraw = 0x809A58CC; // type:func +EnNb_DrawNothing = 0x809A5958; // type:func +EnNb_DrawDefault = 0x809A5968; // type:func +EnNb_Draw = 0x809A5AAC; // type:func +BossMo_InitRand = 0x809A6C80; // type:func +BossMo_RandZeroOne = 0x809A6CA0; // type:func +BossMo_NearLand = 0x809A6DC8; // type:func +BossMo_SpawnRipple = 0x809A6EC0; // type:func +BossMo_SpawnDroplet = 0x809A6FE0; // type:func +BossMo_SpawnStillDroplet = 0x809A70BC; // type:func +BossMo_SpawnBubble = 0x809A7180; // type:func +BossMo_Init = 0x809A7234; // type:func +BossMo_Destroy = 0x809A761C; // type:func +BossMo_SetupTentacle = 0x809A766C; // type:func +BossMo_Tentacle = 0x809A76C0; // type:func +BossMo_TentCollisionCheck = 0x809AA480; // type:func +BossMo_IntroCs = 0x809AA72C; // type:func +BossMo_DeathCs = 0x809AB844; // type:func +BossMo_CoreCollisionCheck = 0x809AC400; // type:func +BossMo_Core = 0x809AC808; // type:func +BossMo_UpdateCore = 0x809ADE6C; // type:func +BossMo_UpdateTent = 0x809AE09C; // type:func +BossMo_UpdateTentColliders = 0x809AE8D4; // type:func +BossMo_DrawTentacle = 0x809AE980; // type:func +BossMo_DrawWater = 0x809AF0B0; // type:func +BossMo_DrawCore = 0x809AF2C0; // type:func +BossMo_DrawTent = 0x809AFB48; // type:func +BossMo_UpdateEffects = 0x809AFD7C; // type:func +BossMo_DrawEffects = 0x809B048C; // type:func +BossMo_SfxTest = 0x809B0BB8; // type:func +EnSb_Init = 0x809B7260; // type:func +EnSb_Destroy = 0x809B7348; // type:func +EnSb_SpawnBubbles = 0x809B7388; // type:func +EnSb_SetupWaitClosed = 0x809B7438; // type:func +EnSb_SetupOpen = 0x809B74B0; // type:func +EnSb_SetupWaitOpen = 0x809B752C; // type:func +EnSb_SetupLunge = 0x809B75A0; // type:func +EnSb_SetupBounce = 0x809B7648; // type:func +EnSb_SetupCooldown = 0x809B76C0; // type:func +EnSb_WaitClosed = 0x809B77C4; // type:func +EnSb_Open = 0x809B7844; // type:func +EnSb_WaitOpen = 0x809B790C; // type:func +EnSb_TurnAround = 0x809B79C0; // type:func +EnSb_Lunge = 0x809B7AAC; // type:func +EnSb_Bounce = 0x809B7B54; // type:func +EnSb_Cooldown = 0x809B7C88; // type:func +EnSb_IsVulnerable = 0x809B7CF0; // type:func +EnSb_UpdateDamage = 0x809B7E38; // type:func +EnSb_Update = 0x809B8114; // type:func +EnSb_PostLimbDraw = 0x809B8294; // type:func +EnSb_Draw = 0x809B82E4; // type:func +EnBigokuta_Init = 0x809B86A0; // type:func +EnBigokuta_Destroy = 0x809B880C; // type:func +func_809BCE3C = 0x809B8880; // type:func +func_809BCEBC = 0x809B88FC; // type:func +func_809BCF68 = 0x809B89AC; // type:func +func_809BD1C8 = 0x809B8C14; // type:func +func_809BD2E4 = 0x809B8D30; // type:func +func_809BD318 = 0x809B8D64; // type:func +func_809BD370 = 0x809B8DBC; // type:func +func_809BD3AC = 0x809B8DF8; // type:func +func_809BD3E0 = 0x809B8E30; // type:func +func_809BD3F8 = 0x809B8E4C; // type:func +func_809BD47C = 0x809B8ED0; // type:func +func_809BD4A4 = 0x809B8EFC; // type:func +func_809BD524 = 0x809B8F7C; // type:func +func_809BD5E0 = 0x809B9038; // type:func +func_809BD658 = 0x809B90B0; // type:func +func_809BD6B8 = 0x809B9110; // type:func +func_809BD768 = 0x809B91C0; // type:func +func_809BD7F0 = 0x809B9248; // type:func +func_809BD84C = 0x809B92A8; // type:func +func_809BD8DC = 0x809B9338; // type:func +func_809BDAE8 = 0x809B9544; // type:func +func_809BDB90 = 0x809B95EC; // type:func +func_809BDC08 = 0x809B9664; // type:func +func_809BDF34 = 0x809B9994; // type:func +func_809BDFC8 = 0x809B9A28; // type:func +func_809BE058 = 0x809B9AB8; // type:func +func_809BE180 = 0x809B9BE0; // type:func +func_809BE26C = 0x809B9CCC; // type:func +func_809BE3E4 = 0x809B9E44; // type:func +func_809BE4A4 = 0x809B9F04; // type:func +func_809BE518 = 0x809B9F78; // type:func +func_809BE568 = 0x809B9FC8; // type:func +func_809BE798 = 0x809BA1F8; // type:func +EnBigokuta_UpdateDamage = 0x809BA33C; // type:func +EnBigokuta_Update = 0x809BA42C; // type:func +EnBigokuta_OverrideLimbDraw = 0x809BA624; // type:func +EnBigokuta_Draw = 0x809BAA9C; // type:func +EnKarebaba_Init = 0x809BB1A0; // type:func +EnKarebaba_Destroy = 0x809BB2D4; // type:func +EnKarebaba_ResetCollider = 0x809BB314; // type:func +EnKarebaba_SetupGrow = 0x809BB350; // type:func +EnKarebaba_SetupIdle = 0x809BB3A0; // type:func +EnKarebaba_SetupAwaken = 0x809BB3F4; // type:func +EnKarebaba_SetupUpright = 0x809BB470; // type:func +EnKarebaba_SetupSpin = 0x809BB510; // type:func +EnKarebaba_SetupDying = 0x809BB52C; // type:func +EnKarebaba_SetupDeadItemDrop = 0x809BB5A0; // type:func +EnKarebaba_SetupRetract = 0x809BB640; // type:func +EnKarebaba_SetupDead = 0x809BB6C0; // type:func +EnKarebaba_SetupRegrow = 0x809BB74C; // type:func +EnKarebaba_Grow = 0x809BB7A0; // type:func +EnKarebaba_Idle = 0x809BB838; // type:func +EnKarebaba_Awaken = 0x809BB898; // type:func +EnKarebaba_Upright = 0x809BB96C; // type:func +EnKarebaba_Spin = 0x809BBA60; // type:func +EnKarebaba_Dying = 0x809BBBF4; // type:func +EnKarebaba_DeadItemDrop = 0x809BBEAC; // type:func +EnKarebaba_Retract = 0x809BBF14; // type:func +EnKarebaba_Dead = 0x809BBFE8; // type:func +EnKarebaba_Regrow = 0x809BC040; // type:func +EnKarebaba_Update = 0x809BC10C; // type:func +EnKarebaba_DrawBaseShadow = 0x809BC2C0; // type:func +EnKarebaba_Draw = 0x809BC3AC; // type:func +BgBdanObjects_GetProperty = 0x809BCA90; // type:func +BgBdanObjects_SetProperty = 0x809BCAE4; // type:func +BgBdanObjects_Init = 0x809BCB38; // type:func +BgBdanObjects_Destroy = 0x809BCDBC; // type:func +BgBdanObjects_OctoPlatform_WaitForRutoToStartCutscene = 0x809BCE0C; // type:func +BgBdanObjects_OctoPlatform_RaiseToUpperPosition = 0x809BCF60; // type:func +BgBdanObjects_OctoPlatform_WaitForRutoToAdvanceCutscene = 0x809BD05C; // type:func +BgBdanObjects_OctoPlatform_DescendWithBigOcto = 0x809BD198; // type:func +BgBdanObjects_OctoPlatform_PauseBeforeDescending = 0x809BD31C; // type:func +BgBdanObjects_OctoPlatform_WaitForBigOctoToStartBattle = 0x809BD380; // type:func +BgBdanObjects_OctoPlatform_BattleInProgress = 0x809BD3DC; // type:func +BgBdanObjects_SinkToFloorHeight = 0x809BD4B4; // type:func +BgBdanObjects_WaitForPlayerInRange = 0x809BD534; // type:func +BgBdanObjects_RaiseToUpperPosition = 0x809BD5A0; // type:func +BgBdanObjects_DoNothing = 0x809BD638; // type:func +BgBdanObjects_ElevatorOscillate = 0x809BD648; // type:func +BgBdanObjects_WaitForSwitch = 0x809BD77C; // type:func +BgBdanObjects_ChangeWaterBoxLevel = 0x809BD7C8; // type:func +BgBdanObjects_WaitForTimerExpired = 0x809BD890; // type:func +BgBdanObjects_WaitForPlayerOnTop = 0x809BD8E4; // type:func +BgBdanObjects_FallToLowerPos = 0x809BD968; // type:func +BgBdanObjects_Update = 0x809BDA24; // type:func +BgBdanObjects_Draw = 0x809BDA60; // type:func +DemoSa_Destroy = 0x809BDD60; // type:func +func_8098E480 = 0x809BDD84; // type:func +DemoSa_SetEyeIndex = 0x809BDE0C; // type:func +DemoSa_SetMouthIndex = 0x809BDE24; // type:func +func_8098E5C8 = 0x809BDE3C; // type:func +DemoSa_UpdateSkelAnime = 0x809BDE84; // type:func +DemoSa_GetCue = 0x809BDEA8; // type:func +func_8098E654 = 0x809BDED0; // type:func +func_8098E6A0 = 0x809BDF1C; // type:func +func_8098E6EC = 0x809BDF68; // type:func +func_8098E76C = 0x809BDFE8; // type:func +func_8098E7FC = 0x809BE078; // type:func +func_8098E86C = 0x809BE0E8; // type:func +func_8098E8C8 = 0x809BE144; // type:func +func_8098E944 = 0x809BE1C0; // type:func +func_8098E960 = 0x809BE1E0; // type:func +func_8098E9EC = 0x809BE278; // type:func +func_8098EA3C = 0x809BE2C8; // type:func +func_8098EA68 = 0x809BE2F4; // type:func +func_8098EB00 = 0x809BE38C; // type:func +func_8098EB6C = 0x809BE3F8; // type:func +func_8098EBB8 = 0x809BE444; // type:func +func_8098EBD8 = 0x809BE464; // type:func +func_8098EBF8 = 0x809BE484; // type:func +func_8098EC28 = 0x809BE4B8; // type:func +func_8098EC60 = 0x809BE4F8; // type:func +func_8098EC94 = 0x809BE530; // type:func +func_8098ECCC = 0x809BE570; // type:func +func_8098ECF4 = 0x809BE59C; // type:func +func_8098EDB0 = 0x809BE658; // type:func +func_8098EE08 = 0x809BE6B0; // type:func +func_8098EE28 = 0x809BE6D0; // type:func +func_8098EEA8 = 0x809BE750; // type:func +func_8098EEFC = 0x809BE7A4; // type:func +func_8098F050 = 0x809BE8F8; // type:func +func_8098F0E8 = 0x809BE994; // type:func +func_8098F118 = 0x809BE9B4; // type:func +func_8098F16C = 0x809BE9FC; // type:func +DemoSa_DrawXlu = 0x809BEA44; // type:func +func_8098F390 = 0x809BEBE4; // type:func +func_8098F3F0 = 0x809BEC44; // type:func +func_8098F420 = 0x809BEC78; // type:func +func_8098F480 = 0x809BECD4; // type:func +func_8098F50C = 0x809BED60; // type:func +func_8098F544 = 0x809BED98; // type:func +func_8098F590 = 0x809BEDE4; // type:func +func_8098F5D0 = 0x809BEE24; // type:func +func_8098F610 = 0x809BEE64; // type:func +func_8098F654 = 0x809BEEAC; // type:func +func_8098F714 = 0x809BEF58; // type:func +func_8098F734 = 0x809BEF78; // type:func +func_8098F77C = 0x809BEFC4; // type:func +func_8098F7BC = 0x809BF00C; // type:func +func_8098F7FC = 0x809BF054; // type:func +func_8098F83C = 0x809BF098; // type:func +func_8098F8F8 = 0x809BF154; // type:func +func_8098F984 = 0x809BF1E0; // type:func +func_8098F998 = 0x809BF1F8; // type:func +func_8098FA2C = 0x809BF28C; // type:func +func_8098FA84 = 0x809BF2E4; // type:func +func_8098FAE0 = 0x809BF340; // type:func +func_8098FB34 = 0x809BF394; // type:func +func_8098FB68 = 0x809BF3C8; // type:func +func_8098FC44 = 0x809BF490; // type:func +func_8098FC64 = 0x809BF4B0; // type:func +func_8098FC9C = 0x809BF4EC; // type:func +func_8098FCD4 = 0x809BF52C; // type:func +func_8098FD0C = 0x809BF56C; // type:func +DemoSa_Update = 0x809BF5B8; // type:func +DemoSa_Init = 0x809BF600; // type:func +DemoSa_OverrideLimbDraw = 0x809BF6C8; // type:func +DemoSa_DrawNothing = 0x809BF700; // type:func +DemoSa_DrawOpa = 0x809BF710; // type:func +DemoSa_Draw = 0x809BF8A4; // type:func +DemoGo_GetCueChannel = 0x809C0880; // type:func +func_8097C8A8 = 0x809C08BC; // type:func +DemoGo_Destroy = 0x809C0928; // type:func +func_8097C930 = 0x809C094C; // type:func +func_8097C9B8 = 0x809C09D4; // type:func +func_8097C9DC = 0x809C09FC; // type:func +func_8097CA30 = 0x809C0A54; // type:func +func_8097CA78 = 0x809C0A9C; // type:func +func_8097CB0C = 0x809C0B34; // type:func +func_8097CC08 = 0x809C0C34; // type:func +func_8097CCC0 = 0x809C0CEC; // type:func +func_8097CCE0 = 0x809C0D0C; // type:func +DemoGo_UpdateSkelAnime = 0x809C0DC4; // type:func +func_8097CDB0 = 0x809C0DE8; // type:func +func_8097CE10 = 0x809C0E54; // type:func +func_8097CE20 = 0x809C0E68; // type:func +func_8097CE78 = 0x809C0EC4; // type:func +func_8097CEEC = 0x809C0F3C; // type:func +func_8097CF20 = 0x809C0F74; // type:func +func_8097CF9C = 0x809C0FF0; // type:func +func_8097CFDC = 0x809C1030; // type:func +func_8097CFFC = 0x809C1050; // type:func +func_8097D01C = 0x809C1070; // type:func +func_8097D058 = 0x809C10B4; // type:func +func_8097D088 = 0x809C10EC; // type:func +func_8097D0D0 = 0x809C113C; // type:func +func_8097D130 = 0x809C11A4; // type:func +DemoGo_Update = 0x809C1204; // type:func +DemoGo_Init = 0x809C124C; // type:func +func_8097D290 = 0x809C12F8; // type:func +func_8097D29C = 0x809C1308; // type:func +DemoGo_Draw = 0x809C1418; // type:func +EnIn_GetTextIdChild = 0x809C15D0; // type:func +EnIn_GetTextIdAdult = 0x809C1630; // type:func +EnIn_GetTextId = 0x809C1788; // type:func +EnIn_UpdateTalkStateOnClosing = 0x809C17EC; // type:func +EnIn_UpdateTalkStateOnChoice = 0x809C1860; // type:func +EnIn_UpdateTalkStateOnEvent = 0x809C1AB0; // type:func +EnIn_UpdateTalkState = 0x809C1B1C; // type:func +func_80A795C8 = 0x809C1BE4; // type:func +func_80A79690 = 0x809C1CAC; // type:func +EnIn_ChangeAnim = 0x809C1D08; // type:func +func_80A7975C = 0x809C1D78; // type:func +EnIn_GetStartMode = 0x809C1E4C; // type:func +EnIn_UpdateEyes = 0x809C2048; // type:func +func_80A79AB4 = 0x809C20D0; // type:func +func_80A79BAC = 0x809C21C8; // type:func +func_80A79C78 = 0x809C2294; // type:func +EnIn_Init = 0x809C2488; // type:func +EnIn_Destroy = 0x809C2594; // type:func +EnIn_WaitForObject = 0x809C25D8; // type:func +func_80A7A304 = 0x809C2930; // type:func +func_80A7A4BC = 0x809C2AE8; // type:func +func_80A7A4C8 = 0x809C2AF8; // type:func +func_80A7A568 = 0x809C2B9C; // type:func +func_80A7A770 = 0x809C2DA4; // type:func +func_80A7A848 = 0x809C2E7C; // type:func +func_80A7A940 = 0x809C2F74; // type:func +func_80A7AA40 = 0x809C3074; // type:func +func_80A7ABD4 = 0x809C3208; // type:func +func_80A7AE84 = 0x809C34BC; // type:func +func_80A7AEF0 = 0x809C3528; // type:func +func_80A7B018 = 0x809C3654; // type:func +func_80A7B024 = 0x809C3664; // type:func +EnIn_Update = 0x809C3750; // type:func +EnIn_OverrideLimbDraw = 0x809C3964; // type:func +EnIn_PostLimbDraw = 0x809C3BB8; // type:func +EnIn_Draw = 0x809C3CC8; // type:func +EnTr_SetupAction = 0x809C4370; // type:func +EnTr_Init = 0x809C437C; // type:func +EnTr_Destroy = 0x809C44CC; // type:func +EnTr_CrySpellcast = 0x809C44DC; // type:func +EnTr_DoNothing = 0x809C458C; // type:func +EnTr_ChooseAction2 = 0x809C459C; // type:func +EnTr_FlyKidnapCutscene = 0x809C474C; // type:func +func_80B23254 = 0x809C48C8; // type:func +EnTr_ShrinkVanish = 0x809C4B48; // type:func +EnTr_Reappear = 0x809C4D04; // type:func +EnTr_WaitToReappear = 0x809C4E9C; // type:func +EnTr_TakeOff = 0x809C4F5C; // type:func +EnTr_TurnLookOverShoulder = 0x809C5024; // type:func +EnTr_ChooseAction1 = 0x809C5104; // type:func +EnTr_Update = 0x809C5238; // type:func +EnTr_OverrideLimbDraw = 0x809C53F0; // type:func +EnTr_Draw = 0x809C5520; // type:func +func_80B23FDC = 0x809C562C; // type:func +func_80B24038 = 0x809C568C; // type:func +EnTr_SetRotFromCue = 0x809C5888; // type:func +EnTr_SetStartPosRotFromCue = 0x809C5910; // type:func +func_808B4C30 = 0x809C5C70; // type:func +func_808B4C4C = 0x809C5C90; // type:func +func_808B4D04 = 0x809C5D44; // type:func +func_808B4D9C = 0x809C5DD8; // type:func +func_808B4E58 = 0x809C5E88; // type:func +BgSpot16Bombstone_Init = 0x809C6084; // type:func +BgSpot16Bombstone_Destroy = 0x809C6138; // type:func +BgSpot16Bombstone_SpawnDust = 0x809C6184; // type:func +func_808B5240 = 0x809C6220; // type:func +BgSpot16Bombstone_SpawnFragments = 0x809C6388; // type:func +func_808B561C = 0x809C6600; // type:func +func_808B56BC = 0x809C66A0; // type:func +func_808B57E0 = 0x809C679C; // type:func +func_808B5934 = 0x809C68F4; // type:func +func_808B5950 = 0x809C6914; // type:func +func_808B5A78 = 0x809C6A00; // type:func +func_808B5A94 = 0x809C6A20; // type:func +func_808B5AF0 = 0x809C6A84; // type:func +func_808B5B04 = 0x809C6A9C; // type:func +func_808B5B58 = 0x809C6AF4; // type:func +func_808B5B6C = 0x809C6B0C; // type:func +BgSpot16Bombstone_Update = 0x809C6C08; // type:func +BgSpot16Bombstone_Draw = 0x809C6C3C; // type:func +BgHidanKowarerukabe_InitDynaPoly = 0x809C71C0; // type:func +BgHidanKowarerukabe_InitColliderSphere = 0x809C725C; // type:func +BgHidanKowarerukabe_OffsetActorYPos = 0x809C72F0; // type:func +BgHidanKowarerukabe_Init = 0x809C731C; // type:func +BgHidanKowarerukabe_Destroy = 0x809C73CC; // type:func +BgHidanKowarerukabe_SpawnDust = 0x809C7414; // type:func +BgHidanKowarerukabe_FloorBreak = 0x809C7538; // type:func +func_8088A67C = 0x809C7804; // type:func +BgHidanKowarerukabe_LargeWallBreak = 0x809C7A9C; // type:func +BgHidanKowarerukabe_Break = 0x809C7D28; // type:func +BgHidanKowarerukabe_Update = 0x809C7DB8; // type:func +BgHidanKowarerukabe_Draw = 0x809C7E88; // type:func +BgBombwall_InitDynapoly = 0x809C80A0; // type:func +BgBombwall_RotateVec = 0x809C80F8; // type:func +BgBombwall_Init = 0x809C814C; // type:func +BgBombwall_DestroyCollision = 0x809C835C; // type:func +BgBombwall_Destroy = 0x809C83D8; // type:func +func_8086EB5C = 0x809C83F8; // type:func +func_8086ED50 = 0x809C85EC; // type:func +func_8086ED70 = 0x809C8610; // type:func +func_8086EDFC = 0x809C86A0; // type:func +func_8086EE40 = 0x809C86E4; // type:func +func_8086EE94 = 0x809C8738; // type:func +BgBombwall_Update = 0x809C8768; // type:func +BgBombwall_Draw = 0x809C8794; // type:func +EnRu2_InitCollider = 0x809C8960; // type:func +EnRu2_UpdateCollider = 0x809C89AC; // type:func +EnRu2_Destroy = 0x809C89F0; // type:func +EnRu2_UpdateEyes = 0x809C8A1C; // type:func +EnRu2_GetSwitchFlag = 0x809C8AA4; // type:func +EnRu2_GetType = 0x809C8AB8; // type:func +EnRu2_UpdateBgCheckInfo = 0x809C8AC8; // type:func +EnRu2_UpdateSkelAnime = 0x809C8B10; // type:func +EnRu2_GetCue = 0x809C8B34; // type:func +EnRu2_CheckCueMatchingId = 0x809C8B5C; // type:func +EnRu2_CheckCueNotMatchingId = 0x809C8BA8; // type:func +EnRu2_InitPositionFromCue = 0x809C8BF4; // type:func +EnRu2_AnimationChange = 0x809C8C74; // type:func +EnRu2_Rise = 0x809C8D04; // type:func +EnRu2_InitChamberOfSages = 0x809C8D24; // type:func +EnRu2_SpawnBlueWarp = 0x809C8D6C; // type:func +EnRu2_SpawnWaterMedallion = 0x809C8DC8; // type:func +EnRu2_CheckWaterMedallionCutscene = 0x809C8E44; // type:func +EnRu2_CheckIfBlueWarpShouldSpawn = 0x809C8EE0; // type:func +EnRu2_EndRise = 0x809C8F30; // type:func +EnRu2_CheckStartRaisingArms = 0x809C8F5C; // type:func +EnRu2_HoldArmsUp = 0x809C8FF0; // type:func +EnRu2_CheckIfWaterMedallionShouldSpawn = 0x809C9004; // type:func +EnRu2_SetupWaterMedallionCutscene = 0x809C9050; // type:func +EnRu2_AwaitBlueWarp = 0x809C9070; // type:func +EnRu2_RiseThroughBlueWarp = 0x809C9090; // type:func +EnRu2_SageOfWaterDialog = 0x809C90CC; // type:func +EnRu2_RaiseArms = 0x809C9114; // type:func +EnRu2_AwaitWaterMedallion = 0x809C9158; // type:func +EnRu2_FinishWaterMedallionCutscene = 0x809C91A0; // type:func +EnRu2_InitWaterTrial = 0x809C91D4; // type:func +EnRu2_PlayWhiteOutSound = 0x809C9218; // type:func +EnRu2_SpawnLightBall = 0x809C9238; // type:func +EnRu2_CheckFadeIn = 0x809C92B8; // type:func +EnRu2_Fade = 0x809C930C; // type:func +EnRu2_CheckFadeOut = 0x809C9460; // type:func +EnRu2_WaterTrialInvisible = 0x809C94FC; // type:func +EnRu2_WaterTrialFade = 0x809C951C; // type:func +EnRu2_AwaitSpawnLightBall = 0x809C9564; // type:func +EnRu2_DrawXlu = 0x809C95AC; // type:func +EnRu2_InitCredits = 0x809C96F4; // type:func +EnRu2_FadeInCredits = 0x809C973C; // type:func +EnRu2_InitCreditsPosition = 0x809C97C8; // type:func +EnRu2_CheckVisibleInCredits = 0x809C9800; // type:func +EnRu2_SetupTurnHeadDownLeftAnimation = 0x809C984C; // type:func +EnRu2_HoldLookingDownLeftPose = 0x809C988C; // type:func +EnRu2_NextCreditsAction = 0x809C98C0; // type:func +EnRu2_CreditsInvisible = 0x809C994C; // type:func +EnRu2_CreditsFadeIn = 0x809C996C; // type:func +EnRu2_CreditsVisible = 0x809C99B8; // type:func +EnRu2_CreditsTurnHeadDownLeft = 0x809C9A00; // type:func +EnRu2_SetEncounterSwitchFlag = 0x809C9A44; // type:func +EnRu2_GetEncounterSwitchFlag = 0x809C9A74; // type:func +EnRu2_InitWaterTempleEncounter = 0x809C9AA4; // type:func +EnRu2_PlayFanfare = 0x809C9B0C; // type:func +EnRu2_SwimUpProgress = 0x809C9B2C; // type:func +EnRu2_IsPlayerInRangeForEncounter = 0x809C9B98; // type:func +EnRu2_CheckRangeToStartEncounter = 0x809C9BD4; // type:func +EnRu2_StartEncounter = 0x809C9C34; // type:func +EnRu2_EncounterBeginningHandler = 0x809C9C70; // type:func +EnRu2_DialogCameraHandler = 0x809C9D40; // type:func +EnRu2_StartSwimmingUp = 0x809C9E2C; // type:func +EnRu2_EndSwimmingUp = 0x809C9EC4; // type:func +EnRu2_WaterTempleEncounterRangeCheck = 0x809C9F18; // type:func +EnRu2_WaterTempleEncounterUnconditional = 0x809C9F5C; // type:func +EnRu2_WaterTempleEncounterBegin = 0x809C9FC4; // type:func +EnRu2_WaterTempleEncounterDialog = 0x809CA020; // type:func +EnRu2_WaterTempleEncounterEnd = 0x809CA07C; // type:func +EnRu2_WaterTempleSwimmingUp = 0x809CA0D8; // type:func +EnRu2_Update = 0x809CA13C; // type:func +EnRu2_Init = 0x809CA184; // type:func +EnRu2_DrawNothing = 0x809CA27C; // type:func +EnRu2_DrawOpa = 0x809CA28C; // type:func +EnRu2_Draw = 0x809CA3C0; // type:func +ObjDekujr_Init = 0x809CB6E0; // type:func +ObjDekujr_Destroy = 0x809CB7EC; // type:func +ObjDekujr_GetCueStartPos = 0x809CB7FC; // type:func +ObjDekujr_GetCueEndPos = 0x809CB840; // type:func +ObjDekujr_ComeUp = 0x809CB884; // type:func +ObjDekujr_Update = 0x809CBA34; // type:func +ObjDekujr_Draw = 0x809CBB24; // type:func +BgMizuUzu_Init = 0x809CBD20; // type:func +BgMizuUzu_Destroy = 0x809CBD9C; // type:func +func_8089F788 = 0x809CBDD0; // type:func +BgMizuUzu_Update = 0x809CBE48; // type:func +BgMizuUzu_Draw = 0x809CBE6C; // type:func +BgSpot06Objects_Init = 0x809CBEF0; // type:func +BgSpot06Objects_Destroy = 0x809CC2BC; // type:func +BgSpot06Objects_GateSpawnBubbles = 0x809CC324; // type:func +BgSpot06Objects_GateWaitForSwitch = 0x809CC41C; // type:func +BgSpot06Objects_GateWaitToOpen = 0x809CC4B0; // type:func +BgSpot06Objects_GateOpen = 0x809CC4E4; // type:func +BgSpot06Objects_DoNothing = 0x809CC570; // type:func +BgSpot06Objects_LockSpawnWaterRipples = 0x809CC580; // type:func +BgSpot06Objects_LockSpawnBubbles = 0x809CC5E4; // type:func +BgSpot06Objects_LockWait = 0x809CC678; // type:func +BgSpot06Objects_LockPullOutward = 0x809CC89C; // type:func +BgSpot06Objects_LockSwimToSurface = 0x809CC954; // type:func +BgSpot06Objects_LockFloat = 0x809CCBCC; // type:func +BgSpot06Objects_Update = 0x809CCC4C; // type:func +BgSpot06Objects_DrawLakeHyliaWater = 0x809CCCAC; // type:func +BgSpot06Objects_Draw = 0x809CCE94; // type:func +BgSpot06Objects_WaterPlaneCutsceneWait = 0x809CCF58; // type:func +BgSpot06Objects_WaterPlaneCutsceneRise = 0x809CCF84; // type:func +BgIceObjects_Init = 0x809CD2F0; // type:func +BgIceObjects_Destroy = 0x809CD37C; // type:func +BgIceObjects_SetNextTarget = 0x809CD3B0; // type:func +BgIceObjects_CheckPits = 0x809CD830; // type:func +BgIceObjects_Idle = 0x809CD9B8; // type:func +BgIceObjects_Slide = 0x809CDABC; // type:func +BgIceObjects_Reset = 0x809CDE4C; // type:func +BgIceObjects_Stuck = 0x809CDEE8; // type:func +BgIceObjects_Update = 0x809CDF24; // type:func +BgIceObjects_Draw = 0x809CDF48; // type:func +BgHakaWater_Init = 0x809CE230; // type:func +BgHakaWater_Destroy = 0x809CE2BC; // type:func +BgHakaWater_LowerWater = 0x809CE2CC; // type:func +BgHakaWater_Wait = 0x809CE414; // type:func +BgHakaWater_ChangeWaterLevel = 0x809CE4D0; // type:func +BgHakaWater_Update = 0x809CE5D8; // type:func +BgHakaWater_Draw = 0x809CE5FC; // type:func +EnMa2_GetTextId = 0x809CEA30; // type:func +EnMa2_UpdateTalkState = 0x809CEAC8; // type:func +func_80AA1AE4 = 0x809CEB78; // type:func +func_80AA1B58 = 0x809CEBEC; // type:func +func_80AA1C68 = 0x809CECFC; // type:func +EnMa2_UpdateEyes = 0x809CED54; // type:func +EnMa2_ChangeAnim = 0x809CEDE0; // type:func +func_80AA1DB4 = 0x809CEE50; // type:func +EnMa2_Init = 0x809CEEDC; // type:func +EnMa2_Destroy = 0x809CF080; // type:func +func_80AA2018 = 0x809CF0C0; // type:func +func_80AA204C = 0x809CF0F4; // type:func +func_80AA20E4 = 0x809CF190; // type:func +func_80AA21C8 = 0x809CF27C; // type:func +EnMa2_Update = 0x809CF31C; // type:func +EnMa2_OverrideLimbDraw = 0x809CF40C; // type:func +EnMa2_PostLimbDraw = 0x809CF64C; // type:func +EnMa2_Draw = 0x809CF700; // type:func +EnBomChu_Init = 0x809CFA90; // type:func +EnBomChu_Destroy = 0x809CFC30; // type:func +EnBomChu_Explode = 0x809CFC80; // type:func +EnBomChu_CrossProduct = 0x809CFDA0; // type:func +EnBomChu_UpdateFloorPoly = 0x809CFE14; // type:func +EnBomChu_WaitForRelease = 0x809D0048; // type:func +EnBomChu_Move = 0x809D01B8; // type:func +EnBomChu_WaitForKill = 0x809D06D0; // type:func +EnBomChu_ModelToWorld = 0x809D0710; // type:func +EnBomChu_SpawnRipples = 0x809D07C0; // type:func +EnBomChu_Update = 0x809D084C; // type:func +EnBomChu_Draw = 0x809D0C10; // type:func +EnHorseGameCheck_InitIngoRace = 0x809D1130; // type:func +EnHorseGameCheck_DestroyIngoRace = 0x809D11EC; // type:func +EnHorseGameCheck_FinishIngoRace = 0x809D1200; // type:func +EnHorseGameCheck_UpdateIngoRace = 0x809D134C; // type:func +EnHorseGameCheck_InitGerudoArchery = 0x809D17C4; // type:func +EnHorseGameCheck_DestroyGerudoArchery = 0x809D17E4; // type:func +EnHorseGameCheck_UpdateGerudoArchery = 0x809D17F8; // type:func +EnHorseGameCheck_InitType3 = 0x809D1840; // type:func +EnHorseGameCheck_DestroyType3 = 0x809D185C; // type:func +EnHorseGameCheck_UpdateType3 = 0x809D1870; // type:func +EnHorseGameCheck_InitMalonRace = 0x809D1884; // type:func +EnHorseGameCheck_DestroyMalonRace = 0x809D18D4; // type:func +EnHorseGameCheck_FinishMalonRace = 0x809D18E8; // type:func +EnHorseGameCheck_UpdateMalonRace = 0x809D19DC; // type:func +EnHorseGameCheck_Init = 0x809D1EF4; // type:func +EnHorseGameCheck_Destroy = 0x809D1F78; // type:func +EnHorseGameCheck_Update = 0x809D1FB4; // type:func +EnHorseGameCheck_Draw = 0x809D1FF0; // type:func +BossTw_AddDotEffect = 0x809D2200; // type:func +BossTw_AddDmgCloud = 0x809D22F4; // type:func +BossTw_AddRingEffect = 0x809D23F0; // type:func +BossTw_AddPlayerFreezeEffect = 0x809D24F4; // type:func +BossTw_AddFlameEffect = 0x809D25A0; // type:func +BossTw_AddMergeFlameEffect = 0x809D2678; // type:func +BossTw_AddShieldBlastEffect = 0x809D2780; // type:func +BossTw_AddShieldDeflectEffect = 0x809D2868; // type:func +BossTw_AddShieldHitEffect = 0x809D2A30; // type:func +BossTw_Init = 0x809D2BF8; // type:func +BossTw_Destroy = 0x809D3414; // type:func +BossTw_SetupTurnToPlayer = 0x809D347C; // type:func +BossTw_TurnToPlayer = 0x809D34CC; // type:func +BossTw_SetupFlyTo = 0x809D35EC; // type:func +BossTw_FlyTo = 0x809D37F0; // type:func +BossTw_SetupShootBeam = 0x809D3A24; // type:func +BossTw_SpawnGroundBlast = 0x809D3B0C; // type:func +BossTw_BeamHitPlayerCheck = 0x809D3E88; // type:func +BossTw_CheckBeamReflection = 0x809D4080; // type:func +BossTw_BeamReflHitCheck = 0x809D4308; // type:func +BossTw_GetFloorY = 0x809D4430; // type:func +BossTw_ShootBeam = 0x809D4704; // type:func +BossTw_SetupFinishBeamShoot = 0x809D56BC; // type:func +BossTw_FinishBeamShoot = 0x809D5718; // type:func +BossTw_SetupHitByBeam = 0x809D57B0; // type:func +BossTw_HitByBeam = 0x809D5818; // type:func +BossTw_SetupLaugh = 0x809D5AE0; // type:func +BossTw_Laugh = 0x809D5B44; // type:func +BossTw_SetupSpin = 0x809D5BD4; // type:func +BossTw_Spin = 0x809D5C50; // type:func +BossTw_SetupMergeCS = 0x809D5CF0; // type:func +BossTw_MergeCS = 0x809D5D3C; // type:func +BossTw_SetupWait = 0x809D5D80; // type:func +BossTw_Wait = 0x809D5DB8; // type:func +BossTw_TwinrovaSetupMergeCS = 0x809D5E5C; // type:func +BossTw_TwinrovaMergeCS = 0x809D5E7C; // type:func +BossTw_SetupDeathCS = 0x809D6948; // type:func +BossTw_DeathCS = 0x809D69B0; // type:func +BossTw_SetupCSWait = 0x809D6AB8; // type:func +BossTw_CSWait = 0x809D6AF0; // type:func +BossTw_TwinrovaSetupIntroCS = 0x809D6B00; // type:func +BossTw_TwinrovaIntroCS = 0x809D6B38; // type:func +BossTw_DeathBall = 0x809D838C; // type:func +BossTw_TwinrovaSetupDeathCS = 0x809D8688; // type:func +BossTw_DeathCSMsgSfx = 0x809D8744; // type:func +BossTw_TwinrovaDeathCS = 0x809D8F64; // type:func +BossTw_Update = 0x809D9C58; // type:func +BossTw_TwinrovaUpdate = 0x809DA2CC; // type:func +BossTw_OverrideLimbDraw = 0x809DAC48; // type:func +BossTw_PostLimbDraw = 0x809DACFC; // type:func +func_80941BC0 = 0x809DB114; // type:func +func_80942180 = 0x809DB68C; // type:func +func_809426F0 = 0x809DBBA8; // type:func +func_80942C70 = 0x809DC0F0; // type:func +func_80943028 = 0x809DC460; // type:func +BossTw_Draw = 0x809DC664; // type:func +BossTw_TwinrovaOverrideLimbDraw = 0x809DCD20; // type:func +BossTw_TwinrovaPostLimbDraw = 0x809DD14C; // type:func +BossTw_ShieldChargeDraw = 0x809DD288; // type:func +BossTw_SpawnPortalDraw = 0x809DDAF0; // type:func +func_80944C50 = 0x809DDF28; // type:func +BossTw_TwinrovaDraw = 0x809DE30C; // type:func +BossTw_BlastFire = 0x809DE644; // type:func +BossTw_BlastIce = 0x809DEF7C; // type:func +BossTw_BlastShieldCheck = 0x809DFAF0; // type:func +BossTw_BlastUpdate = 0x809DFD80; // type:func +BossTw_BlastDraw = 0x809DFEFC; // type:func +BossTw_DrawDeathBall = 0x809E0480; // type:func +BossTw_UpdateEffects = 0x809E09E0; // type:func +BossTw_InitRand = 0x809E1738; // type:func +BossTw_RandZeroOne = 0x809E1758; // type:func +BossTw_DrawEffects = 0x809E1880; // type:func +BossTw_TwinrovaSetupArriveAtTarget = 0x809E26B4; // type:func +BossTw_TwinrovaArriveAtTarget = 0x809E2728; // type:func +BossTw_TwinrovaSetupChargeBlast = 0x809E2854; // type:func +BossTw_TwinrovaChargeBlast = 0x809E28B4; // type:func +BossTw_TwinrovaSetupShootBlast = 0x809E2AA0; // type:func +BossTw_TwinrovaShootBlast = 0x809E2B28; // type:func +BossTw_TwinrovaSetupDoneBlastShoot = 0x809E2D78; // type:func +BossTw_TwinrovaDoneBlastShoot = 0x809E2DC4; // type:func +BossTw_TwinrovaDamage = 0x809E2E5C; // type:func +BossTw_TwinrovaStun = 0x809E2F88; // type:func +BossTw_TwinrovaSetupGetUp = 0x809E323C; // type:func +BossTw_TwinrovaGetUp = 0x809E32A0; // type:func +BossTw_TwinrovaSetupFly = 0x809E3334; // type:func +BossTw_TwinrovaFly = 0x809E350C; // type:func +BossTw_TwinrovaSetupSpin = 0x809E3780; // type:func +BossTw_TwinrovaSpin = 0x809E37D8; // type:func +BossTw_TwinrovaSetupLaugh = 0x809E3850; // type:func +BossTw_TwinrovaLaugh = 0x809E38B4; // type:func +EnRr_Init = 0x809E7DD0; // type:func +EnRr_Destroy = 0x809E7F70; // type:func +EnRr_Move = 0x809E7FB0; // type:func +EnRr_SetupReach = 0x809E7FD8; // type:func +EnRr_SetupNeutral = 0x809E80D8; // type:func +EnRr_SetupGrabPlayer = 0x809E81A4; // type:func +EnRr_GetMessage = 0x809E82AC; // type:func +EnRr_SetupReleasePlayer = 0x809E8300; // type:func +EnRr_SetupDamage = 0x809E84FC; // type:func +EnRr_SetupApproach = 0x809E85C8; // type:func +EnRr_SetupDeath = 0x809E8680; // type:func +EnRr_SetupStunned = 0x809E8720; // type:func +EnRr_CollisionCheck = 0x809E882C; // type:func +EnRr_InitBodySegments = 0x809E8BBC; // type:func +EnRr_UpdateBodySegments = 0x809E8D7C; // type:func +EnRr_Approach = 0x809E8F00; // type:func +EnRr_Reach = 0x809E8FC0; // type:func +EnRr_GrabPlayer = 0x809E90DC; // type:func +EnRr_Damage = 0x809E91D4; // type:func +EnRr_Death = 0x809E924C; // type:func +EnRr_Retreat = 0x809E95C0; // type:func +EnRr_Stunned = 0x809E9654; // type:func +EnRr_Update = 0x809E96BC; // type:func +EnRr_Draw = 0x809E9AE8; // type:func +EnBa_SetupAction = 0x809EA300; // type:func +EnBa_Init = 0x809EA30C; // type:func +EnBa_Destroy = 0x809EA4F8; // type:func +EnBa_SetupIdle = 0x809EA524; // type:func +EnBa_Idle = 0x809EA564; // type:func +EnBa_SetupFallAsBlob = 0x809EA990; // type:func +EnBa_FallAsBlob = 0x809EAA00; // type:func +EnBa_SetupSwingAtPlayer = 0x809EAAC0; // type:func +EnBa_SwingAtPlayer = 0x809EAB14; // type:func +func_809B7174 = 0x809EB134; // type:func +EnBa_RecoilFromDamage = 0x809EB1B0; // type:func +func_809B75A0 = 0x809EB564; // type:func +EnBa_Die = 0x809EB7E0; // type:func +EnBa_Update = 0x809EBB10; // type:func +EnBa_Draw = 0x809EBBF0; // type:func +EnBx_Init = 0x809EC1D0; // type:func +EnBx_Destroy = 0x809EC3D8; // type:func +func_809D1D0C = 0x809EC404; // type:func +EnBx_Update = 0x809EC4D4; // type:func +EnBx_Draw = 0x809EC7F8; // type:func +EnAnubice_Hover = 0x809ECCD0; // type:func +EnAnubice_AimFireball = 0x809ECD74; // type:func +EnAnubice_Init = 0x809ECE54; // type:func +EnAnubice_Destroy = 0x809ECF6C; // type:func +EnAnubice_FindFlameCircles = 0x809ECFC8; // type:func +EnAnubice_SetupIdle = 0x809ED050; // type:func +EnAnubice_Idle = 0x809ED0F8; // type:func +EnAnubice_GoToHome = 0x809ED1D8; // type:func +EnAnubice_SetupShootFireball = 0x809ED328; // type:func +EnAnubice_ShootFireball = 0x809ED3B0; // type:func +EnAnubice_SetupDie = 0x809ED4B0; // type:func +EnAnubice_Die = 0x809ED580; // type:func +EnAnubice_Update = 0x809ED834; // type:func +EnAnubice_OverrideLimbDraw = 0x809EDC38; // type:func +EnAnubice_PostLimbDraw = 0x809EDC84; // type:func +EnAnubice_Draw = 0x809EDD40; // type:func +EnAnubiceFire_Init = 0x809EDF80; // type:func +EnAnubiceFire_Destroy = 0x809EE0A0; // type:func +func_809B26EC = 0x809EE0CC; // type:func +func_809B27D8 = 0x809EE1B8; // type:func +func_809B2B48 = 0x809EE528; // type:func +EnAnubiceFire_Update = 0x809EE6D4; // type:func +EnAnubiceFire_Draw = 0x809EE8D0; // type:func +BgMoriHashigo_InitDynapoly = 0x809EED40; // type:func +BgMoriHashigo_InitCollider = 0x809EED98; // type:func +BgMoriHashigo_SpawnLadder = 0x809EEE44; // type:func +BgMoriHashigo_InitClasp = 0x809EEEFC; // type:func +BgMoriHashigo_InitLadder = 0x809EEF88; // type:func +BgMoriHashigo_Init = 0x809EEFCC; // type:func +BgMoriHashigo_Destroy = 0x809EF090; // type:func +BgMoriHashigo_SetupWaitForMoriTex = 0x809EF0E8; // type:func +BgMoriHashigo_WaitForMoriTex = 0x809EF0FC; // type:func +BgMoriHashigo_SetupClasp = 0x809EF17C; // type:func +BgMoriHashigo_Clasp = 0x809EF190; // type:func +BgMoriHashigo_SetupLadderWait = 0x809EF1F4; // type:func +BgMoriHashigo_LadderWait = 0x809EF208; // type:func +BgMoriHashigo_SetupLadderFall = 0x809EF23C; // type:func +BgMoriHashigo_LadderFall = 0x809EF278; // type:func +BgMoriHashigo_SetupLadderRest = 0x809EF358; // type:func +BgMoriHashigo_Update = 0x809EF37C; // type:func +BgMoriHashigo_Draw = 0x809EF3B8; // type:func +BgMoriHashira4_SetupAction = 0x809EF600; // type:func +BgMoriHashira4_InitDynaPoly = 0x809EF60C; // type:func +BgMoriHashira4_Init = 0x809EF664; // type:func +BgMoriHashira4_Destroy = 0x809EF778; // type:func +BgMoriHashira4_SetupWaitForMoriTex = 0x809EF7AC; // type:func +BgMoriHashira4_WaitForMoriTex = 0x809EF7D0; // type:func +BgMoriHashira4_SetupPillarsRotate = 0x809EF84C; // type:func +BgMoriHashira4_PillarsRotate = 0x809EF870; // type:func +BgMoriHashira4_GateWait = 0x809EF8A8; // type:func +BgMoriHashira4_GateOpen = 0x809EF954; // type:func +BgMoriHashira4_Update = 0x809EF9AC; // type:func +BgMoriHashira4_Draw = 0x809EF9D8; // type:func +BgMoriIdomizu_SetupAction = 0x809EFB90; // type:func +BgMoriIdomizu_SetWaterLevel = 0x809EFB9C; // type:func +BgMoriIdomizu_Init = 0x809EFBC4; // type:func +BgMoriIdomizu_Destroy = 0x809EFCE8; // type:func +BgMoriIdomizu_SetupWaitForMoriTex = 0x809EFD08; // type:func +BgMoriIdomizu_WaitForMoriTex = 0x809EFD2C; // type:func +BgMoriIdomizu_SetupMain = 0x809EFD84; // type:func +BgMoriIdomizu_Main = 0x809EFDA8; // type:func +BgMoriIdomizu_Update = 0x809EFF6C; // type:func +BgMoriIdomizu_Draw = 0x809EFF98; // type:func +BgSpot16Doughnut_Init = 0x809F01D0; // type:func +BgSpot16Doughnut_Destroy = 0x809F0344; // type:func +BgSpot16Doughnut_Update = 0x809F0354; // type:func +BgSpot16Doughnut_UpdateExpanding = 0x809F03E8; // type:func +BgSpot16Doughnut_Draw = 0x809F0450; // type:func +BgSpot16Doughnut_DrawExpanding = 0x809F0608; // type:func +BgBdanSwitch_InitDynaPoly = 0x809F0790; // type:func +BgBdanSwitch_InitCollision = 0x809F07E8; // type:func +func_8086D0EC = 0x809F083C; // type:func +BgBdanSwitch_Init = 0x809F09A8; // type:func +BgBdanSwitch_Destroy = 0x809F0B64; // type:func +func_8086D4B4 = 0x809F0BD0; // type:func +func_8086D548 = 0x809F0C64; // type:func +func_8086D5C4 = 0x809F0CE0; // type:func +func_8086D5E0 = 0x809F0D00; // type:func +func_8086D67C = 0x809F0D9C; // type:func +func_8086D694 = 0x809F0DB8; // type:func +func_8086D730 = 0x809F0E58; // type:func +func_8086D754 = 0x809F0E80; // type:func +func_8086D7FC = 0x809F0F28; // type:func +func_8086D80C = 0x809F0F3C; // type:func +func_8086D86C = 0x809F0F9C; // type:func +func_8086D888 = 0x809F0FBC; // type:func +func_8086D8BC = 0x809F0FF4; // type:func +func_8086D8CC = 0x809F1008; // type:func +func_8086D944 = 0x809F1080; // type:func +func_8086D95C = 0x809F109C; // type:func +func_8086D9F8 = 0x809F113C; // type:func +func_8086DA1C = 0x809F1164; // type:func +func_8086DAB4 = 0x809F1200; // type:func +func_8086DAC4 = 0x809F1214; // type:func +func_8086DB24 = 0x809F1274; // type:func +func_8086DB40 = 0x809F1294; // type:func +func_8086DB4C = 0x809F12A4; // type:func +func_8086DB68 = 0x809F12C4; // type:func +func_8086DC30 = 0x809F138C; // type:func +func_8086DC48 = 0x809F13A8; // type:func +func_8086DCCC = 0x809F142C; // type:func +func_8086DCE8 = 0x809F144C; // type:func +func_8086DDA8 = 0x809F150C; // type:func +func_8086DDC0 = 0x809F1528; // type:func +BgBdanSwitch_Update = 0x809F15BC; // type:func +func_8086DF58 = 0x809F16C0; // type:func +BgBdanSwitch_Draw = 0x809F1730; // type:func +EnMa1_GetTextId = 0x809F1BC0; // type:func +EnMa1_UpdateTalkState = 0x809F1CA8; // type:func +EnMa1_ShouldSpawn = 0x809F1DF4; // type:func +EnMa1_UpdateEyes = 0x809F1F40; // type:func +EnMa1_ChangeAnim = 0x809F1FB8; // type:func +EnMa1_UpdateTracking = 0x809F2028; // type:func +EnMa1_UpdateSinging = 0x809F20A8; // type:func +EnMa1_Init = 0x809F2120; // type:func +EnMa1_Destroy = 0x809F2288; // type:func +EnMa1_Idle = 0x809F22C8; // type:func +EnMa1_GiveWeirdEgg = 0x809F23E0; // type:func +EnMa1_FinishGivingWeirdEgg = 0x809F2440; // type:func +EnMa1_IdleTeachSong = 0x809F2488; // type:func +EnMa1_StartTeachSong = 0x809F25B4; // type:func +EnMa1_TeachSong = 0x809F2638; // type:func +EnMa1_WaitForPlayback = 0x809F26A0; // type:func +EnMa1_DoNothing = 0x809F2718; // type:func +EnMa1_Update = 0x809F2728; // type:func +EnMa1_OverrideLimbDraw = 0x809F2814; // type:func +EnMa1_PostLimbDraw = 0x809F29A4; // type:func +EnMa1_Draw = 0x809F2A00; // type:func +BossGanonEff_SpawnWindowShard = 0x809F2EA0; // type:func +BossGanonEff_SpawnSparkle = 0x809F2FE0; // type:func +BossGanonEff_SpawnLightRay = 0x809F30DC; // type:func +BossGanonEff_SpawnShock = 0x809F3220; // type:func +BossGanonEff_SpawnLightning = 0x809F32EC; // type:func +BossGanonEff_SpawnDustDark = 0x809F3390; // type:func +BossGanonEff_SpawnDustLight = 0x809F3484; // type:func +BossGanonEff_SpawnShockwave = 0x809F3568; // type:func +BossGanonEff_SpawnBlackDot = 0x809F3660; // type:func +BossGanon_SetColliderPos = 0x809F371C; // type:func +BossGanon_SetAnimationObject = 0x809F3760; // type:func +BossGanon_Init = 0x809F37D0; // type:func +BossGanon_Destroy = 0x809F3D74; // type:func +BossGanon_SetupIntroCutscene = 0x809F3DD8; // type:func +BossGanon_SetIntroCsCamera = 0x809F3EBC; // type:func +BossGanon_IntroCutscene = 0x809F3F5C; // type:func +BossGanon_SetupDeathCutscene = 0x809F565C; // type:func +BossGanon_SetupTowerCutscene = 0x809F5740; // type:func +BossGanon_ShatterWindows = 0x809F5844; // type:func +BossGanon_DeathAndTowerCutscene = 0x809F5988; // type:func +BossGanon_SetupPoundFloor = 0x809F7330; // type:func +BossGanon_PoundFloor = 0x809F736C; // type:func +BossGanon_SetupChargeBigMagic = 0x809F78C0; // type:func +BossGanon_ChargeBigMagic = 0x809F7930; // type:func +BossGanon_SetupWait = 0x809F8138; // type:func +BossGanon_Wait = 0x809F81C0; // type:func +BossGanon_SetupChargeLightBall = 0x809F850C; // type:func +BossGanon_ChargeLightBall = 0x809F857C; // type:func +BossGanon_SetupPlayTennis = 0x809F8730; // type:func +BossGanon_PlayTennis = 0x809F8798; // type:func +BossGanon_SetupBlock = 0x809F8A68; // type:func +BossGanon_Block = 0x809F8B20; // type:func +BossGanon_SetupHitByLightBall = 0x809F8CB0; // type:func +BossGanon_HitByLightBall = 0x809F8DA4; // type:func +BossGanon_SetupVulnerable = 0x809F8FFC; // type:func +BossGanon_Vulnerable = 0x809F91CC; // type:func +BossGanon_SetupDamaged = 0x809F9738; // type:func +BossGanon_Damaged = 0x809F97A0; // type:func +BossGanon_UpdateDamage = 0x809F9860; // type:func +BossGanon_Update = 0x809F9C28; // type:func +BossGanon_OverrideLimbDraw = 0x809FAD90; // type:func +BossGanon_PostLimbDraw = 0x809FAFD0; // type:func +BossGanon_InitRand = 0x809FB32C; // type:func +BossGanon_RandZeroOne = 0x809FB34C; // type:func +BossGanon_DrawShock = 0x809FB474; // type:func +BossGanon_DrawHandLightBall = 0x809FB820; // type:func +BossGanon_DrawBigMagicCharge = 0x809FBA74; // type:func +BossGanon_DrawTriforce = 0x809FC104; // type:func +BossGanon_DrawDarkVortex = 0x809FC4C8; // type:func +func_808E0254 = 0x809FC720; // type:func +BossGanon_GenShadowTexture = 0x809FCBC8; // type:func +BossGanon_DrawShadowTexture = 0x809FCF08; // type:func +BossGanon_Draw = 0x809FD184; // type:func +BossGanon_CheckFallingPlatforms = 0x809FD3CC; // type:func +BossGanon_LightBall_Update = 0x809FD4B4; // type:func +BossGanon_LightBall_Draw = 0x809FDFD4; // type:func +func_808E1EB4 = 0x809FE2E8; // type:func +func_808E229C = 0x809FE6D8; // type:func +func_808E2544 = 0x809FE948; // type:func +func_808E324C = 0x809FF65C; // type:func +BossGanon_UpdateEffects = 0x809FF930; // type:func +BossGanon_DrawEffects = 0x80A00158; // type:func +BossSst_Init = 0x80A18CD0; // type:func +BossSst_Destroy = 0x80A19158; // type:func +BossSst_HeadSetupLurk = 0x80A191A4; // type:func +BossSst_HeadLurk = 0x80A191D8; // type:func +BossSst_HeadSetupIntro = 0x80A19214; // type:func +BossSst_HeadIntro = 0x80A19360; // type:func +BossSst_HeadSetupWait = 0x80A1A178; // type:func +BossSst_HeadWait = 0x80A1A1C8; // type:func +BossSst_HeadSetupNeutral = 0x80A1A244; // type:func +BossSst_HeadNeutral = 0x80A1A264; // type:func +BossSst_HeadSetupDamagedHand = 0x80A1A408; // type:func +BossSst_HeadDamagedHand = 0x80A1A470; // type:func +BossSst_HeadSetupReadyCharge = 0x80A1A568; // type:func +BossSst_HeadReadyCharge = 0x80A1A5C0; // type:func +BossSst_HeadSetupCharge = 0x80A1A664; // type:func +BossSst_HeadCharge = 0x80A1A720; // type:func +BossSst_HeadSetupEndCharge = 0x80A1A980; // type:func +BossSst_HeadEndCharge = 0x80A1AA04; // type:func +BossSst_HeadSetupFrozenHand = 0x80A1AA74; // type:func +BossSst_HeadFrozenHand = 0x80A1AAC8; // type:func +BossSst_HeadSetupUnfreezeHand = 0x80A1AB10; // type:func +BossSst_HeadUnfreezeHand = 0x80A1AB5C; // type:func +BossSst_HeadSetupStunned = 0x80A1AB98; // type:func +BossSst_HeadStunned = 0x80A1AC38; // type:func +BossSst_HeadSetupVulnerable = 0x80A1AEBC; // type:func +BossSst_HeadVulnerable = 0x80A1AF5C; // type:func +BossSst_HeadSetupDamage = 0x80A1B05C; // type:func +BossSst_HeadDamage = 0x80A1B12C; // type:func +BossSst_HeadSetupRecover = 0x80A1B17C; // type:func +BossSst_HeadRecover = 0x80A1B208; // type:func +BossSst_SetCameraTargets = 0x80A1B39C; // type:func +BossSst_UpdateDeathCamera = 0x80A1B4C8; // type:func +BossSst_HeadSetupDeath = 0x80A1B654; // type:func +BossSst_HeadDeath = 0x80A1B7E8; // type:func +BossSst_HeadSetupThrash = 0x80A1BA38; // type:func +BossSst_HeadThrash = 0x80A1BAA0; // type:func +BossSst_HeadSetupDarken = 0x80A1BB1C; // type:func +BossSst_HeadDarken = 0x80A1BB64; // type:func +BossSst_HeadSetupFall = 0x80A1BD8C; // type:func +BossSst_HeadFall = 0x80A1BE24; // type:func +BossSst_HeadSetupMelt = 0x80A1BEC0; // type:func +BossSst_HeadMelt = 0x80A1BF10; // type:func +BossSst_HeadSetupFinish = 0x80A1BFC8; // type:func +BossSst_HeadFinish = 0x80A1C024; // type:func +BossSst_HandSetupWait = 0x80A1C31C; // type:func +BossSst_HandWait = 0x80A1C398; // type:func +BossSst_HandSetupDownbeat = 0x80A1C508; // type:func +BossSst_HandDownbeat = 0x80A1C57C; // type:func +BossSst_HandSetupDownbeatEnd = 0x80A1C6CC; // type:func +BossSst_HandDownbeatEnd = 0x80A1C728; // type:func +BossSst_HandSetupOffbeat = 0x80A1C81C; // type:func +BossSst_HandOffbeat = 0x80A1C890; // type:func +BossSst_HandSetupOffbeatEnd = 0x80A1C970; // type:func +BossSst_HandOffbeatEnd = 0x80A1C9BC; // type:func +BossSst_HandSetupEndSlam = 0x80A1CB00; // type:func +BossSst_HandEndSlam = 0x80A1CB74; // type:func +BossSst_HandSetupRetreat = 0x80A1CBB0; // type:func +BossSst_HandRetreat = 0x80A1CC58; // type:func +BossSst_HandSetupReadySlam = 0x80A1CE84; // type:func +BossSst_HandReadySlam = 0x80A1CEF0; // type:func +BossSst_HandSetupSlam = 0x80A1CFE0; // type:func +BossSst_HandSlam = 0x80A1D070; // type:func +BossSst_HandSetupReadySweep = 0x80A1D254; // type:func +BossSst_HandReadySweep = 0x80A1D2FC; // type:func +BossSst_HandSetupSweep = 0x80A1D420; // type:func +BossSst_HandSweep = 0x80A1D4AC; // type:func +BossSst_HandSetupReadyPunch = 0x80A1D6BC; // type:func +BossSst_HandReadyPunch = 0x80A1D724; // type:func +BossSst_HandSetupPunch = 0x80A1D780; // type:func +BossSst_HandPunch = 0x80A1D808; // type:func +BossSst_HandSetupReadyClap = 0x80A1D94C; // type:func +BossSst_HandReadyClap = 0x80A1DA3C; // type:func +BossSst_HandSetupClap = 0x80A1DC2C; // type:func +BossSst_HandClap = 0x80A1DC9C; // type:func +BossSst_HandSetupEndClap = 0x80A1DEC8; // type:func +BossSst_HandEndClap = 0x80A1DF34; // type:func +BossSst_HandSetupReadyGrab = 0x80A1DFD8; // type:func +BossSst_HandReadyGrab = 0x80A1E05C; // type:func +BossSst_HandSetupGrab = 0x80A1E104; // type:func +BossSst_HandGrab = 0x80A1E190; // type:func +BossSst_HandSetupCrush = 0x80A1E43C; // type:func +BossSst_HandCrush = 0x80A1E494; // type:func +BossSst_HandSetupEndCrush = 0x80A1E5AC; // type:func +BossSst_HandEndCrush = 0x80A1E5FC; // type:func +BossSst_HandSetupSwing = 0x80A1E638; // type:func +BossSst_HandSwing = 0x80A1E6C0; // type:func +BossSst_HandSetupReel = 0x80A1E9F4; // type:func +BossSst_HandReel = 0x80A1EA8C; // type:func +BossSst_HandSetupReadyShake = 0x80A1EBE4; // type:func +BossSst_HandReadyShake = 0x80A1EC34; // type:func +BossSst_HandSetupShake = 0x80A1ED9C; // type:func +BossSst_HandShake = 0x80A1EDB8; // type:func +BossSst_HandSetupReadyCharge = 0x80A1EF4C; // type:func +BossSst_HandReadyCharge = 0x80A1EFA0; // type:func +BossSst_HandSetupStunned = 0x80A1F118; // type:func +BossSst_HandStunned = 0x80A1F1C4; // type:func +BossSst_HandSetupDamage = 0x80A1F320; // type:func +BossSst_HandDamage = 0x80A1F37C; // type:func +BossSst_HandSetupThrash = 0x80A1F454; // type:func +BossSst_HandThrash = 0x80A1F4F0; // type:func +BossSst_HandSetupDarken = 0x80A1F6E4; // type:func +BossSst_HandDarken = 0x80A1F734; // type:func +BossSst_HandSetupFall = 0x80A1F7A8; // type:func +BossSst_HandFall = 0x80A1F7F8; // type:func +BossSst_HandSetupMelt = 0x80A1F87C; // type:func +BossSst_HandMelt = 0x80A1F8B8; // type:func +BossSst_HandSetupFinish = 0x80A1F930; // type:func +BossSst_HandFinish = 0x80A1F95C; // type:func +BossSst_HandSetupRecover = 0x80A1F988; // type:func +BossSst_HandRecover = 0x80A1F9DC; // type:func +BossSst_HandSetupFrozen = 0x80A1FA74; // type:func +BossSst_HandFrozen = 0x80A1FB40; // type:func +BossSst_HandSetupReadyBreakIce = 0x80A1FCA0; // type:func +BossSst_HandReadyBreakIce = 0x80A1FD54; // type:func +BossSst_HandSetupBreakIce = 0x80A1FE70; // type:func +BossSst_HandBreakIce = 0x80A1FE98; // type:func +BossSst_HandGrabPlayer = 0x80A2002C; // type:func +BossSst_HandReleasePlayer = 0x80A200CC; // type:func +BossSst_MoveAround = 0x80A20150; // type:func +BossSst_HandSelectAttack = 0x80A202DC; // type:func +BossSst_HandSetDamage = 0x80A203D8; // type:func +BossSst_HandSetInvulnerable = 0x80A20444; // type:func +BossSst_HeadSfx = 0x80A20484; // type:func +BossSst_HandCollisionCheck = 0x80A204B0; // type:func +BossSst_HeadCollisionCheck = 0x80A2063C; // type:func +BossSst_UpdateHand = 0x80A20788; // type:func +BossSst_UpdateHead = 0x80A20A98; // type:func +BossSst_OverrideHandDraw = 0x80A20D08; // type:func +BossSst_PostHandDraw = 0x80A20D58; // type:func +BossSst_OverrideHandTrailDraw = 0x80A20D94; // type:func +BossSst_DrawHand = 0x80A20DD8; // type:func +BossSst_OverrideHeadDraw = 0x80A21184; // type:func +BossSst_PostHeadDraw = 0x80A21988; // type:func +BossSst_DrawHead = 0x80A21A30; // type:func +BossSst_SpawnHeadShadow = 0x80A21E80; // type:func +BossSst_SpawnHandShadow = 0x80A21FAC; // type:func +BossSst_SpawnShockwave = 0x80A22060; // type:func +BossSst_SpawnIceCrystal = 0x80A2213C; // type:func +BossSst_SpawnIceShard = 0x80A223F8; // type:func +BossSst_IceShatter = 0x80A2264C; // type:func +BossSst_UpdateEffects = 0x80A22818; // type:func +BossSst_DrawEffects = 0x80A22ABC; // type:func +EnNy_Init = 0x80A252A0; // type:func +EnNy_Destroy = 0x80A253DC; // type:func +func_80ABCD40 = 0x80A25408; // type:func +func_80ABCD84 = 0x80A25450; // type:func +func_80ABCD94 = 0x80A25464; // type:func +func_80ABCDAC = 0x80A25480; // type:func +func_80ABCDBC = 0x80A25494; // type:func +EnNy_SetupTurnToStone = 0x80A254D8; // type:func +func_80ABCE38 = 0x80A25514; // type:func +func_80ABCE50 = 0x80A25530; // type:func +func_80ABCE90 = 0x80A25570; // type:func +func_80ABCEEC = 0x80A255CC; // type:func +EnNy_Move = 0x80A2562C; // type:func +EnNy_TurnToStone = 0x80A25740; // type:func +func_80ABD11C = 0x80A25800; // type:func +EnNy_CollisionCheck = 0x80A25874; // type:func +func_80ABD3B8 = 0x80A25A9C; // type:func +EnNy_Update = 0x80A25B84; // type:func +EnNy_SetupDie = 0x80A25E10; // type:func +EnNy_Die = 0x80A26094; // type:func +EnNy_UpdateDeath = 0x80A262A0; // type:func +EnNy_UpdateUnused = 0x80A262E0; // type:func +EnNy_Draw = 0x80A26410; // type:func +EnNy_DrawDeathEffect = 0x80A266E4; // type:func +EnFr_OrientUnderwater = 0x80A26BE0; // type:func +EnFr_Init = 0x80A26CF4; // type:func +EnFr_DrawIdle = 0x80A26DAC; // type:func +EnFr_DrawActive = 0x80A26DD4; // type:func +EnFr_Update = 0x80A26DE8; // type:func +EnFr_Destroy = 0x80A270E0; // type:func +EnFr_IsDivingIntoWater = 0x80A27114; // type:func +EnFr_DivingIntoWater = 0x80A27198; // type:func +EnFr_IsBelowLogSpot = 0x80A27244; // type:func +EnFr_IsAboveAndWithin30DistXZ = 0x80A272A0; // type:func +EnFr_DecrementBlinkTimer = 0x80A2731C; // type:func +EnFr_DecrementBlinkTimerUpdate = 0x80A27344; // type:func +EnFr_SetupJumpingOutOfWater = 0x80A273D4; // type:func +EnFr_JumpingOutOfWater = 0x80A27474; // type:func +EnFr_OrientOnLogSpot = 0x80A27614; // type:func +EnFr_ChooseJumpFromLogSpot = 0x80A276D4; // type:func +EnFr_JumpingUp = 0x80A277E8; // type:func +EnFr_JumpingBackIntoWater = 0x80A27928; // type:func +EnFr_SetScaleActive = 0x80A27A80; // type:func +EnFr_ButterflyPath = 0x80A27B88; // type:func +EnFr_UpdateActive = 0x80A27CE4; // type:func +EnFr_SetupJumpingUp = 0x80A27DC8; // type:func +EnFr_Idle = 0x80A27E68; // type:func +EnFr_Activate = 0x80A27F48; // type:func +EnFr_ActivateCheckFrogSong = 0x80A27FB0; // type:func +func_80A1BE98 = 0x80A28054; // type:func +EnFr_ListeningToOcarinaNotes = 0x80A280CC; // type:func +EnFr_ChildSong = 0x80A28218; // type:func +EnFr_ChildSongFirstTime = 0x80A28350; // type:func +EnFr_TalkBeforeFrogSong = 0x80A283A8; // type:func +EnFr_CheckOcarinaInputFrogSong = 0x80A28410; // type:func +EnFr_DeactivateButterfly = 0x80A2850C; // type:func +EnFr_GetNextNoteFrogSong = 0x80A28554; // type:func +EnFr_SetupFrogSong = 0x80A285D0; // type:func +EnFr_IsFrogSongComplete = 0x80A28644; // type:func +EnFr_OcarinaMistake = 0x80A286F4; // type:func +EnFr_ContinueFrogSong = 0x80A28750; // type:func +EnFr_SetupReward = 0x80A288F4; // type:func +EnFr_PrintTextBox = 0x80A28970; // type:func +EnFr_TalkBeforeReward = 0x80A289B0; // type:func +EnFr_SetReward = 0x80A28A18; // type:func +EnFr_Deactivate = 0x80A28B2C; // type:func +EnFr_GiveReward = 0x80A28C2C; // type:func +EnFr_SetIdle = 0x80A28C8C; // type:func +EnFr_UpdateIdle = 0x80A28CE0; // type:func +EnFr_OverrideLimbDraw = 0x80A28D0C; // type:func +EnFr_PostLimbDraw = 0x80A28D38; // type:func +EnFr_Draw = 0x80A28DF0; // type:func +ItemShield_SetupAction = 0x80A29670; // type:func +ItemShield_Init = 0x80A2967C; // type:func +ItemShield_Destroy = 0x80A297E4; // type:func +func_80B86AC8 = 0x80A29810; // type:func +func_80B86BC8 = 0x80A29914; // type:func +func_80B86CA8 = 0x80A299FC; // type:func +func_80B86F68 = 0x80A29CC0; // type:func +ItemShield_Update = 0x80A29DCC; // type:func +ItemShield_Draw = 0x80A29DF0; // type:func +BgIceShelter_InitColliders = 0x80A2A080; // type:func +BgIceShelter_InitDynaPoly = 0x80A2A1B4; // type:func +BgIceShelter_RotateY = 0x80A2A20C; // type:func +BgIceShelter_Init = 0x80A2A28C; // type:func +BgIceShelter_Destroy = 0x80A2A408; // type:func +BgIceShelter_SpawnSteamAround = 0x80A2A494; // type:func +BgIceShelter_SpawnSteamAlong = 0x80A2A708; // type:func +BgIceShelter_SetupIdle = 0x80A2A96C; // type:func +BgIceShelter_Idle = 0x80A2A988; // type:func +BgIceShelter_SetupMelt = 0x80A2AAC8; // type:func +BgIceShelter_Melt = 0x80A2AAE4; // type:func +BgIceShelter_Update = 0x80A2ACA8; // type:func +BgIceShelter_Draw = 0x80A2ACCC; // type:func +EnIceHono_XZDistanceSquared = 0x80A2B2C0; // type:func +EnIceHono_InitCapturableFlame = 0x80A2B2F0; // type:func +EnIceHono_InitDroppedFlame = 0x80A2B394; // type:func +EnIceHono_InitSmallFlame = 0x80A2B49C; // type:func +EnIceHono_Init = 0x80A2B504; // type:func +EnIceHono_Destroy = 0x80A2B664; // type:func +EnIceHono_InBottleRange = 0x80A2B6BC; // type:func +EnIceHono_SetupActionCapturableFlame = 0x80A2B7AC; // type:func +EnIceHono_CapturableFlame = 0x80A2B7D4; // type:func +EnIceHono_SetupActionDroppedFlame = 0x80A2B884; // type:func +EnIceHono_DropFlame = 0x80A2B8A8; // type:func +EnIceHono_SetupActionSpreadFlames = 0x80A2BA68; // type:func +EnIceHono_SpreadFlames = 0x80A2BA8C; // type:func +EnIceHono_SetupActionSmallFlame = 0x80A2BCE8; // type:func +EnIceHono_SmallFlameMove = 0x80A2BDBC; // type:func +EnIceHono_Update = 0x80A2BF14; // type:func +EnIceHono_Draw = 0x80A2C0A8; // type:func +ItemOcarina_SetupAction = 0x80A2C4B0; // type:func +ItemOcarina_Init = 0x80A2C4BC; // type:func +ItemOcarina_Destroy = 0x80A2C644; // type:func +ItemOcarina_Fly = 0x80A2C654; // type:func +ItemOcarina_GetThrown = 0x80A2C800; // type:func +func_80B864EC = 0x80A2C858; // type:func +func_80B865E0 = 0x80A2C94C; // type:func +ItemOcarina_DoNothing = 0x80A2C9AC; // type:func +ItemOcarina_StartSoTCutscene = 0x80A2C9BC; // type:func +ItemOcarina_WaitInWater = 0x80A2CA30; // type:func +ItemOcarina_Update = 0x80A2CB04; // type:func +ItemOcarina_Draw = 0x80A2CB28; // type:func +MagicDark_Init = 0x80A2CC80; // type:func +MagicDark_Destroy = 0x80A2CD64; // type:func +MagicDark_DiamondUpdate = 0x80A2CD9C; // type:func +MagicDark_DimLighting = 0x80A2CFE4; // type:func +MagicDark_OrbUpdate = 0x80A2D130; // type:func +MagicDark_DiamondDraw = 0x80A2D2D8; // type:func +MagicDark_OrbDraw = 0x80A2D540; // type:func +Demo6K_SetupAction = 0x80A2E4D0; // type:func +Demo6K_Init = 0x80A2E4DC; // type:func +Demo6K_Destroy = 0x80A2E8C4; // type:func +Demo6K_WaitForObject = 0x80A2E8F8; // type:func +func_80966E04 = 0x80A2E950; // type:func +func_80966E98 = 0x80A2E9E8; // type:func +func_80966F84 = 0x80A2EADC; // type:func +func_809670AC = 0x80A2EC04; // type:func +func_8096712C = 0x80A2EC84; // type:func +func_80967244 = 0x80A2ED9C; // type:func +func_80967410 = 0x80A2EF68; // type:func +func_809674E0 = 0x80A2F038; // type:func +func_809676A4 = 0x80A2F1FC; // type:func +func_8096784C = 0x80A2F3A4; // type:func +func_80967A04 = 0x80A2F560; // type:func +func_80967AD0 = 0x80A2F62C; // type:func +func_80967BF8 = 0x80A2F758; // type:func +func_80967DBC = 0x80A2F91C; // type:func +func_80967F10 = 0x80A2FA68; // type:func +Demo6K_Update = 0x80A2FB34; // type:func +func_80967FFC = 0x80A2FB58; // type:func +func_80968298 = 0x80A2FDB4; // type:func +func_8096865C = 0x80A30138; // type:func +func_809688C4 = 0x80A30358; // type:func +func_80968B70 = 0x80A305D4; // type:func +func_80968FB0 = 0x80A309D4; // type:func +func_809691BC = 0x80A30B98; // type:func +EnAnubiceTag_Init = 0x80A31230; // type:func +EnAnubiceTag_Destroy = 0x80A31280; // type:func +EnAnubiceTag_SpawnAnubis = 0x80A31290; // type:func +EnAnubiceTag_ManageAnubis = 0x80A31308; // type:func +EnAnubiceTag_Update = 0x80A3146C; // type:func +EnAnubiceTag_Draw = 0x80A31490; // type:func +BgHakaGate_Init = 0x80A31500; // type:func +BgHakaGate_Destroy = 0x80A317D0; // type:func +BgHakaGate_DoNothing = 0x80A3182C; // type:func +BgHakaGate_StatueInactive = 0x80A3183C; // type:func +BgHakaGate_StatueIdle = 0x80A31878; // type:func +BgHakaGate_StatueTurn = 0x80A31990; // type:func +BgHakaGate_FloorClosed = 0x80A31B74; // type:func +BgHakaGate_FloorOpen = 0x80A31CFC; // type:func +BgHakaGate_GateWait = 0x80A31D88; // type:func +BgHakaGate_GateOpen = 0x80A31DD8; // type:func +BgHakaGate_SkullOfTruth = 0x80A31E68; // type:func +BgHakaGate_FalseSkull = 0x80A31EC4; // type:func +BgHakaGate_Update = 0x80A31F44; // type:func +BgHakaGate_DrawFlame = 0x80A31F8C; // type:func +BgHakaGate_Draw = 0x80A32164; // type:func +BgSpot15Saku_Init = 0x80A325A0; // type:func +BgSpot15Saku_Destroy = 0x80A32654; // type:func +func_808B4930 = 0x80A32688; // type:func +func_808B4978 = 0x80A326D0; // type:func +func_808B4A04 = 0x80A3275C; // type:func +BgSpot15Saku_Update = 0x80A3278C; // type:func +BgSpot15Saku_Draw = 0x80A327C0; // type:func +BgJyaGoroiwa_UpdateCollider = 0x80A328E0; // type:func +BgJyaGoroiwa_InitCollider = 0x80A32938; // type:func +BgJyaGoroiwa_UpdateRotation = 0x80A329A0; // type:func +BgJyaGoroiwa_Init = 0x80A329E0; // type:func +BgJyaGoroiwa_Destroy = 0x80A32A74; // type:func +BgJyaGoroiwa_SetupMove = 0x80A32AA0; // type:func +BgJyaGoroiwa_Move = 0x80A32AD0; // type:func +BgJyaGoroiwa_SetupWait = 0x80A32D64; // type:func +BgJyaGoroiwa_Wait = 0x80A32D7C; // type:func +BgJyaGoroiwa_Update = 0x80A32DCC; // type:func +BgJyaGoroiwa_Draw = 0x80A32EB8; // type:func +BgJyaZurerukabe_InitDynaPoly = 0x80A33060; // type:func +func_8089B4C8 = 0x80A330B8; // type:func +BgJyaZurerukabe_Init = 0x80A33254; // type:func +BgJyaZurerukabe_Destroy = 0x80A33314; // type:func +func_8089B7B4 = 0x80A33360; // type:func +func_8089B7C4 = 0x80A33374; // type:func +func_8089B80C = 0x80A333C0; // type:func +func_8089B870 = 0x80A33428; // type:func +BgJyaZurerukabe_Update = 0x80A334F0; // type:func +BgJyaZurerukabe_Draw = 0x80A33548; // type:func +func_808958F0 = 0x80A33710; // type:func +BgJyaCobra_InitDynapoly = 0x80A33764; // type:func +BgJyaCobra_SpawnRay = 0x80A337BC; // type:func +func_80895A70 = 0x80A33824; // type:func +func_80895BEC = 0x80A339A4; // type:func +func_80895C74 = 0x80A33A28; // type:func +BgJyaCobra_UpdateShadowFromSide = 0x80A33CA8; // type:func +BgJyaCobra_UpdateShadowFromTop = 0x80A342D0; // type:func +BgJyaCobra_Init = 0x80A3458C; // type:func +BgJyaCobra_Destroy = 0x80A34678; // type:func +func_80896918 = 0x80A346AC; // type:func +func_80896950 = 0x80A346E8; // type:func +func_808969F8 = 0x80A34790; // type:func +func_80896ABC = 0x80A34858; // type:func +BgJyaCobra_Update = 0x80A349EC; // type:func +func_80896CB4 = 0x80A34A60; // type:func +func_80896D78 = 0x80A34AE8; // type:func +BgJyaCobra_DrawShadow = 0x80A34C14; // type:func +BgJyaCobra_Draw = 0x80A34E98; // type:func +BgJyaKanaami_InitDynaPoly = 0x80A35450; // type:func +BgJyaKanaami_Init = 0x80A354A8; // type:func +BgJyaKanaami_Destroy = 0x80A35528; // type:func +func_80899880 = 0x80A3555C; // type:func +func_80899894 = 0x80A35574; // type:func +func_8089993C = 0x80A3561C; // type:func +func_80899950 = 0x80A35634; // type:func +func_80899A08 = 0x80A356EC; // type:func +BgJyaKanaami_Update = 0x80A35700; // type:func +BgJyaKanaami_Draw = 0x80A35734; // type:func +Fishing_SetColliderElement = 0x80A35800; // type:func +Fishing_SeedRand = 0x80A35890; // type:func +Fishing_RandZeroOne = 0x80A358B0; // type:func +Fishing_SmoothStepToS = 0x80A35A68; // type:func +Fishing_SpawnRipple = 0x80A35AF4; // type:func +Fishing_SpawnDustSplash = 0x80A35C68; // type:func +Fishing_SpawnWaterDust = 0x80A35DB8; // type:func +Fishing_SpawnBubble = 0x80A35EF8; // type:func +Fishing_SpawnRainDrop = 0x80A3603C; // type:func +Fishing_InitPondProps = 0x80A36138; // type:func +Fishing_Init = 0x80A36424; // type:func +Fishing_Destroy = 0x80A36D34; // type:func +Fishing_UpdateEffects = 0x80A36DA0; // type:func +Fishing_DrawEffects = 0x80A3749C; // type:func +Fishing_DrawStreamSplash = 0x80A38014; // type:func +Fishing_IsAboveCounter = 0x80A38198; // type:func +Fishing_UpdateLine = 0x80A38258; // type:func +Fishing_UpdateLinePos = 0x80A387C4; // type:func +Fishing_DrawLureHook = 0x80A38974; // type:func +Fishing_UpdateSinkingLure = 0x80A38E20; // type:func +Fishing_DrawSinkingLure = 0x80A39110; // type:func +Fishing_DrawLureAndLine = 0x80A3940C; // type:func +Fishing_DrawRod = 0x80A39C70; // type:func +Fishing_UpdateLure = 0x80A3A564; // type:func +Fishing_SplashBySize = 0x80A3C0C8; // type:func +Fishing_SplashBySize2 = 0x80A3C368; // type:func +func_80B70ED4 = 0x80A3C550; // type:func +Fishing_FishLeapSfx = 0x80A3C8C4; // type:func +Fishing_HandleAquariumDialog = 0x80A3C984; // type:func +Fishing_UpdateFish = 0x80A3CADC; // type:func +Fishing_FishOverrideLimbDraw = 0x80A40904; // type:func +Fishing_FishPostLimbDraw = 0x80A409E0; // type:func +Fishing_LoachOverrideLimbDraw = 0x80A40A10; // type:func +Fishing_LoachPostLimbDraw = 0x80A40A74; // type:func +Fishing_DrawFish = 0x80A40AA4; // type:func +Fishing_HandleReedContact = 0x80A40CCC; // type:func +Fishing_HandleLilyPadContact = 0x80A40D8C; // type:func +Fishing_UpdatePondProps = 0x80A40E7C; // type:func +Fishing_DrawPondProps = 0x80A41130; // type:func +Fishing_UpdateGroupFishes = 0x80A41614; // type:func +Fishing_DrawGroupFishes = 0x80A41F34; // type:func +Fishing_HandleOwnerDialog = 0x80A42148; // type:func +Fishing_UpdateOwner = 0x80A42CBC; // type:func +Fishing_OwnerOverrideLimbDraw = 0x80A4469C; // type:func +Fishing_OwnerPostLimbDraw = 0x80A446C8; // type:func +Fishing_DrawOwner = 0x80A447A0; // type:func +ObjOshihiki_InitDynapoly = 0x80A4ED40; // type:func +ObjOshihiki_RotateXZ = 0x80A4ED98; // type:func +ObjOshihiki_StrongEnough = 0x80A4EDEC; // type:func +ObjOshihiki_ResetFloors = 0x80A4EE70; // type:func +ObjOshihiki_GetBlockUnder = 0x80A4EE9C; // type:func +ObjOshihiki_UpdateInitPos = 0x80A4EF2C; // type:func +ObjOshihiki_NoSwitchPress = 0x80A4F05C; // type:func +ObjOshihiki_CheckType = 0x80A4F128; // type:func +ObjOshihiki_SetScale = 0x80A4F178; // type:func +ObjOshihiki_SetTexture = 0x80A4F1B0; // type:func +ObjOshihiki_SetColor = 0x80A4F210; // type:func +ObjOshihiki_Init = 0x80A4F2B8; // type:func +ObjOshihiki_Destroy = 0x80A4F3E0; // type:func +ObjOshihiki_SetFloors = 0x80A4F414; // type:func +ObjOshihiki_GetHighestFloor = 0x80A4F574; // type:func +ObjOshihiki_SetGround = 0x80A4F6C0; // type:func +ObjOshihiki_CheckFloor = 0x80A4F718; // type:func +ObjOshihiki_CheckGround = 0x80A4F770; // type:func +ObjOshihiki_CheckWall = 0x80A4F7E8; // type:func +ObjOshihiki_MoveWithBlockUnder = 0x80A4FA3C; // type:func +ObjOshihiki_SetupOnScene = 0x80A4FB38; // type:func +ObjOshihiki_OnScene = 0x80A4FB70; // type:func +ObjOshihiki_SetupOnActor = 0x80A4FC5C; // type:func +ObjOshihiki_OnActor = 0x80A4FC9C; // type:func +ObjOshihiki_SetupPush = 0x80A4FE94; // type:func +ObjOshihiki_Push = 0x80A4FEC0; // type:func +ObjOshihiki_SetupFall = 0x80A500DC; // type:func +ObjOshihiki_Fall = 0x80A50134; // type:func +ObjOshihiki_Update = 0x80A50238; // type:func +ObjOshihiki_Draw = 0x80A502C0; // type:func +BgGateShutter_Init = 0x80A507F0; // type:func +BgGateShutter_Destroy = 0x80A508D8; // type:func +func_8087828C = 0x80A5090C; // type:func +func_80878300 = 0x80A50980; // type:func +func_808783AC = 0x80A50A30; // type:func +func_808783D4 = 0x80A50A58; // type:func +BgGateShutter_Update = 0x80A50B14; // type:func +BgGateShutter_Draw = 0x80A50B48; // type:func +EffDust_SetupAction = 0x80A50C80; // type:func +EffDust_SetupDraw = 0x80A50C8C; // type:func +EffDust_InitPosAndDistance = 0x80A50C98; // type:func +EffDust_Init = 0x80A50D10; // type:func +EffDust_Destroy = 0x80A50ED0; // type:func +EffDust_UpdateFunc_8099DB28 = 0x80A50EE0; // type:func +EffDust_UpdateFunc_8099DD74 = 0x80A5112C; // type:func +EffDust_UpdateFunc_8099DFC0 = 0x80A51378; // type:func +EffDust_Update = 0x80A5188C; // type:func +EffDust_DrawFunc_8099E4F4 = 0x80A518B0; // type:func +EffDust_DrawFunc_8099E784 = 0x80A51B04; // type:func +EffDust_Draw = 0x80A51E68; // type:func +BgSpot01Fusya_SetupAction = 0x80A52050; // type:func +BgSpot01Fusya_Init = 0x80A5205C; // type:func +BgSpot01Fusya_Destroy = 0x80A520D8; // type:func +func_808AAA50 = 0x80A520E8; // type:func +BgSpot01Fusya_Update = 0x80A521A8; // type:func +BgSpot01Fusya_Draw = 0x80A521CC; // type:func +BgSpot01Idohashira_PlayBreakSfx1 = 0x80A522F0; // type:func +BgSpot01Idohashira_PlayBreakSfx2 = 0x80A52318; // type:func +func_808AAD3C = 0x80A52350; // type:func +func_808AAE6C = 0x80A52488; // type:func +func_808AAF34 = 0x80A52554; // type:func +BgSpot01Idohashira_Destroy = 0x80A52718; // type:func +BgSpot01Idohashira_NotInCsMode = 0x80A5274C; // type:func +BgSpot01Idohashira_GetCue = 0x80A5276C; // type:func +func_808AB18C = 0x80A527B8; // type:func +func_808AB1DC = 0x80A5280C; // type:func +func_808AB29C = 0x80A528B0; // type:func +func_808AB3E8 = 0x80A529FC; // type:func +func_808AB3F8 = 0x80A52A10; // type:func +func_808AB414 = 0x80A52A30; // type:func +func_808AB444 = 0x80A52A5C; // type:func +func_808AB504 = 0x80A52B08; // type:func +func_808AB510 = 0x80A52B18; // type:func +func_808AB530 = 0x80A52B38; // type:func +func_808AB570 = 0x80A52B7C; // type:func +BgSpot01Idohashira_Update = 0x80A52B9C; // type:func +BgSpot01Idohashira_Init = 0x80A52BE4; // type:func +func_808AB700 = 0x80A52CFC; // type:func +BgSpot01Idohashira_Draw = 0x80A52D8C; // type:func +BgSpot01Idomizu_Init = 0x80A52EF0; // type:func +BgSpot01Idomizu_Destroy = 0x80A52F88; // type:func +BgSpot01Idomizu_UpdateWaterLevel = 0x80A52F98; // type:func +BgSpot01Idomizu_Update = 0x80A5304C; // type:func +BgSpot01Idomizu_Draw = 0x80A53070; // type:func +BgPoSyokudai_Init = 0x80A53210; // type:func +BgPoSyokudai_Destroy = 0x80A534B0; // type:func +BgPoSyokudai_Update = 0x80A53520; // type:func +BgPoSyokudai_Draw = 0x80A535A0; // type:func +BgGanonOtyuka_Init = 0x80A53B80; // type:func +BgGanonOtyuka_Destroy = 0x80A53C1C; // type:func +BgGanonOtyuka_WaitToFall = 0x80A53C50; // type:func +BgGanonOtyuka_Fall = 0x80A53EA0; // type:func +BgGanonOtyuka_DoNothing = 0x80A542E0; // type:func +BgGanonOtyuka_Update = 0x80A542F0; // type:func +BgGanonOtyuka_Draw = 0x80A54338; // type:func +func_808B3960 = 0x80A561C0; // type:func +BgSpot15Rrbox_RotatePoint = 0x80A56218; // type:func +func_808B3A34 = 0x80A5626C; // type:func +func_808B3A40 = 0x80A5627C; // type:func +func_808B3AAC = 0x80A562EC; // type:func +BgSpot15Rrbox_Init = 0x80A563D4; // type:func +BgSpot15Rrbox_Destroy = 0x80A564A4; // type:func +BgSpot15Rrbox_TrySnapToCheckedPoint = 0x80A564E0; // type:func +BgSpot15Rrbox_GetFloorHeight = 0x80A56620; // type:func +BgSpot15Rrbox_TrySnapToFloor = 0x80A567A0; // type:func +func_808B4010 = 0x80A56860; // type:func +func_808B4084 = 0x80A568D4; // type:func +func_808B40AC = 0x80A56900; // type:func +func_808B4178 = 0x80A569CC; // type:func +func_808B4194 = 0x80A569EC; // type:func +func_808B4380 = 0x80A56BD8; // type:func +func_808B43D0 = 0x80A56C28; // type:func +func_808B44B8 = 0x80A56CF4; // type:func +func_808B44CC = 0x80A56D0C; // type:func +BgSpot15Rrbox_Update = 0x80A56D30; // type:func +BgSpot15Rrbox_Draw = 0x80A56D9C; // type:func +BgUmaJump_Init = 0x80A56FA0; // type:func +BgUmaJump_Destroy = 0x80A5705C; // type:func +BgUmaJump_Update = 0x80A57090; // type:func +BgUmaJump_Draw = 0x80A570A0; // type:func +EnInsect_InitFlags = 0x80A57130; // type:func +EnInsect_XZDistanceSquared = 0x80A57154; // type:func +EnInsect_InBottleRange = 0x80A57184; // type:func +EnInsect_SetCrawlAnim = 0x80A57274; // type:func +EnInsect_TryFindNearbySoil = 0x80A572C0; // type:func +EnInsect_UpdateCrawlSfx = 0x80A57378; // type:func +EnInsect_Init = 0x80A5740C; // type:func +EnInsect_Destroy = 0x80A57658; // type:func +EnInsect_SetupSlowDown = 0x80A576C8; // type:func +EnInsect_SlowDown = 0x80A57718; // type:func +EnInsect_SetupCrawl = 0x80A578BC; // type:func +EnInsect_Crawl = 0x80A5790C; // type:func +EnInsect_SetupRunFromPlayer = 0x80A57B38; // type:func +EnInsect_RunFromPlayer = 0x80A57B88; // type:func +EnInsect_SetupCaught = 0x80A57D80; // type:func +EnInsect_Caught = 0x80A57DEC; // type:func +EnInsect_SetupDig = 0x80A57EE4; // type:func +EnInsect_Dig = 0x80A57F5C; // type:func +EnInsect_SetupWalkOnWater = 0x80A58180; // type:func +EnInsect_WalkOnWater = 0x80A581E0; // type:func +EnInsect_SetupDrown = 0x80A58514; // type:func +EnInsect_Drown = 0x80A5858C; // type:func +EnInsect_SetupDropped = 0x80A586BC; // type:func +EnInsect_Dropped = 0x80A58784; // type:func +EnInsect_Update = 0x80A58EB4; // type:func +EnInsect_Draw = 0x80A590FC; // type:func +EnButte_SelectFlightParams = 0x80A59650; // type:func +EnButte_ResetTransformationEffect = 0x80A596D4; // type:func +EnButte_UpdateTransformationEffect = 0x80A596F0; // type:func +EnButte_DrawTransformationEffect = 0x80A59728; // type:func +EnButte_Init = 0x80A59964; // type:func +EnButte_Destroy = 0x80A59AD8; // type:func +func_809CD56C = 0x80A59B04; // type:func +func_809CD634 = 0x80A59BCC; // type:func +EnButte_Turn = 0x80A59C94; // type:func +EnButte_SetupFlyAround = 0x80A59D30; // type:func +EnButte_FlyAround = 0x80A59D7C; // type:func +EnButte_SetupFollowLink = 0x80A5A160; // type:func +EnButte_FollowLink = 0x80A5A1AC; // type:func +EnButte_SetupTransformIntoFairy = 0x80A5A560; // type:func +EnButte_TransformIntoFairy = 0x80A5A5B0; // type:func +EnButte_SetupWaitToDie = 0x80A5A66C; // type:func +EnButte_WaitToDie = 0x80A5A68C; // type:func +EnButte_Update = 0x80A5A6BC; // type:func +EnButte_Draw = 0x80A5A7FC; // type:func +EnFish_XZDistanceSquared = 0x80A5AC20; // type:func +EnFish_SetInWaterAnimation = 0x80A5AC50; // type:func +EnFish_SetOutOfWaterAnimation = 0x80A5ACB4; // type:func +EnFish_BeginRespawn = 0x80A5AD18; // type:func +EnFish_SetCutsceneData = 0x80A5AD4C; // type:func +EnFish_ClearCutsceneData = 0x80A5ADE4; // type:func +EnFish_Init = 0x80A5AE0C; // type:func +EnFish_Destroy = 0x80A5AF50; // type:func +EnFish_SetYOffset = 0x80A5AF7C; // type:func +EnFish_InBottleRange = 0x80A5B034; // type:func +EnFish_CheckXZDistanceToPlayer = 0x80A5B124; // type:func +EnFish_Respawning_SetupSlowDown = 0x80A5B154; // type:func +EnFish_Respawning_SlowDown = 0x80A5B1AC; // type:func +EnFish_Respawning_SetupFollowChild = 0x80A5B2A0; // type:func +EnFish_Respawning_FollowChild = 0x80A5B2F8; // type:func +EnFish_Respawning_SetupFleePlayer = 0x80A5B48C; // type:func +EnFish_Respawning_FleePlayer = 0x80A5B4E4; // type:func +EnFish_Respawning_SetupApproachPlayer = 0x80A5B6D4; // type:func +EnFish_Respawning_ApproachPlayer = 0x80A5B72C; // type:func +EnFish_Dropped_SetupFall = 0x80A5B8F0; // type:func +EnFish_Dropped_Fall = 0x80A5B950; // type:func +EnFish_Dropped_SetupFlopOnGround = 0x80A5BA58; // type:func +EnFish_Dropped_FlopOnGround = 0x80A5BB9C; // type:func +EnFish_Dropped_SetupSwimAway = 0x80A5BD78; // type:func +EnFish_Dropped_SwimAway = 0x80A5BDEC; // type:func +EnFish_Unique_SetupSwimIdle = 0x80A5BFB4; // type:func +EnFish_Unique_SwimIdle = 0x80A5C00C; // type:func +EnFish_Cutscene_FlopOnGround = 0x80A5C234; // type:func +EnFish_Cutscene_WiggleFlyingThroughAir = 0x80A5C364; // type:func +EnFish_UpdateCutscene = 0x80A5C400; // type:func +EnFish_OrdinaryUpdate = 0x80A5C5C0; // type:func +EnFish_RespawningUpdate = 0x80A5C744; // type:func +EnFish_Update = 0x80A5C858; // type:func +EnFish_Draw = 0x80A5C904; // type:func +BgSpot08Iceblock_SetupAction = 0x80A5CD30; // type:func +BgSpot08Iceblock_InitDynaPoly = 0x80A5CD3C; // type:func +BgSpot08Iceblock_CheckParams = 0x80A5CD94; // type:func +BgSpot08Iceblock_Bobbing = 0x80A5CDF4; // type:func +BgSpot08Iceblock_SinkUnderPlayer = 0x80A5CE50; // type:func +BgSpot08Iceblock_SetWaterline = 0x80A5CF00; // type:func +BgSpot08Iceblock_MultVectorScalar = 0x80A5CF20; // type:func +BgSpot08Iceblock_CrossProduct = 0x80A5CF54; // type:func +BgSpot08Iceblock_NormalizeVector = 0x80A5CFC8; // type:func +BgSpot08Iceblock_Roll = 0x80A5D064; // type:func +BgSpot08Iceblock_SpawnTwinFloe = 0x80A5D3D8; // type:func +BgSpot08Iceblock_Init = 0x80A5D4D8; // type:func +BgSpot08Iceblock_Destroy = 0x80A5D6CC; // type:func +BgSpot08Iceblock_SetupFloatNonrotating = 0x80A5D700; // type:func +BgSpot08Iceblock_FloatNonrotating = 0x80A5D724; // type:func +BgSpot08Iceblock_SetupFloatRotating = 0x80A5D778; // type:func +BgSpot08Iceblock_FloatRotating = 0x80A5D79C; // type:func +BgSpot08Iceblock_SetupFloatOrbitingTwins = 0x80A5D7FC; // type:func +BgSpot08Iceblock_FloatOrbitingTwins = 0x80A5D820; // type:func +BgSpot08Iceblock_SetupNoAction = 0x80A5D8F8; // type:func +BgSpot08Iceblock_Update = 0x80A5D918; // type:func +BgSpot08Iceblock_Draw = 0x80A5D9B4; // type:func +ItemEtcetera_SetupAction = 0x80A5DD70; // type:func +ItemEtcetera_Init = 0x80A5DD7C; // type:func +ItemEtcetera_Destroy = 0x80A5DEFC; // type:func +ItemEtcetera_WaitForObject = 0x80A5DF0C; // type:func +func_80B85824 = 0x80A5DF64; // type:func +func_80B858B4 = 0x80A5DFFC; // type:func +ItemEtcetera_SpawnSparkles = 0x80A5E0DC; // type:func +ItemEtcetera_MoveFireArrowDown = 0x80A5E1EC; // type:func +func_80B85B28 = 0x80A5E27C; // type:func +ItemEtcetera_UpdateFireArrow = 0x80A5E2C4; // type:func +ItemEtcetera_Update = 0x80A5E344; // type:func +ItemEtcetera_DrawThroughLens = 0x80A5E368; // type:func +ItemEtcetera_Draw = 0x80A5E3C0; // type:func +ArrowFire_SetupAction = 0x80A5E640; // type:func +ArrowFire_Init = 0x80A5E64C; // type:func +ArrowFire_Destroy = 0x80A5E6C8; // type:func +ArrowFire_Charge = 0x80A5E6EC; // type:func +func_80865ECC = 0x80A5E7E0; // type:func +ArrowFire_Hit = 0x80A5E838; // type:func +ArrowFire_Fly = 0x80A5EA04; // type:func +ArrowFire_Update = 0x80A5EB58; // type:func +ArrowFire_Draw = 0x80A5EBAC; // type:func +ArrowIce_SetupAction = 0x80A60520; // type:func +ArrowIce_Init = 0x80A6052C; // type:func +ArrowIce_Destroy = 0x80A605A8; // type:func +ArrowIce_Charge = 0x80A605CC; // type:func +func_80867E8C = 0x80A606C0; // type:func +ArrowIce_Hit = 0x80A60718; // type:func +ArrowIce_Fly = 0x80A608E4; // type:func +ArrowIce_Update = 0x80A60A38; // type:func +ArrowIce_Draw = 0x80A60A8C; // type:func +ArrowLight_SetupAction = 0x80A62420; // type:func +ArrowLight_Init = 0x80A6242C; // type:func +ArrowLight_Destroy = 0x80A624A8; // type:func +ArrowLight_Charge = 0x80A624CC; // type:func +func_80869E6C = 0x80A625C0; // type:func +ArrowLight_Hit = 0x80A62618; // type:func +ArrowLight_Fly = 0x80A627E4; // type:func +ArrowLight_Update = 0x80A62938; // type:func +ArrowLight_Draw = 0x80A6298C; // type:func +ObjKibako_SpawnCollectible = 0x80A64330; // type:func +ObjKibako_ApplyGravity = 0x80A64390; // type:func +ObjKibako_InitCollider = 0x80A643C4; // type:func +ObjKibako_Init = 0x80A6441C; // type:func +ObjKibako_Destroy = 0x80A64494; // type:func +ObjKibako_AirBreak = 0x80A644C0; // type:func +ObjKibako_WaterBreak = 0x80A64740; // type:func +ObjKibako_SetupIdle = 0x80A649C0; // type:func +ObjKibako_Idle = 0x80A649DC; // type:func +ObjKibako_SetupHeld = 0x80A64BD8; // type:func +ObjKibako_Held = 0x80A64C0C; // type:func +ObjKibako_SetupThrown = 0x80A64CD8; // type:func +ObjKibako_Thrown = 0x80A64D38; // type:func +ObjKibako_Update = 0x80A64E74; // type:func +ObjKibako_Draw = 0x80A64E98; // type:func +ObjTsubo_SpawnCollectible = 0x80A65030; // type:func +ObjTsubo_ApplyGravity = 0x80A65090; // type:func +ObjTsubo_SnapToFloor = 0x80A650C4; // type:func +ObjTsubo_InitCollider = 0x80A65160; // type:func +ObjTsubo_Init = 0x80A651B8; // type:func +ObjTsubo_Destroy = 0x80A65288; // type:func +ObjTsubo_AirBreak = 0x80A652B4; // type:func +ObjTsubo_WaterBreak = 0x80A6553C; // type:func +ObjTsubo_SetupWaitForObject = 0x80A657D4; // type:func +ObjTsubo_WaitForObject = 0x80A657E8; // type:func +ObjTsubo_SetupIdle = 0x80A6585C; // type:func +ObjTsubo_Idle = 0x80A65870; // type:func +ObjTsubo_SetupLiftedUp = 0x80A65A80; // type:func +ObjTsubo_LiftedUp = 0x80A65AC4; // type:func +ObjTsubo_SetupThrown = 0x80A65B4C; // type:func +ObjTsubo_Thrown = 0x80A65C14; // type:func +ObjTsubo_Update = 0x80A65DA8; // type:func +ObjTsubo_Draw = 0x80A65DCC; // type:func +EnWonderItem_Destroy = 0x80A66020; // type:func +EnWonderItem_DropCollectible = 0x80A66064; // type:func +EnWonderItem_Init = 0x80A661C0; // type:func +EnWonderItem_MultitagFree = 0x80A6650C; // type:func +EnWonderItem_ProximityDrop = 0x80A66654; // type:func +EnWonderItem_InteractSwitch = 0x80A666BC; // type:func +EnWonderItem_ProximitySwitch = 0x80A666F0; // type:func +EnWonderItem_MultitagOrdered = 0x80A6677C; // type:func +EnWonderItem_BombSoldier = 0x80A668D8; // type:func +EnWonderItem_RollDrop = 0x80A66968; // type:func +EnWonderItem_Update = 0x80A669DC; // type:func +EnIk_Destroy = 0x80A66D50; // type:func +EnIk_SetupAction = 0x80A66DD0; // type:func +EnIk_InitImpl = 0x80A66DDC; // type:func +EnIk_HandleBlocking = 0x80A67028; // type:func +EnIk_FindBreakableProp = 0x80A670B8; // type:func +EnIk_SetupStandUp = 0x80A67158; // type:func +EnIk_StandUp = 0x80A67204; // type:func +EnIk_SetupIdle = 0x80A672E4; // type:func +EnIk_Idle = 0x80A67374; // type:func +EnIk_SetupWalkOrRun = 0x80A674F4; // type:func +EnIk_WalkOrRun = 0x80A675EC; // type:func +EnIk_SetupVerticalAttack = 0x80A67874; // type:func +EnIk_VerticalAttack = 0x80A67904; // type:func +EnIk_SetupPullOutAxe = 0x80A67AB8; // type:func +EnIk_PullOutAxe = 0x80A67B58; // type:func +EnIk_SetupDoubleHorizontalAttack = 0x80A67C14; // type:func +EnIk_DoubleHorizontalAttack = 0x80A67CAC; // type:func +EnIk_SetupRecoverFromHorizontalAttack = 0x80A67E1C; // type:func +EnIk_RecoverFromHorizontalAttack = 0x80A67EA8; // type:func +EnIk_SetupSingleHorizontalAttack = 0x80A67EF0; // type:func +EnIk_SingleHorizontalAttack = 0x80A67F80; // type:func +EnIk_SetupStopAndBlock = 0x80A68040; // type:func +EnIk_StopAndBlock = 0x80A680CC; // type:func +EnIk_SetupReactToAttack = 0x80A681E0; // type:func +EnIk_ReactToAttack = 0x80A68300; // type:func +EnIk_SetupDie = 0x80A683DC; // type:func +EnIk_Die = 0x80A68488; // type:func +EnIk_UpdateDamage = 0x80A68684; // type:func +EnIk_UpdateEnemy = 0x80A689F0; // type:func +EnIk_SetPrimEnvColors = 0x80A68C08; // type:func +EnIk_OverrideLimbDrawEnemy = 0x80A68CC0; // type:func +EnIk_PostLimbDrawEnemy = 0x80A68D80; // type:func +EnIk_DrawEnemy = 0x80A69194; // type:func +EnIk_StartMinibossBgm = 0x80A695CC; // type:func +EnIk_UpdateAction2Sfx = 0x80A695EC; // type:func +EnIk_PlayAxeSpawnSfx = 0x80A697B8; // type:func +EnIk_SpawnAxeSmoke = 0x80A69808; // type:func +EnIk_UpdateBgCheckInfo = 0x80A69A14; // type:func +EnIk_UpdateSkelAnime = 0x80A69A5C; // type:func +EnIk_GetCue = 0x80A69A80; // type:func +EnIk_SetStartPosRotFromCue = 0x80A69AA8; // type:func +EnIk_GetAnimCurFrame = 0x80A69B28; // type:func +EnIk_SetupCsAction0 = 0x80A69B34; // type:func +EnIk_SetupCsAction1 = 0x80A69B48; // type:func +EnIk_SetupCsAction2 = 0x80A69BD4; // type:func +EnIk_HandleEnemyChange = 0x80A69C54; // type:func +EnIk_PlayArmorFallSfx = 0x80A69C94; // type:func +EnIk_PlayDeathSfx = 0x80A69CDC; // type:func +EnIk_SetupCsAction3 = 0x80A69D50; // type:func +EnIk_SetupCsAction4 = 0x80A69E28; // type:func +EnIk_SetupCsAction5 = 0x80A69E64; // type:func +EnIk_CsAction3 = 0x80A69E80; // type:func +EnIk_CsAction4 = 0x80A69EB8; // type:func +EnIk_CsAction5 = 0x80A69EF8; // type:func +EnIk_OverrideLimbDrawDefeat = 0x80A69F34; // type:func +EnIk_PostLimbDrawDefeat = 0x80A69FA0; // type:func +EnIk_CsDrawDefeat = 0x80A6A1EC; // type:func +EnIk_HandleCsCues = 0x80A6A350; // type:func +EnIk_CsAction0 = 0x80A6A44C; // type:func +EnIk_CsAction1 = 0x80A6A46C; // type:func +EnIk_CsAction2 = 0x80A6A4A4; // type:func +EnIk_UpdateCutscene = 0x80A6A508; // type:func +EnIk_OverrideLimbDrawIntro = 0x80A6A550; // type:func +EnIk_PostLimbDrawIntro = 0x80A6A5D4; // type:func +EnIk_CsDrawNothing = 0x80A6A7C0; // type:func +EnIk_CsDrawIntro = 0x80A6A7D0; // type:func +EnIk_DrawCutscene = 0x80A6A934; // type:func +EnIk_CsInit = 0x80A6A97C; // type:func +EnIk_ChangeToEnemy = 0x80A6A9EC; // type:func +EnIk_StartDefeatCutscene = 0x80A6AA58; // type:func +EnIk_Init = 0x80A6AAEC; // type:func +DemoIk_Destroy = 0x80A6B3B0; // type:func +DemoIk_BgCheck = 0x80A6B3C0; // type:func +DemoIk_UpdateSkelAnime = 0x80A6B408; // type:func +DemoIk_GetCue = 0x80A6B42C; // type:func +DemoIk_CheckForCue = 0x80A6B454; // type:func +DemoIk_SetMove = 0x80A6B494; // type:func +DemoIk_EndMove = 0x80A6B4D4; // type:func +DemoIk_GetCurFrame = 0x80A6B4E8; // type:func +DemoIk_SetColors = 0x80A6B4F4; // type:func +DemoIk_GetCueChannel = 0x80A6B598; // type:func +DemoIk_Type1PlaySfx = 0x80A6B5C4; // type:func +DemoIk_SpawnDeadDb = 0x80A6B6C4; // type:func +DemoIk_MoveToStartPos = 0x80A6B868; // type:func +DemoIk_Type1Init = 0x80A6B8E8; // type:func +func_8098393C = 0x80A6BA04; // type:func +func_8098394C = 0x80A6BA18; // type:func +func_809839AC = 0x80A6BA7C; // type:func +func_809839D0 = 0x80A6BAA4; // type:func +DemoIk_Type1Action0 = 0x80A6BB64; // type:func +DemoIk_Type1Action1 = 0x80A6BB84; // type:func +DemoIk_Type1Action2 = 0x80A6BBBC; // type:func +DemoIk_Type1PostLimbDraw = 0x80A6BC24; // type:func +DemoIk_Type1Draw = 0x80A6BD20; // type:func +DemoIk_Type2Init = 0x80A6BE78; // type:func +DemoIk_Type2PlaySfxOnFrame = 0x80A6BF80; // type:func +DemoIk_Type2PlaySfx = 0x80A6BFE0; // type:func +func_80983FDC = 0x80A6C030; // type:func +func_80983FEC = 0x80A6C044; // type:func +func_8098402C = 0x80A6C084; // type:func +func_80984048 = 0x80A6C0A4; // type:func +DemoIk_Type2Action0 = 0x80A6C16C; // type:func +DemoIk_Type2Action1 = 0x80A6C18C; // type:func +DemoIk_Type2Action2 = 0x80A6C1AC; // type:func +DemoIk_Type2OverrideLimbDraw = 0x80A6C1E8; // type:func +DemoIk_Type2PostLimbDraw = 0x80A6C244; // type:func +DemoIk_Type2Draw = 0x80A6C414; // type:func +DemoIk_Update = 0x80A6C578; // type:func +DemoIk_DrawNothing = 0x80A6C5C0; // type:func +DemoIk_Draw = 0x80A6C5D0; // type:func +DemoIk_Init = 0x80A6C618; // type:func +EnSkj_ChangeAnim = 0x80A6C8C0; // type:func +EnSkj_SetupAction = 0x80A6C948; // type:func +EnSkj_CalculateCenter = 0x80A6C9A0; // type:func +EnSkj_SetNaviId = 0x80A6CA38; // type:func +EnSkj_Init = 0x80A6CABC; // type:func +EnSkj_Destroy = 0x80A6CE08; // type:func +EnSkj_RangeCheck = 0x80A6CE34; // type:func +EnSkj_GetItemXzRange = 0x80A6CEB0; // type:func +EnSkj_GetItemYRange = 0x80A6CEF8; // type:func +EnSkj_ShootNeedle = 0x80A6CF24; // type:func +EnSkj_SpawnBlood = 0x80A6D03C; // type:func +EnSkj_CollisionCheck = 0x80A6D194; // type:func +func_80AFEDF8 = 0x80A6D350; // type:func +EnSkj_Backflip = 0x80A6D3DC; // type:func +EnSkj_Fade = 0x80A6D424; // type:func +EnSkj_SetupWaitToShootNeedle = 0x80A6D4B4; // type:func +EnSkj_WaitToShootNeedle = 0x80A6D4F0; // type:func +EnSkj_SetupResetFight = 0x80A6D590; // type:func +EnSkj_SariasSongKidIdle = 0x80A6D5D4; // type:func +EnSkj_SetupDie = 0x80A6D6CC; // type:func +EnSkj_WaitForDeathAnim = 0x80A6D700; // type:func +func_80AFF1F0 = 0x80A6D754; // type:func +EnSkj_PickNextFightAction = 0x80A6D788; // type:func +func_80AFF2A0 = 0x80A6D808; // type:func +EnSkj_WaitForLandAnim = 0x80A6D84C; // type:func +func_80AFF334 = 0x80A6D8A0; // type:func +EnSkj_ResetFight = 0x80A6D8EC; // type:func +EnSkj_SetupStand = 0x80A6D93C; // type:func +EnSkj_Fight = 0x80A6D990; // type:func +EnSkj_SetupNeedleRecover = 0x80A6DB5C; // type:func +EnSkj_NeedleRecover = 0x80A6DB90; // type:func +EnSkj_SetupSpawnDeathEffect = 0x80A6DBCC; // type:func +EnSkj_SpawnDeathEffect = 0x80A6DBF4; // type:func +EnSkj_SetupWaitInRange = 0x80A6DD0C; // type:func +EnSkj_WaitInRange = 0x80A6DD44; // type:func +EnSkj_SetupWaitForSong = 0x80A6DF58; // type:func +EnSkj_WaitForSong = 0x80A6DF7C; // type:func +EnSkj_SetupAfterSong = 0x80A6E250; // type:func +EnSkj_AfterSong = 0x80A6E284; // type:func +EnSkj_SetupTalk = 0x80A6E2D8; // type:func +EnSkj_SariaSongTalk = 0x80A6E2F8; // type:func +func_80AFFE24 = 0x80A6E39C; // type:func +func_80AFFE44 = 0x80A6E3BC; // type:func +EnSkj_SetupPostSariasSong = 0x80A6E434; // type:func +EnSkj_ChangeModeAfterSong = 0x80A6E454; // type:func +EnSkj_SetupMaskTrade = 0x80A6E4BC; // type:func +EnSkj_StartMaskTrade = 0x80A6E4DC; // type:func +EnSkj_JumpFromStump = 0x80A6E544; // type:func +EnSkj_WaitForLanding = 0x80A6E5A8; // type:func +EnSkj_SetupWaitForLandAnimFinish = 0x80A6E5F8; // type:func +EnSkj_WaitForLandAnimFinish = 0x80A6E62C; // type:func +EnSkj_SetupWalkToPlayer = 0x80A6E680; // type:func +EnSkj_WalkToPlayer = 0x80A6E6C4; // type:func +EnSkj_SetupAskForMask = 0x80A6E760; // type:func +EnSkj_AskForMask = 0x80A6E7A8; // type:func +EnSkj_SetupTakeMask = 0x80A6E840; // type:func +EnSkj_TakeMask = 0x80A6E878; // type:func +EnSkj_SetupWaitForMaskTextClear = 0x80A6E910; // type:func +EnSkj_WaitForMaskTextClear = 0x80A6E930; // type:func +EnSkj_SetupWrongSong = 0x80A6E998; // type:func +EnSkj_WrongSong = 0x80A6E9D0; // type:func +EnSkj_SetupWaitForTextClear = 0x80A6EA24; // type:func +EnSkj_SariasSongWaitForTextClear = 0x80A6EA44; // type:func +EnSkj_OcarinaGameSetupWaitForPlayer = 0x80A6EABC; // type:func +EnSkj_OcarinaGameWaitForPlayer = 0x80A6EAFC; // type:func +EnSkj_IsLeavingGame = 0x80A6EB38; // type:func +EnSkj_SetupIdle = 0x80A6EB88; // type:func +EnSkj_Appear = 0x80A6EBBC; // type:func +EnSkj_OcarinaGameIdle = 0x80A6EBE4; // type:func +EnSkj_SetupPlayOcarinaGame = 0x80A6EC30; // type:func +EnSkj_PlayOcarinaGame = 0x80A6EC64; // type:func +EnSkj_SetupLeaveOcarinaGame = 0x80A6ECB0; // type:func +EnSkj_LeaveOcarinaGame = 0x80A6ECF8; // type:func +EnSkj_Update = 0x80A6ED40; // type:func +EnSkj_SariasSongShortStumpUpdate = 0x80A6EF24; // type:func +EnSkj_TurnPlayer = 0x80A6EF4C; // type:func +EnSkj_SetupWaitForOcarina = 0x80A6EF98; // type:func +EnSkj_WaitForOcarina = 0x80A6F054; // type:func +EnSkj_StartOcarinaMinigame = 0x80A6F0FC; // type:func +EnSkj_WaitForPlayback = 0x80A6F188; // type:func +EnSkj_FailedMiniGame = 0x80A6F3F8; // type:func +EnSkj_WaitForNextRound = 0x80A6F438; // type:func +EnSkj_OfferNextRound = 0x80A6F488; // type:func +EnSkj_WaitForOfferResponse = 0x80A6F4C4; // type:func +EnSkj_WonOcarinaMiniGame = 0x80A6F56C; // type:func +EnSkj_WaitToGiveReward = 0x80A6F5AC; // type:func +EnSkj_GiveOcarinaGameReward = 0x80A6F634; // type:func +EnSkj_FinishOcarinaGameRound = 0x80A6F6A8; // type:func +EnSkj_CleanupOcarinaGame = 0x80A6F744; // type:func +EnSkj_OcarinaMinigameShortStumpUpdate = 0x80A6F7C0; // type:func +EnSkj_OverrideLimbDraw = 0x80A6F844; // type:func +EnSkj_PostLimbDraw = 0x80A6F860; // type:func +EnSkj_TranslucentDL = 0x80A6F930; // type:func +EnSkj_OpaqueDL = 0x80A6F988; // type:func +EnSkj_Draw = 0x80A6F9C0; // type:func +EnSkjneedle_Init = 0x80A70210; // type:func +EnSkjneedle_Destroy = 0x80A702A8; // type:func +EnSkjNeedle_CollisionCheck = 0x80A702D4; // type:func +EnSkjneedle_Update = 0x80A70304; // type:func +EnSkjneedle_Draw = 0x80A703F4; // type:func +EnGSwitch_Init = 0x80A70520; // type:func +EnGSwitch_Destroy = 0x80A707B8; // type:func +EnGSwitch_Break = 0x80A707E4; // type:func +EnGSwitch_WaitForObject = 0x80A7098C; // type:func +EnGSwitch_SilverRupeeTracker = 0x80A70A24; // type:func +EnGSwitch_SilverRupeeIdle = 0x80A70B08; // type:func +EnGSwitch_SilverRupeeCollected = 0x80A70BF0; // type:func +EnGSwitch_GalleryRupee = 0x80A70CD4; // type:func +EnGSwitch_ArcheryPot = 0x80A71074; // type:func +EnGSwitch_Kill = 0x80A7135C; // type:func +EnGSwitch_Update = 0x80A7138C; // type:func +EnGSwitch_DrawPot = 0x80A714C0; // type:func +EnGSwitch_DrawRupee = 0x80A71554; // type:func +EnGSwitch_SpawnEffects = 0x80A71684; // type:func +EnGSwitch_UpdateEffects = 0x80A71798; // type:func +EnGSwitch_DrawEffects = 0x80A71958; // type:func +DemoExt_Destroy = 0x80A71D40; // type:func +DemoExt_Init = 0x80A71D50; // type:func +DemoExt_PlayVortexSFX = 0x80A71E08; // type:func +DemoExt_GetCue = 0x80A71E90; // type:func +DemoExt_SetupWait = 0x80A71EB8; // type:func +DemoExt_SetupMaintainVortex = 0x80A71EC8; // type:func +DemoExt_SetupDispellVortex = 0x80A71F54; // type:func +DemoExt_FinishClosing = 0x80A71F6C; // type:func +DemoExt_HandleCues = 0x80A71FD8; // type:func +DemoExt_SetScrollAndRotation = 0x80A72084; // type:func +DemoExt_SetColorsAndScales = 0x80A720D4; // type:func +DemoExt_Wait = 0x80A72210; // type:func +DemoExt_MaintainVortex = 0x80A72230; // type:func +DemoExt_DispellVortex = 0x80A7226C; // type:func +DemoExt_Update = 0x80A722AC; // type:func +DemoExt_DrawNothing = 0x80A722F4; // type:func +DemoExt_DrawVortex = 0x80A72304; // type:func +DemoExt_Draw = 0x80A72584; // type:func +DemoShd_SetupAction = 0x80A72690; // type:func +DemoShd_Init = 0x80A7269C; // type:func +DemoShd_Destroy = 0x80A726EC; // type:func +func_80991298 = 0x80A726FC; // type:func +DemoShd_Update = 0x80A72854; // type:func +DemoShd_Draw = 0x80A72878; // type:func +EnDns_Init = 0x80A74AA0; // type:func +EnDns_Destroy = 0x80A74C14; // type:func +EnDns_ChangeAnim = 0x80A74C40; // type:func +EnDns_CanBuyDekuNuts = 0x80A74CC8; // type:func +EnDns_CanBuyDekuSticks = 0x80A74D80; // type:func +EnDns_CanBuyPrice = 0x80A74E38; // type:func +EnDns_CanBuyDekuSeeds = 0x80A74E68; // type:func +EnDns_CanBuyDekuShield = 0x80A74F30; // type:func +EnDns_CanBuyBombs = 0x80A74F84; // type:func +EnDns_CanBuyArrows = 0x80A75024; // type:func +EnDns_CanBuyBottle = 0x80A750D4; // type:func +EnDns_PayPrice = 0x80A7512C; // type:func +EnDns_PayForDekuNuts = 0x80A75160; // type:func +EnDns_PayForHeartPiece = 0x80A75194; // type:func +EnDns_PayForBombs = 0x80A751DC; // type:func +EnDns_PayForArrows = 0x80A75210; // type:func +EnDns_PayForDekuStickUpgrade = 0x80A75244; // type:func +EnDns_PayForDekuNutUpgrade = 0x80A7528C; // type:func +EnDns_SetupIdle = 0x80A752D4; // type:func +EnDns_Idle = 0x80A75318; // type:func +EnDns_Talk = 0x80A753EC; // type:func +EnDns_OfferSaleItem = 0x80A75524; // type:func +EnDns_SetupSale = 0x80A7563C; // type:func +EnDns_Sale = 0x80A756A8; // type:func +EnDns_SetupBurrow = 0x80A756F4; // type:func +EnDns_SetupNoSaleBurrow = 0x80A757E8; // type:func +EnDns_Burrow = 0x80A75860; // type:func +EnDns_PostBurrow = 0x80A758DC; // type:func +EnDns_Update = 0x80A759E0; // type:func +EnDns_Draw = 0x80A75AD0; // type:func +ElfMsg_SetupAction = 0x80A75E30; // type:func +ElfMsg_KillCheck = 0x80A75E3C; // type:func +ElfMsg_Init = 0x80A75F74; // type:func +ElfMsg_Destroy = 0x80A76068; // type:func +ElfMsg_GetMessageId = 0x80A76078; // type:func +ElfMsg_CallNaviCuboid = 0x80A760A4; // type:func +ElfMsg_WithinXZDistance = 0x80A76174; // type:func +ElfMsg_CallNaviCylinder = 0x80A761C8; // type:func +ElfMsg_Update = 0x80A76290; // type:func +EnHonotrap_FlameCollisionCheck = 0x80A76420; // type:func +EnHonotrap_GetNormal = 0x80A764B4; // type:func +EnHonotrap_InitEye = 0x80A76548; // type:func +EnHonotrap_InitFlame = 0x80A766E4; // type:func +EnHonotrap_Init = 0x80A76824; // type:func +EnHonotrap_Destroy = 0x80A7687C; // type:func +EnHonotrap_SetupEyeIdle = 0x80A768C8; // type:func +EnHonotrap_EyeIdle = 0x80A768E4; // type:func +EnHonotrap_SetupEyeOpen = 0x80A7699C; // type:func +EnHonotrap_EyeOpen = 0x80A769F0; // type:func +EnHonotrap_SetupEyeAttack = 0x80A76AC0; // type:func +EnHonotrap_EyeAttack = 0x80A76AD8; // type:func +EnHonotrap_SetupEyeClose = 0x80A76B08; // type:func +EnHonotrap_EyeClose = 0x80A76B1C; // type:func +EnHonotrap_SetupFlameGrow = 0x80A76B68; // type:func +EnHonotrap_FlameGrow = 0x80A76B7C; // type:func +EnHonotrap_SetupFlameDrop = 0x80A76C10; // type:func +EnHonotrap_FlameDrop = 0x80A76C78; // type:func +EnHonotrap_SetupFlameMove = 0x80A76DBC; // type:func +EnHonotrap_FlameMove = 0x80A76E48; // type:func +EnHonotrap_SetupFlameChase = 0x80A77014; // type:func +EnHonotrap_FlameChase = 0x80A77054; // type:func +EnHonotrap_SetupFlameVanish = 0x80A77208; // type:func +EnHonotrap_FlameVanish = 0x80A7721C; // type:func +EnHonotrap_Update = 0x80A772AC; // type:func +EnHonotrap_DrawEye = 0x80A773F4; // type:func +EnHonotrap_DrawFlame = 0x80A774E4; // type:func +EnHonotrap_Draw = 0x80A7767C; // type:func +EnTuboTrap_Init = 0x80A77980; // type:func +EnTuboTrap_Destroy = 0x80A77A04; // type:func +EnTuboTrap_DropCollectible = 0x80A77A30; // type:func +EnTuboTrap_SpawnEffectsOnLand = 0x80A77A90; // type:func +EnTuboTrap_SpawnEffectsInWater = 0x80A77D04; // type:func +EnTuboTrap_HandleImpact = 0x80A77F84; // type:func +EnTuboTrap_WaitForProximity = 0x80A781AC; // type:func +EnTuboTrap_Levitate = 0x80A782B8; // type:func +EnTuboTrap_Fly = 0x80A78344; // type:func +EnTuboTrap_Update = 0x80A78414; // type:func +EnTuboTrap_Draw = 0x80A784D4; // type:func +ObjIcePoly_Init = 0x80A78620; // type:func +ObjIcePoly_Destroy = 0x80A787E0; // type:func +ObjIcePoly_Idle = 0x80A78830; // type:func +ObjIcePoly_Melt = 0x80A78A60; // type:func +ObjIcePoly_Update = 0x80A78D18; // type:func +ObjIcePoly_Draw = 0x80A78D3C; // type:func +BgSpot03Taki_ApplyOpeningAlpha = 0x80A78FD0; // type:func +BgSpot03Taki_Init = 0x80A7930C; // type:func +BgSpot03Taki_Destroy = 0x80A793BC; // type:func +BgSpot03Taki_HandleWaterfallState = 0x80A793F0; // type:func +BgSpot03Taki_Update = 0x80A795C4; // type:func +BgSpot03Taki_Draw = 0x80A795E8; // type:func +BgSpot07Taki_Init = 0x80A798F0; // type:func +BgSpot07Taki_Destroy = 0x80A7999C; // type:func +BgSpot07Taki_DoNothing = 0x80A799D0; // type:func +BgSpot07Taki_Update = 0x80A799E0; // type:func +BgSpot07Taki_Draw = 0x80A79A04; // type:func +EnFz_Init = 0x80A79EE0; // type:func +EnFz_Destroy = 0x80A7A060; // type:func +EnFz_UpdateTargetPos = 0x80A7A0B0; // type:func +EnFz_ReachedTarget = 0x80A7A1D0; // type:func +EnFz_Damaged = 0x80A7A220; // type:func +EnFz_SpawnIceSmokeHiddenState = 0x80A7A414; // type:func +EnFz_SpawnIceSmokeGrowingState = 0x80A7A420; // type:func +EnFz_SpawnIceSmokeActiveState = 0x80A7A500; // type:func +EnFz_ApplyDamage = 0x80A7A5C4; // type:func +EnFz_SetYawTowardsPlayer = 0x80A7A82C; // type:func +EnFz_SetupDisappear = 0x80A7A86C; // type:func +EnFz_Disappear = 0x80A7A89C; // type:func +EnFz_SetupWait = 0x80A7A91C; // type:func +EnFz_Wait = 0x80A7A95C; // type:func +EnFz_SetupAppear = 0x80A7A9AC; // type:func +EnFz_Appear = 0x80A7A9D8; // type:func +EnFz_SetupAimForMove = 0x80A7AA68; // type:func +EnFz_AimForMove = 0x80A7AAAC; // type:func +EnFz_SetupMoveTowardsPlayer = 0x80A7AAE8; // type:func +EnFz_MoveTowardsPlayer = 0x80A7AB1C; // type:func +EnFz_SetupAimForFreeze = 0x80A7AB58; // type:func +EnFz_AimForFreeze = 0x80A7AB88; // type:func +EnFz_SetupBlowSmoke = 0x80A7ABC4; // type:func +EnFz_BlowSmoke = 0x80A7ABFC; // type:func +EnFz_SetupDespawn = 0x80A7ADE8; // type:func +EnFz_Despawn = 0x80A7AE88; // type:func +EnFz_SetupMelt = 0x80A7AEB8; // type:func +EnFz_Melt = 0x80A7AEFC; // type:func +EnFz_SetupBlowSmokeStationary = 0x80A7AFC4; // type:func +EnFz_BlowSmokeStationary = 0x80A7B008; // type:func +EnFz_Update = 0x80A7B200; // type:func +EnFz_Draw = 0x80A7B390; // type:func +EnFz_SpawnIceSmokeNoFreeze = 0x80A7B54C; // type:func +EnFz_SpawnIceSmokeFreeze = 0x80A7B5F0; // type:func +EnFz_UpdateIceSmoke = 0x80A7B6AC; // type:func +EnFz_DrawEffects = 0x80A7B998; // type:func +EnPoRelay_Init = 0x80A7BEF0; // type:func +EnPoRelay_Destroy = 0x80A7C078; // type:func +EnPoRelay_SetupIdle = 0x80A7C0C0; // type:func +EnPoRelay_Vec3sToVec3f = 0x80A7C0FC; // type:func +EnPoRelay_SetupRace = 0x80A7C140; // type:func +EnPoRelay_SetupEndRace = 0x80A7C208; // type:func +EnPoRelay_CorrectY = 0x80A7C248; // type:func +EnPoRelay_Idle = 0x80A7C2F0; // type:func +EnPoRelay_Talk = 0x80A7C3AC; // type:func +EnPoRelay_Race = 0x80A7C420; // type:func +EnPoRelay_EndRace = 0x80A7C934; // type:func +EnPoRelay_Talk2 = 0x80A7C9F4; // type:func +EnPoRelay_DisappearAndReward = 0x80A7CACC; // type:func +EnPoRelay_Update = 0x80A7CF98; // type:func +EnPoRelay_PostLimbDraw = 0x80A7D08C; // type:func +EnPoRelay_Draw = 0x80A7D280; // type:func +BgRelayObjects_Init = 0x80A7D600; // type:func +BgRelayObjects_Destroy = 0x80A7D840; // type:func +func_808A90F4 = 0x80A7D8AC; // type:func +func_808A91AC = 0x80A7D968; // type:func +func_808A9234 = 0x80A7D9F0; // type:func +BgRelayObjects_DoNothing = 0x80A7DADC; // type:func +func_808A932C = 0x80A7DAEC; // type:func +func_808A939C = 0x80A7DB5C; // type:func +BgRelayObjects_Update = 0x80A7DC30; // type:func +BgRelayObjects_Draw = 0x80A7DC54; // type:func +EnDivingGame_Init = 0x80A7DDB0; // type:func +EnDivingGame_Destroy = 0x80A7DECC; // type:func +EnDivingGame_SpawnRuppy = 0x80A7DF0C; // type:func +EnDivingGame_HasMinigameFinished = 0x80A7E038; // type:func +func_809EDCB0 = 0x80A7E1E4; // type:func +EnDivingGame_Talk = 0x80A7E280; // type:func +EnDivingGame_HandlePlayChoice = 0x80A7E410; // type:func +func_809EE048 = 0x80A7E57C; // type:func +func_809EE0FC = 0x80A7E630; // type:func +func_809EE194 = 0x80A7E6C8; // type:func +EnDivingGame_SetupRupeeThrow = 0x80A7E728; // type:func +EnDivingGame_RupeeThrow = 0x80A7E93C; // type:func +EnDivingGame_SetupUnderwaterViewCs = 0x80A7EBFC; // type:func +func_809EE780 = 0x80A7ECB4; // type:func +func_809EE800 = 0x80A7ED34; // type:func +func_809EE8F0 = 0x80A7EE24; // type:func +func_809EE96C = 0x80A7EEA4; // type:func +func_809EEA00 = 0x80A7EF38; // type:func +func_809EEA90 = 0x80A7EFC8; // type:func +func_809EEAF8 = 0x80A7F034; // type:func +EnDivingGame_Update = 0x80A7F0C4; // type:func +EnDivingGame_EmptyDList = 0x80A7F2F0; // type:func +EnDivingGame_OverrideLimbDraw = 0x80A7F314; // type:func +EnDivingGame_Draw = 0x80A7F474; // type:func +EnKusa_SetupAction = 0x80A7F760; // type:func +EnKusa_SnapToFloor = 0x80A7F770; // type:func +EnKusa_DropCollectible = 0x80A7F814; // type:func +EnKusa_UpdateVelY = 0x80A7F8E0; // type:func +EnKusa_RandScaleVecToZero = 0x80A7F914; // type:func +EnKusa_SetScaleSmall = 0x80A7F998; // type:func +EnKusa_SpawnFragments = 0x80A7F9BC; // type:func +EnKusa_SpawnBugs = 0x80A7FD14; // type:func +EnKusa_InitCollider = 0x80A7FDD0; // type:func +EnKusa_Init = 0x80A7FE28; // type:func +EnKusa_Destroy = 0x80A7FF50; // type:func +EnKusa_SetupWaitForObject = 0x80A7FF7C; // type:func +EnKusa_WaitForObject = 0x80A7FFA0; // type:func +EnKusa_SetupMain = 0x80A80030; // type:func +EnKusa_Main = 0x80A80068; // type:func +EnKusa_SetupLiftedUp = 0x80A80230; // type:func +EnKusa_LiftedUp = 0x80A8026C; // type:func +EnKusa_SetupFall = 0x80A8034C; // type:func +EnKusa_Fall = 0x80A803B8; // type:func +EnKusa_SetupCut = 0x80A80648; // type:func +EnKusa_CutWaitRegrow = 0x80A80698; // type:func +EnKusa_DoNothing = 0x80A806CC; // type:func +EnKusa_SetupUprootedWaitRegrow = 0x80A806DC; // type:func +EnKusa_UprootedWaitRegrow = 0x80A80748; // type:func +EnKusa_SetupRegrow = 0x80A807AC; // type:func +EnKusa_Regrow = 0x80A80804; // type:func +EnKusa_Update = 0x80A8089C; // type:func +EnKusa_Draw = 0x80A80900; // type:func +ObjBean_InitCollider = 0x80A80C40; // type:func +ObjBean_InitDynaPoly = 0x80A80C98; // type:func +ObjBean_FindFloor = 0x80A80CF0; // type:func +func_80B8EBC8 = 0x80A80D58; // type:func +ObjBean_UpdatePosition = 0x80A80D78; // type:func +func_80B8EDF4 = 0x80A80F88; // type:func +func_80B8EE24 = 0x80A80FB8; // type:func +ObjBean_Move = 0x80A81090; // type:func +ObjBean_SetDrawMode = 0x80A810C0; // type:func +ObjBean_SetupPathCount = 0x80A810E4; // type:func +ObjBean_SetupPath = 0x80A81124; // type:func +ObjBean_FollowPath = 0x80A811A0; // type:func +ObjBean_CheckForHorseTrample = 0x80A81448; // type:func +ObjBean_Break = 0x80A814D8; // type:func +ObjBean_UpdateLeaves = 0x80A81750; // type:func +ObjBean_SetupLeavesStill = 0x80A8180C; // type:func +ObjBean_LeavesStill = 0x80A8187C; // type:func +ObjBean_SetupShakeLeaves = 0x80A818C0; // type:func +ObjBean_ShakeLeaves = 0x80A81938; // type:func +ObjBean_SetupShakeLeavesFast = 0x80A819BC; // type:func +ObjBean_ShakeLeavesFast = 0x80A81A00; // type:func +ObjBean_SetupGrow = 0x80A81A88; // type:func +ObjBean_Grow = 0x80A81A9C; // type:func +ObjBean_SetupFlattenLeaves = 0x80A81B00; // type:func +ObjBean_FlattenLeaves = 0x80A81B1C; // type:func +ObjBean_SetupGrown = 0x80A81B98; // type:func +ObjBean_Grown = 0x80A81BDC; // type:func +ObjBean_Init = 0x80A81C38; // type:func +ObjBean_Destroy = 0x80A81DF4; // type:func +ObjBean_SetupWaitForBean = 0x80A81E70; // type:func +ObjBean_WaitForBean = 0x80A81EA8; // type:func +func_80B8FE00 = 0x80A81F24; // type:func +func_80B8FE3C = 0x80A81F5C; // type:func +func_80B8FE6C = 0x80A81F8C; // type:func +func_80B8FEAC = 0x80A81FCC; // type:func +func_80B8FF50 = 0x80A82070; // type:func +func_80B8FF8C = 0x80A820A8; // type:func +func_80B90010 = 0x80A8212C; // type:func +func_80B90050 = 0x80A82168; // type:func +ObjBean_SetupWaitForWater = 0x80A82228; // type:func +ObjBean_WaitForWater = 0x80A82270; // type:func +ObjBean_SetupGrowWaterPhase1 = 0x80A82368; // type:func +ObjBean_GrowWaterPhase1 = 0x80A823A8; // type:func +ObjBean_SetupGrowWaterPhase2 = 0x80A823EC; // type:func +ObjBean_GrowWaterPhase2 = 0x80A82428; // type:func +ObjBean_SetupGrowWaterPhase3 = 0x80A824D8; // type:func +ObjBean_GrowWaterPhase3 = 0x80A82510; // type:func +ObjBean_SetupGrowWaterPhase4 = 0x80A82624; // type:func +ObjBean_GrowWaterPhase4 = 0x80A8265C; // type:func +ObjBean_SetupGrowWaterPhase5 = 0x80A826F8; // type:func +ObjBean_GrowWaterPhase5 = 0x80A82730; // type:func +ObjBean_SetupWaitForPlayer = 0x80A82788; // type:func +ObjBean_WaitForPlayer = 0x80A827B4; // type:func +ObjBean_SetupFly = 0x80A82828; // type:func +ObjBean_Fly = 0x80A8286C; // type:func +ObjBean_SetupWaitForStepOff = 0x80A8299C; // type:func +ObjBean_WaitForStepOff = 0x80A829C8; // type:func +func_80B908EC = 0x80A82A08; // type:func +func_80B90918 = 0x80A82A34; // type:func +func_80B90970 = 0x80A82A90; // type:func +func_80B909B0 = 0x80A82AD0; // type:func +func_80B909F8 = 0x80A82B18; // type:func +func_80B90A34 = 0x80A82B50; // type:func +ObjBean_Update = 0x80A82BF0; // type:func +ObjBean_DrawSoftSoilSpot = 0x80A82D80; // type:func +ObjBean_DrawBeanstalk = 0x80A82E08; // type:func +ObjBean_Draw = 0x80A82E94; // type:func +ObjBombiwa_InitCollision = 0x80A833D0; // type:func +ObjBombiwa_Init = 0x80A83428; // type:func +ObjBombiwa_Destroy = 0x80A834F4; // type:func +ObjBombiwa_Break = 0x80A83520; // type:func +ObjBombiwa_Update = 0x80A83720; // type:func +ObjBombiwa_Draw = 0x80A83830; // type:func +ObjSwitch_RotateY = 0x80A83940; // type:func +ObjSwitch_InitDynaPoly = 0x80A839C0; // type:func +ObjSwitch_InitJntSphCollider = 0x80A83A18; // type:func +ObjSwitch_InitTrisCollider = 0x80A83AB4; // type:func +ObjSwitch_SpawnIce = 0x80A83BD4; // type:func +ObjSwitch_SetOn = 0x80A83C48; // type:func +ObjSwitch_SetOff = 0x80A83CF4; // type:func +ObjSwitch_UpdateTwoTexScrollXY = 0x80A83D7C; // type:func +ObjSwitch_Init = 0x80A83DC4; // type:func +ObjSwitch_Destroy = 0x80A8405C; // type:func +ObjSwitch_FloorUpInit = 0x80A84100; // type:func +ObjSwitch_FloorUp = 0x80A84120; // type:func +ObjSwitch_FloorPressInit = 0x80A84290; // type:func +ObjSwitch_FloorPress = 0x80A842AC; // type:func +ObjSwitch_FloorDownInit = 0x80A8436C; // type:func +ObjSwitch_FloorDown = 0x80A84394; // type:func +ObjSwitch_FloorReleaseInit = 0x80A844E0; // type:func +ObjSwitch_FloorRelease = 0x80A844FC; // type:func +ObjSwitch_EyeIsHit = 0x80A845E0; // type:func +ObjSwitch_EyeFrozenInit = 0x80A84650; // type:func +ObjSwitch_EyeInit = 0x80A84664; // type:func +ObjSwitch_EyeOpenInit = 0x80A846BC; // type:func +ObjSwitch_EyeOpen = 0x80A846D4; // type:func +ObjSwitch_EyeClosingInit = 0x80A84740; // type:func +ObjSwitch_EyeClosing = 0x80A8475C; // type:func +ObjSwitch_EyeClosedInit = 0x80A847D8; // type:func +ObjSwitch_EyeClosed = 0x80A847F4; // type:func +ObjSwitch_EyeOpeningInit = 0x80A848B4; // type:func +ObjSwitch_EyeOpening = 0x80A848D0; // type:func +ObjSwitch_CrystalOffInit = 0x80A84960; // type:func +ObjSwitch_CrystalOff = 0x80A8498C; // type:func +ObjSwitch_CrystalTurnOnInit = 0x80A84AC4; // type:func +ObjSwitch_CrystalTurnOn = 0x80A84AE0; // type:func +ObjSwitch_CrystalOnInit = 0x80A84B68; // type:func +ObjSwitch_CrystalOn = 0x80A84B98; // type:func +ObjSwitch_CrystalTurnOffInit = 0x80A84C60; // type:func +ObjSwitch_CrystalTurnOff = 0x80A84C7C; // type:func +ObjSwitch_Update = 0x80A84D04; // type:func +ObjSwitch_DrawFloor = 0x80A84E40; // type:func +ObjSwitch_DrawFloorRusty = 0x80A84E84; // type:func +ObjSwitch_DrawEye = 0x80A84EB4; // type:func +ObjSwitch_DrawCrystal = 0x80A84FC8; // type:func +ObjSwitch_Draw = 0x80A85224; // type:func +ObjElevator_SetupAction = 0x80A85720; // type:func +func_80B92B08 = 0x80A8572C; // type:func +ObjElevator_Init = 0x80A85784; // type:func +ObjElevator_Destroy = 0x80A85814; // type:func +func_80B92C5C = 0x80A85848; // type:func +func_80B92C80 = 0x80A8586C; // type:func +func_80B92D20 = 0x80A8590C; // type:func +func_80B92D44 = 0x80A85930; // type:func +ObjElevator_Update = 0x80A859B4; // type:func +ObjElevator_Draw = 0x80A859E8; // type:func +ObjLift_SetupAction = 0x80A85AE0; // type:func +ObjLift_InitDynaPoly = 0x80A85AEC; // type:func +ObjLift_SpawnFragments = 0x80A85B44; // type:func +ObjLift_Init = 0x80A85DC8; // type:func +ObjLift_Destroy = 0x80A85EC8; // type:func +ObjLift_SetupWait = 0x80A85EFC; // type:func +ObjLift_Wait = 0x80A85F40; // type:func +ObjLift_SetupShake = 0x80A86030; // type:func +ObjLift_Shake = 0x80A8605C; // type:func +ObjLift_SetupFall = 0x80A861A4; // type:func +ObjLift_Fall = 0x80A86228; // type:func +ObjLift_Update = 0x80A8632C; // type:func +ObjLift_Draw = 0x80A86360; // type:func +ObjHsblock_SetupAction = 0x80A86500; // type:func +func_80B93B68 = 0x80A8650C; // type:func +func_80B93BF0 = 0x80A86564; // type:func +ObjHsblock_Init = 0x80A865E8; // type:func +ObjHsblock_Destroy = 0x80A866B8; // type:func +func_80B93D90 = 0x80A866EC; // type:func +func_80B93DB0 = 0x80A8670C; // type:func +func_80B93DF4 = 0x80A86750; // type:func +func_80B93E38 = 0x80A86798; // type:func +func_80B93E5C = 0x80A867BC; // type:func +ObjHsblock_Update = 0x80A86864; // type:func +ObjHsblock_Draw = 0x80A868B0; // type:func +EnOkarinaTag_Destroy = 0x80A86AD0; // type:func +EnOkarinaTag_Init = 0x80A86AE0; // type:func +func_80ABEF2C = 0x80A86C48; // type:func +func_80ABF0CC = 0x80A86DAC; // type:func +func_80ABF28C = 0x80A86F6C; // type:func +func_80ABF4C8 = 0x80A871B4; // type:func +func_80ABF708 = 0x80A873F4; // type:func +func_80ABF7CC = 0x80A874BC; // type:func +EnOkarinaTag_Update = 0x80A87580; // type:func +EnYabusameMark_Destroy = 0x80A87FD0; // type:func +EnYabusameMark_Init = 0x80A87FFC; // type:func +func_80B42F74 = 0x80A8813C; // type:func +EnYabusameMark_Update = 0x80A88380; // type:func +EnGoroiwa_UpdateCollider = 0x80A886A0; // type:func +EnGoroiwa_InitCollider = 0x80A8870C; // type:func +EnGoroiwa_UpdateFlags = 0x80A88774; // type:func +EnGoroiwa_Vec3fNormalize = 0x80A88798; // type:func +EnGoroiwa_SetSpeed = 0x80A8881C; // type:func +EnGoroiwa_FaceNextWaypoint = 0x80A88844; // type:func +EnGoroiwa_GetPrevWaypointDiff = 0x80A8891C; // type:func +EnGoroiw_CheckEndOfPath = 0x80A88A78; // type:func +EnGoroiwa_SetNextWaypoint = 0x80A88B2C; // type:func +EnGoroiwa_ReverseDirection = 0x80A88B5C; // type:func +EnGoroiwa_InitPath = 0x80A88B84; // type:func +EnGoroiwa_TeleportToWaypoint = 0x80A88BC4; // type:func +EnGoroiwa_InitRotation = 0x80A88C68; // type:func +EnGoroiwa_GetAscendDirection = 0x80A88C84; // type:func +EnGoroiwa_SpawnDust = 0x80A88D48; // type:func +EnGoroiwa_SpawnWaterEffects = 0x80A88F38; // type:func +EnGoroiwa_MoveAndFall = 0x80A8906C; // type:func +EnGoroiwa_Move = 0x80A891A0; // type:func +EnGoroiwa_MoveUpToNextWaypoint = 0x80A893CC; // type:func +EnGoroiwa_MoveDownToNextWaypoint = 0x80A894EC; // type:func +EnGoroiwa_UpdateRotation = 0x80A8984C; // type:func +EnGoroiwa_NextWaypoint = 0x80A899EC; // type:func +EnGoroiwa_SpawnFragments = 0x80A89A74; // type:func +EnGoroiwa_Init = 0x80A89D90; // type:func +EnGoroiwa_Destroy = 0x80A89EC0; // type:func +EnGoroiwa_SetupRoll = 0x80A89EEC; // type:func +EnGoroiwa_Roll = 0x80A89F2C; // type:func +EnGoroiwa_SetupMoveAndFallToGround = 0x80A8A1B0; // type:func +EnGoroiwa_MoveAndFallToGround = 0x80A8A224; // type:func +EnGoroiwa_SetupWait = 0x80A8A2C4; // type:func +EnGoroiwa_Wait = 0x80A8A320; // type:func +EnGoroiwa_SetupMoveUp = 0x80A8A360; // type:func +EnGoroiwa_MoveUp = 0x80A8A3B0; // type:func +EnGoroiwa_SetupMoveDown = 0x80A8A470; // type:func +EnGoroiwa_MoveDown = 0x80A8A4DC; // type:func +EnGoroiwa_Update = 0x80A8A5A4; // type:func +EnGoroiwa_Draw = 0x80A8A704; // type:func +EnExRuppy_Init = 0x80A8AA60; // type:func +EnExRuppy_Destroy = 0x80A8AE38; // type:func +EnExRuppy_SpawnSparkles = 0x80A8AE48; // type:func +EnExRuppy_DropIntoWater = 0x80A8B064; // type:func +EnExRuppy_EnterWater = 0x80A8B144; // type:func +EnExRuppy_Sink = 0x80A8B2B0; // type:func +EnExRuppy_WaitInGame = 0x80A8B3B0; // type:func +EnExRuppy_Kill = 0x80A8B508; // type:func +EnExRuppy_WaitToBlowUp = 0x80A8B54C; // type:func +EnExRuppy_WaitAsCollectible = 0x80A8B678; // type:func +EnExRuppy_GalleryTarget = 0x80A8B6FC; // type:func +EnExRuppy_Update = 0x80A8B75C; // type:func +EnExRuppy_Draw = 0x80A8B7E8; // type:func +EnToryo_Init = 0x80A8BB20; // type:func +EnToryo_Destroy = 0x80A8BD64; // type:func +EnToryo_TalkRespond = 0x80A8BD90; // type:func +EnToryo_DoneTalking = 0x80A8BF84; // type:func +EnToryo_ReactToExchangeItem = 0x80A8BFF0; // type:func +EnToryo_GetTextId = 0x80A8C05C; // type:func +EnToryo_HandleTalking = 0x80A8C128; // type:func +EnToryo_Idle = 0x80A8C2D8; // type:func +EnToryo_Update = 0x80A8C33C; // type:func +EnToryo_Draw = 0x80A8C474; // type:func +EnToryo_OverrideLimbDraw = 0x80A8C4D4; // type:func +EnToryo_PostLimbDraw = 0x80A8C564; // type:func +EnDaiku_ChangeAnim = 0x80A8C7B0; // type:func +EnDaiku_Init = 0x80A8C864; // type:func +EnDaiku_Destroy = 0x80A8CBAC; // type:func +EnDaiku_UpdateTalking = 0x80A8CBD8; // type:func +EnDaiku_UpdateText = 0x80A8CCF4; // type:func +EnDaiku_TentIdle = 0x80A8CFC4; // type:func +EnDaiku_Jailed = 0x80A8CFFC; // type:func +EnDaiku_WaitFreedom = 0x80A8D0CC; // type:func +EnDaiku_InitEscape = 0x80A8D130; // type:func +EnDaiku_EscapeRotate = 0x80A8D338; // type:func +EnDaiku_InitSubCamera = 0x80A8D3A4; // type:func +EnDaiku_UpdateSubCamera = 0x80A8D530; // type:func +EnDaiku_EscapeSuccess = 0x80A8D5E8; // type:func +EnDaiku_EscapeRun = 0x80A8D724; // type:func +EnDaiku_Update = 0x80A8D930; // type:func +EnDaiku_Draw = 0x80A8DA48; // type:func +EnDaiku_OverrideLimbDraw = 0x80A8DB70; // type:func +EnDaiku_PostLimbDraw = 0x80A8DBF4; // type:func +EnNwc_SetUpdate = 0x80A8DEF0; // type:func +EnNwc_ChickNoop = 0x80A8DEFC; // type:func +EnNwc_ChickBgCheck = 0x80A8DF10; // type:func +EnNwc_ChickFall = 0x80A8E00C; // type:func +EnNwc_UpdateChicks = 0x80A8E078; // type:func +EnNwc_DrawChicks = 0x80A8E278; // type:func +EnNwc_Init = 0x80A8E5D4; // type:func +EnNwc_Destroy = 0x80A8E760; // type:func +EnNwc_Idle = 0x80A8E78C; // type:func +EnNwc_Update = 0x80A8E7AC; // type:func +EnNwc_Draw = 0x80A8E800; // type:func +EnBlkobj_SetupAction = 0x80A8E910; // type:func +EnBlkobj_Init = 0x80A8E920; // type:func +EnBlkobj_Destroy = 0x80A8E9D0; // type:func +EnBlkobj_Wait = 0x80A8EA04; // type:func +EnBlkobj_SpawnDarkLink = 0x80A8EA58; // type:func +EnBlkobj_DarkLinkFight = 0x80A8EAD0; // type:func +EnBlkobj_DoNothing = 0x80A8EBAC; // type:func +EnBlkobj_Update = 0x80A8EBBC; // type:func +EnBlkobj_DrawAlpha = 0x80A8EBE0; // type:func +EnBlkobj_Draw = 0x80A8EC5C; // type:func +ItemInbox_Init = 0x80A8EE70; // type:func +ItemInbox_Destroy = 0x80A8EEA4; // type:func +ItemInbox_Wait = 0x80A8EEB4; // type:func +ItemInbox_Update = 0x80A8EEFC; // type:func +ItemInbox_Draw = 0x80A8EF20; // type:func +EnGe1_Init = 0x80A8EFD0; // type:func +EnGe1_Destroy = 0x80A8F294; // type:func +EnGe1_SetTalkAction = 0x80A8F2C0; // type:func +EnGe1_SetAnimationIdle = 0x80A8F3A0; // type:func +EnGe1_CheckCarpentersFreed = 0x80A8F424; // type:func +EnGe1_KickPlayer = 0x80A8F460; // type:func +EnGe1_SpotPlayer = 0x80A8F540; // type:func +EnGe1_WatchForPlayerFrontOnly = 0x80A8F5A0; // type:func +EnGe1_ChooseActionFromTextId = 0x80A8F658; // type:func +EnGe1_SetNormalText = 0x80A8F6EC; // type:func +EnGe1_WatchForAndSensePlayer = 0x80A8F71C; // type:func +EnGe1_GetReaction_ValleyFloor = 0x80A8F7E8; // type:func +EnGe1_WaitTillOpened_GTGGuard = 0x80A8F83C; // type:func +EnGe1_Open_GTGGuard = 0x80A8F88C; // type:func +EnGe1_SetupOpen_GTGGuard = 0x80A8F93C; // type:func +EnGe1_RefuseEntryTooPoor_GTGGuard = 0x80A8F9FC; // type:func +EnGe1_OfferOpen_GTGGuard = 0x80A8FA3C; // type:func +EnGe1_RefuseOpenNoCard_GTGGuard = 0x80A8FB2C; // type:func +EnGe1_CheckForCard_GTGGuard = 0x80A8FB70; // type:func +EnGe1_WaitGateOpen_GateOp = 0x80A8FBD8; // type:func +EnGe1_WaitUntilGateOpened_GateOp = 0x80A8FC4C; // type:func +EnGe1_OpenGate_GateOp = 0x80A8FC9C; // type:func +EnGe1_SetupOpenGate_GateOp = 0x80A8FD4C; // type:func +EnGe1_CheckGate_GateOp = 0x80A8FE18; // type:func +EnGe1_Talk_GateGuard = 0x80A8FE94; // type:func +EnGe1_GetReaction_GateGuard = 0x80A8FED8; // type:func +EnGe1_SetupWait_Archery = 0x80A8FF8C; // type:func +EnGe1_WaitTillItemGiven_Archery = 0x80A8FFC4; // type:func +EnGe1_BeginGiveItem_Archery = 0x80A900B8; // type:func +EnGe1_TalkWinPrize_Archery = 0x80A90180; // type:func +EnGe1_TalkTooPoor_Archery = 0x80A901E0; // type:func +EnGe1_WaitDoNothing = 0x80A90244; // type:func +EnGe1_BeginGame_Archery = 0x80A90254; // type:func +EnGe1_TalkOfferPlay_Archery = 0x80A903F4; // type:func +EnGe1_TalkNoPrize_Archery = 0x80A90454; // type:func +EnGe1_TalkAfterGame_Archery = 0x80A904A0; // type:func +EnGe1_TalkNoHorse_Archery = 0x80A905A4; // type:func +EnGe1_Wait_Archery = 0x80A905E8; // type:func +EnGe1_TurnToFacePlayer = 0x80A90680; // type:func +EnGe1_LookAtPlayer = 0x80A90798; // type:func +EnGe1_Update = 0x80A90874; // type:func +EnGe1_CueUpAnimation = 0x80A909BC; // type:func +EnGe1_StopFidget = 0x80A909FC; // type:func +EnGe1_OverrideLimbDraw = 0x80A90A54; // type:func +EnGe1_PostLimbDraw = 0x80A90BA8; // type:func +EnGe1_Draw = 0x80A90C14; // type:func +ObjBlockstop_Init = 0x80A91000; // type:func +ObjBlockstop_Destroy = 0x80A9105C; // type:func +ObjBlockstop_Update = 0x80A9106C; // type:func +EnSda_Init = 0x80A911A0; // type:func +EnSda_Destroy = 0x80A911B0; // type:func +EnSda_Update = 0x80A911C0; // type:func +EnSda_Draw = 0x80A911FC; // type:func +func_80AF8F60 = 0x80A91290; // type:func +func_80AF95C4 = 0x80A918F4; // type:func +func_80AF9C70 = 0x80A91F70; // type:func +EnClearTag_CreateDebrisEffect = 0x80A92890; // type:func +EnClearTag_CreateFireEffect = 0x80A92988; // type:func +EnClearTag_CreateSmokeEffect = 0x80A92A78; // type:func +EnClearTag_CreateFlashEffect = 0x80A92B9C; // type:func +EnClearTag_Destroy = 0x80A92C74; // type:func +EnClearTag_Init = 0x80A92CA0; // type:func +EnClearTag_CalculateFloorTangent = 0x80A92E64; // type:func +EnClearTag_Update = 0x80A92F20; // type:func +EnClearTag_Draw = 0x80A93CD4; // type:func +EnClearTag_UpdateEffects = 0x80A94268; // type:func +EnClearTag_DrawEffects = 0x80A94630; // type:func +EnNiwLady_Init = 0x80A9DE30; // type:func +EnNiwLady_Destroy = 0x80A9DF18; // type:func +EnNiwLady_ChoseAnimation = 0x80A9DF44; // type:func +func_80AB9F24 = 0x80A9E10C; // type:func +func_80ABA21C = 0x80A9E408; // type:func +func_80ABA244 = 0x80A9E434; // type:func +func_80ABA654 = 0x80A9E7B4; // type:func +func_80ABA778 = 0x80A9E8AC; // type:func +func_80ABA878 = 0x80A9E980; // type:func +func_80ABA9B8 = 0x80A9EAC4; // type:func +func_80ABAA9C = 0x80A9EBA8; // type:func +func_80ABAB08 = 0x80A9EC18; // type:func +func_80ABAC00 = 0x80A9ED10; // type:func +func_80ABAC84 = 0x80A9ED98; // type:func +func_80ABAD38 = 0x80A9EE40; // type:func +func_80ABAD7C = 0x80A9EE60; // type:func +EnNiwLady_Update = 0x80A9EF24; // type:func +EnNiwLady_EmptyDList = 0x80A9F18C; // type:func +EnNiwLady_OverrideLimbDraw = 0x80A9F1B0; // type:func +EnNiwLady_Draw = 0x80A9F30C; // type:func +EnGm_Init = 0x80A9F730; // type:func +EnGm_Destroy = 0x80A9F790; // type:func +func_80A3D7C8 = 0x80A9F7BC; // type:func +func_80A3D838 = 0x80A9F82C; // type:func +EnGm_UpdateEye = 0x80A9F9CC; // type:func +EnGm_SetTextID = 0x80A9FA44; // type:func +func_80A3DB04 = 0x80A9FAF8; // type:func +func_80A3DBF4 = 0x80A9FBE8; // type:func +func_80A3DC44 = 0x80A9FC3C; // type:func +func_80A3DD7C = 0x80A9FD78; // type:func +EnGm_ProcessChoiceIndex = 0x80A9FE10; // type:func +func_80A3DF00 = 0x80A9FF00; // type:func +func_80A3DF60 = 0x80A9FF64; // type:func +func_80A3DFBC = 0x80A9FFC4; // type:func +EnGm_Update = 0x80AA0078; // type:func +func_80A3E090 = 0x80AA009C; // type:func +EnGm_Draw = 0x80AA01FC; // type:func +EnMs_SetOfferText = 0x80AA0460; // type:func +EnMs_Init = 0x80AA04DC; // type:func +EnMs_Destroy = 0x80AA0600; // type:func +EnMs_Wait = 0x80AA062C; // type:func +EnMs_Talk = 0x80AA06D8; // type:func +EnMs_Sell = 0x80AA07F4; // type:func +EnMs_TalkAfterPurchase = 0x80AA0890; // type:func +EnMs_Update = 0x80AA08F0; // type:func +EnMs_Draw = 0x80AA09E8; // type:func +func_80A6E3A0 = 0x80AA0B50; // type:func +EnHs_Init = 0x80AA0B5C; // type:func +EnHs_Destroy = 0x80AA0CA0; // type:func +func_80A6E53C = 0x80AA0CCC; // type:func +func_80A6E5EC = 0x80AA0D80; // type:func +func_80A6E630 = 0x80AA0DC4; // type:func +func_80A6E6B0 = 0x80AA0E44; // type:func +func_80A6E6D8 = 0x80AA0E6C; // type:func +func_80A6E70C = 0x80AA0EA4; // type:func +func_80A6E740 = 0x80AA0EDC; // type:func +func_80A6E7BC = 0x80AA0F5C; // type:func +func_80A6E8CC = 0x80AA106C; // type:func +func_80A6E9AC = 0x80AA1148; // type:func +EnHs_Update = 0x80AA1290; // type:func +EnHs_OverrideLimbDraw = 0x80AA13FC; // type:func +EnHs_PostLimbDraw = 0x80AA14B8; // type:func +EnHs_Draw = 0x80AA14F8; // type:func +BgInGate_SetupAction = 0x80AA16F0; // type:func +BgInGate_Init = 0x80AA16FC; // type:func +BgInGate_Destroy = 0x80AA1818; // type:func +func_80892890 = 0x80AA184C; // type:func +BgInGate_DoNothing = 0x80AA194C; // type:func +BgInGate_Update = 0x80AA195C; // type:func +BgInGate_Draw = 0x80AA1980; // type:func +EnKanban_SetFloorRot = 0x80AA1A80; // type:func +EnKanban_Init = 0x80AA1B3C; // type:func +EnKanban_Destroy = 0x80AA1C64; // type:func +EnKanban_Message = 0x80AA1C9C; // type:func +EnKanban_Update = 0x80AA1D54; // type:func +EnKanban_Draw = 0x80AA35D0; // type:func +EnHeishi3_Init = 0x80AA4BD0; // type:func +EnHeishi3_Destroy = 0x80AA4CFC; // type:func +EnHeishi3_SetupGuardType = 0x80AA4D28; // type:func +EnHeishi3_StandSentinelInGrounds = 0x80AA4DD8; // type:func +EnHeishi3_StandSentinelInCastle = 0x80AA4F34; // type:func +EnHeishi3_CatchStart = 0x80AA50A4; // type:func +func_80A55BD4 = 0x80AA514C; // type:func +EnHeishi3_ResetAnimationToIdle = 0x80AA51E4; // type:func +func_80A55D00 = 0x80AA5278; // type:func +EnHeishi3_Update = 0x80AA5328; // type:func +EnHeishi3_OverrideLimbDraw = 0x80AA5408; // type:func +EnHeishi3_Draw = 0x80AA5470; // type:func +EnSyatekiNiw_Init = 0x80AA55A0; // type:func +EnSyatekiNiw_Destroy = 0x80AA56E8; // type:func +EnSyatekiNiw_UpdateRotations = 0x80AA5714; // type:func +EnSyatekiNiw_SetupDefault = 0x80AA5A70; // type:func +EnSyatekiNiw_Default = 0x80AA5AFC; // type:func +EnSyatekiNiw_SetupArchery = 0x80AA602C; // type:func +EnSyatekiNiw_Archery = 0x80AA60E4; // type:func +EnSyatekiNiw_ExitArchery = 0x80AA6560; // type:func +EnSyatekiNiw_SetupRemove = 0x80AA6580; // type:func +EnSyatekiNiw_Remove = 0x80AA6678; // type:func +EnSyatekiNiw_CheckHit = 0x80AA6834; // type:func +EnSyatekiNiw_Update = 0x80AA6904; // type:func +SyatekiNiw_OverrideLimbDraw = 0x80AA6C74; // type:func +EnSyatekiNiw_Draw = 0x80AA6DA4; // type:func +EnSyatekiNiw_SpawnFeather = 0x80AA6E50; // type:func +EnSyatekiNiw_UpdateEffects = 0x80AA6F40; // type:func +EnSyatekiNiw_DrawEffects = 0x80AA70FC; // type:func +EnAttackNiw_Init = 0x80AA7630; // type:func +EnAttackNiw_Destroy = 0x80AA7764; // type:func +func_809B5268 = 0x80AA7798; // type:func +func_809B55EC = 0x80AA7B20; // type:func +func_809B5670 = 0x80AA7BA4; // type:func +func_809B59B0 = 0x80AA7EE4; // type:func +func_809B5C18 = 0x80AA8154; // type:func +EnAttackNiw_Update = 0x80AA8218; // type:func +func_809B5F98 = 0x80AA84DC; // type:func +EnAttackNiw_Draw = 0x80AA8634; // type:func +BgSpot01Idosoko_SetupAction = 0x80AA8890; // type:func +BgSpot01Idosoko_Init = 0x80AA889C; // type:func +BgSpot01Idosoko_Destroy = 0x80AA893C; // type:func +func_808ABF54 = 0x80AA8970; // type:func +BgSpot01Idosoko_Update = 0x80AA8980; // type:func +BgSpot01Idosoko_Draw = 0x80AA89A4; // type:func +func_80AF5560 = 0x80AA8AA0; // type:func +EnSa_GetTextId = 0x80AA8B20; // type:func +EnSa_UpdateTalkState = 0x80AA8C34; // type:func +func_80AF57D8 = 0x80AA8D18; // type:func +func_80AF5894 = 0x80AA8DD8; // type:func +func_80AF58B8 = 0x80AA8E00; // type:func +func_80AF594C = 0x80AA8E94; // type:func +func_80AF59E0 = 0x80AA8F28; // type:func +func_80AF5A74 = 0x80AA8FBC; // type:func +func_80AF5B10 = 0x80AA9058; // type:func +func_80AF5BA4 = 0x80AA90EC; // type:func +func_80AF5C40 = 0x80AA9188; // type:func +func_80AF5CD4 = 0x80AA921C; // type:func +func_80AF5CE4 = 0x80AA9234; // type:func +EnSa_ChangeAnim = 0x80AA92DC; // type:func +func_80AF5DFC = 0x80AA934C; // type:func +func_80AF5F34 = 0x80AA9484; // type:func +func_80AF603C = 0x80AA958C; // type:func +func_80AF609C = 0x80AA95EC; // type:func +func_80AF6130 = 0x80AA9688; // type:func +func_80AF6170 = 0x80AA96CC; // type:func +EnSa_Init = 0x80AA9710; // type:func +EnSa_Destroy = 0x80AA9980; // type:func +func_80AF6448 = 0x80AA99AC; // type:func +func_80AF67D0 = 0x80AA9D38; // type:func +func_80AF683C = 0x80AA9DAC; // type:func +func_80AF68E4 = 0x80AA9E54; // type:func +func_80AF6B20 = 0x80AAA094; // type:func +EnSa_Update = 0x80AAA154; // type:func +EnSa_OverrideLimbDraw = 0x80AAA2E4; // type:func +EnSa_PostLimbDraw = 0x80AAA48C; // type:func +EnSa_Draw = 0x80AAA4E8; // type:func +EnWonderTalk_Destroy = 0x80AAAD10; // type:func +EnWonderTalk_Init = 0x80AAAD20; // type:func +func_80B391CC = 0x80AAADC8; // type:func +func_80B3943C = 0x80AAAF58; // type:func +func_80B395F0 = 0x80AAB0AC; // type:func +EnWonderTalk_Update = 0x80AAB29C; // type:func +BgGjyoBridge_Init = 0x80AAB3A0; // type:func +BgGjyoBridge_Destroy = 0x80AAB458; // type:func +func_808787A4 = 0x80AAB48C; // type:func +BgGjyoBridge_TriggerCutscene = 0x80AAB49C; // type:func +BgGjyoBridge_SpawnBridge = 0x80AAB5F4; // type:func +BgGjyoBridge_Update = 0x80AAB670; // type:func +BgGjyoBridge_Draw = 0x80AAB694; // type:func +EnDs_Init = 0x80AAB890; // type:func +EnDs_Destroy = 0x80AAB960; // type:func +EnDs_Talk = 0x80AAB970; // type:func +EnDs_TalkNoEmptyBottle = 0x80AAB9C0; // type:func +EnDs_TalkAfterGiveOddPotion = 0x80AABA2C; // type:func +EnDs_DisplayOddPotionText = 0x80AABA88; // type:func +EnDs_GiveOddPotion = 0x80AABAE8; // type:func +EnDs_TalkAfterBrewOddPotion = 0x80AABB54; // type:func +EnDs_BrewOddPotion3 = 0x80AABBD4; // type:func +EnDs_BrewOddPotion2 = 0x80AABC78; // type:func +EnDs_BrewOddPotion1 = 0x80AABCCC; // type:func +EnDs_OfferOddPotion = 0x80AABD6C; // type:func +EnDs_CheckRupeesAndBottle = 0x80AABE38; // type:func +EnDs_GiveBluePotion = 0x80AABE88; // type:func +EnDs_OfferBluePotion = 0x80AABEEC; // type:func +EnDs_Wait = 0x80AAC024; // type:func +EnDs_Update = 0x80AAC1A8; // type:func +EnDs_OverrideLimbDraw = 0x80AAC2B0; // type:func +EnDs_PostLimbDraw = 0x80AAC2F8; // type:func +EnDs_Draw = 0x80AAC338; // type:func +EnMk_Init = 0x80AAC4B0; // type:func +EnMk_Destroy = 0x80AAC5C8; // type:func +func_80AACA40 = 0x80AAC5F4; // type:func +func_80AACA94 = 0x80AAC644; // type:func +func_80AACB14 = 0x80AAC6CC; // type:func +func_80AACB6C = 0x80AAC728; // type:func +func_80AACBAC = 0x80AAC764; // type:func +func_80AACC04 = 0x80AAC7BC; // type:func +func_80AACCA0 = 0x80AAC858; // type:func +func_80AACD48 = 0x80AAC900; // type:func +func_80AACE2C = 0x80AAC9E4; // type:func +func_80AACEE8 = 0x80AACAA0; // type:func +func_80AACFA0 = 0x80AACB58; // type:func +func_80AAD014 = 0x80AACBD0; // type:func +EnMk_Wait = 0x80AACC3C; // type:func +EnMk_Update = 0x80AACE90; // type:func +EnMk_OverrideLimbDraw = 0x80AAD0DC; // type:func +EnMk_PostLimbDraw = 0x80AAD124; // type:func +EnMk_Draw = 0x80AAD164; // type:func +EnBomBowlMan_Init = 0x80AAD340; // type:func +EnBomBowlMan_Destroy = 0x80AAD500; // type:func +EnBomBowlMan_SetupWaitAsleep = 0x80AAD510; // type:func +EnBomBowlMan_WaitAsleep = 0x80AAD598; // type:func +EnBomBowlMan_TalkAsleep = 0x80AAD64C; // type:func +EnBomBowlMan_WakeUp = 0x80AAD6C4; // type:func +EnBomBowlMan_BlinkAwake = 0x80AAD748; // type:func +EnBomBowlMan_CheckBeatenDC = 0x80AAD844; // type:func +EnBomBowlMan_WaitNotBeatenDC = 0x80AAD970; // type:func +EnBomBowlMan_TalkNotBeatenDC = 0x80AAD9CC; // type:func +EnBomBowlMan_SetupRunGame = 0x80AADA3C; // type:func +EnBomBowlMan_RunGame = 0x80AADAC0; // type:func +EnBomBowlMan_HandlePlayChoice = 0x80AADCD0; // type:func +func_809C41FC = 0x80AADE8C; // type:func +EnBomBowlMan_SetupChooseShowPrize = 0x80AADFA8; // type:func +EnBomBowlMan_ChooseShowPrize = 0x80AAE0AC; // type:func +EnBomBowlMan_BeginPlayGame = 0x80AAE2F4; // type:func +EnBomBowlMan_Update = 0x80AAE3B0; // type:func +EnBomBowlMan_OverrideLimbDraw = 0x80AAE528; // type:func +EnBomBowlMan_Draw = 0x80AAE570; // type:func +EnBomBowlPit_Init = 0x80AAE880; // type:func +EnBomBowlPit_Destroy = 0x80AAE898; // type:func +EnBomBowlPit_SetupDetectHit = 0x80AAE8A8; // type:func +EnBomBowlPit_DetectHit = 0x80AAE8D4; // type:func +EnBomBowlPit_CameraDollyIn = 0x80AAEBCC; // type:func +EnBomBowlPit_SpawnPrize = 0x80AAEDA8; // type:func +EnBomBowlPit_SetupGivePrize = 0x80AAEE38; // type:func +EnBomBowlPit_GivePrize = 0x80AAEEF0; // type:func +EnBomBowlPit_WaitTillPrizeGiven = 0x80AAEFF4; // type:func +EnBomBowlPit_Reset = 0x80AAF050; // type:func +EnBomBowlPit_Update = 0x80AAF0D0; // type:func +EnOwl_Init = 0x80AAF1F0; // type:func +EnOwl_Destroy = 0x80AAF5D4; // type:func +EnOwl_LookAtLink = 0x80AAF600; // type:func +EnOwl_CheckInitTalk = 0x80AAF63C; // type:func +func_80ACA558 = 0x80AAF7A8; // type:func +func_80ACA5C8 = 0x80AAF81C; // type:func +func_80ACA62C = 0x80AAF87C; // type:func +func_80ACA690 = 0x80AAF8C8; // type:func +func_80ACA6C0 = 0x80AAF8F8; // type:func +func_80ACA71C = 0x80AAF954; // type:func +func_80ACA76C = 0x80AAF9A0; // type:func +func_80ACA7E0 = 0x80AAFA14; // type:func +EnOwl_ConfirmKokiriMessage = 0x80AAFAC0; // type:func +EnOwl_WaitOutsideKokiri = 0x80AAFB60; // type:func +func_80ACA998 = 0x80AAFBD8; // type:func +func_80ACAA54 = 0x80AAFC98; // type:func +func_80ACAAC0 = 0x80AAFD08; // type:func +EnOwl_WaitHyruleCastle = 0x80AAFD78; // type:func +func_80ACAB88 = 0x80AAFDDC; // type:func +func_80ACAC6C = 0x80AAFEC4; // type:func +EnOwl_WaitKakariko = 0x80AAFF34; // type:func +func_80ACAD34 = 0x80AAFF98; // type:func +func_80ACADF0 = 0x80AB0058; // type:func +EnOwl_WaitGerudo = 0x80AB00C8; // type:func +func_80ACAEB8 = 0x80AB012C; // type:func +func_80ACAF74 = 0x80AB01EC; // type:func +EnOwl_WaitLakeHylia = 0x80AB025C; // type:func +func_80ACB03C = 0x80AB02C0; // type:func +EnOwl_WaitZoraRiver = 0x80AB0334; // type:func +func_80ACB148 = 0x80AB03D4; // type:func +EnOwl_WaitHyliaShortcut = 0x80AB0434; // type:func +func_80ACB22C = 0x80AB04C0; // type:func +func_80ACB274 = 0x80AB050C; // type:func +EnOwl_WaitDeathMountainShortcut = 0x80AB0550; // type:func +func_80ACB344 = 0x80AB05E4; // type:func +func_80ACB3E0 = 0x80AB0684; // type:func +func_80ACB440 = 0x80AB06EC; // type:func +func_80ACB4FC = 0x80AB07AC; // type:func +EnOwl_WaitLWPreSaria = 0x80AB081C; // type:func +func_80ACB5C4 = 0x80AB0880; // type:func +func_80ACB680 = 0x80AB0940; // type:func +EnOwl_WaitLWPostSaria = 0x80AB09B0; // type:func +func_80ACB748 = 0x80AB0A14; // type:func +func_80ACB904 = 0x80AB0BD0; // type:func +func_80ACB994 = 0x80AB0C68; // type:func +EnOwl_WaitDefault = 0x80AB0D00; // type:func +func_80ACBAB8 = 0x80AB0D94; // type:func +func_80ACBC0C = 0x80AB0EE8; // type:func +func_80ACBD4C = 0x80AB1024; // type:func +func_80ACBEA0 = 0x80AB1178; // type:func +func_80ACBF50 = 0x80AB1228; // type:func +func_80ACC00C = 0x80AB12E4; // type:func +func_80ACC23C = 0x80AB14A8; // type:func +func_80ACC30C = 0x80AB1574; // type:func +func_80ACC390 = 0x80AB15F8; // type:func +func_80ACC460 = 0x80AB16C8; // type:func +func_80ACC540 = 0x80AB17A8; // type:func +func_80ACC5CC = 0x80AB1834; // type:func +func_80ACC624 = 0x80AB188C; // type:func +EnOwl_Update = 0x80AB1908; // type:func +EnOwl_OverrideLimbDraw = 0x80AB2058; // type:func +EnOwl_PostLimbUpdate = 0x80AB2184; // type:func +EnOwl_Draw = 0x80AB2208; // type:func +EnOwl_ChangeMode = 0x80AB22D4; // type:func +func_80ACD130 = 0x80AB234C; // type:func +func_80ACD1C4 = 0x80AB23E0; // type:func +func_80ACD220 = 0x80AB2440; // type:func +func_80ACD2CC = 0x80AB24EC; // type:func +func_80ACD4D4 = 0x80AB26F4; // type:func +EnIshi_InitCollider = 0x80AB2D90; // type:func +EnIshi_SnapToFloor = 0x80AB2E08; // type:func +EnIshi_SpawnFragmentsSmall = 0x80AB2EAC; // type:func +EnIshi_SpawnFragmentsLarge = 0x80AB3128; // type:func +EnIshi_SpawnDustSmall = 0x80AB3414; // type:func +EnIshi_SpawnDustLarge = 0x80AB3508; // type:func +EnIshi_DropCollectible = 0x80AB35FC; // type:func +EnIshi_Fall = 0x80AB366C; // type:func +func_80A7ED94 = 0x80AB36A0; // type:func +EnIshi_SpawnBugs = 0x80AB3724; // type:func +EnIshi_Init = 0x80AB37E0; // type:func +EnIshi_Destroy = 0x80AB397C; // type:func +EnIshi_SetupWait = 0x80AB39A8; // type:func +EnIshi_Wait = 0x80AB39BC; // type:func +EnIshi_SetupLiftedUp = 0x80AB3C14; // type:func +EnIshi_LiftedUp = 0x80AB3C3C; // type:func +EnIshi_SetupFly = 0x80AB3D10; // type:func +EnIshi_Fly = 0x80AB3E3C; // type:func +EnIshi_Update = 0x80AB41A8; // type:func +EnIshi_DrawSmall = 0x80AB41CC; // type:func +EnIshi_DrawLarge = 0x80AB41FC; // type:func +EnIshi_Draw = 0x80AB42A4; // type:func +ObjHana_Init = 0x80ABBEE0; // type:func +ObjHana_Destroy = 0x80ABBFDC; // type:func +ObjHana_Update = 0x80ABC028; // type:func +ObjHana_Draw = 0x80ABC098; // type:func +ObjLightswitch_InitCollider = 0x80ABC1F0; // type:func +ObjLightswitch_SetSwitchFlag = 0x80ABC28C; // type:func +ObjLightswitch_ClearSwitchFlag = 0x80ABC350; // type:func +ObjLightswitch_SpawnDisappearEffects = 0x80ABC3D0; // type:func +ObjLightswitch_Init = 0x80ABC5F8; // type:func +ObjLightswitch_Destroy = 0x80ABC78C; // type:func +ObjLightswitch_SetupOff = 0x80ABC7B8; // type:func +ObjLightswitch_Off = 0x80ABC7EC; // type:func +ObjLightswitch_SetupTurnOn = 0x80ABC8CC; // type:func +ObjLightswitch_TurnOn = 0x80ABC8F0; // type:func +ObjLightswitch_SetupOn = 0x80ABC9E4; // type:func +ObjLightswitch_On = 0x80ABCA20; // type:func +ObjLightswitch_SetupTurnOff = 0x80ABCB34; // type:func +ObjLightswitch_TurnOff = 0x80ABCB60; // type:func +ObjLightswitch_SetupDisappearDelay = 0x80ABCC50; // type:func +ObjLightswitch_DisappearDelay = 0x80ABCC6C; // type:func +ObjLightswitch_SetupDisappear = 0x80ABCCB4; // type:func +ObjLightswitch_Disappear = 0x80ABCCD0; // type:func +ObjLightswitch_Update = 0x80ABCD14; // type:func +ObjLightswitch_DrawOpa = 0x80ABCDF8; // type:func +ObjLightswitch_DrawXlu = 0x80ABD120; // type:func +ObjLightswitch_Draw = 0x80ABD3D0; // type:func +ObjMure2_SetPosShrubCircle = 0x80ABD620; // type:func +ObjMure2_SetPosShrubScattered = 0x80ABD73C; // type:func +ObjMure2_SetPosRockCircle = 0x80ABD83C; // type:func +ObjMure2_SetActorSpawnParams = 0x80ABD948; // type:func +ObjMure2_SpawnActors = 0x80ABD99C; // type:func +ObjMure2_CleanupAndDie = 0x80ABDAF8; // type:func +func_80B9A534 = 0x80ABDBF8; // type:func +ObjMure2_Init = 0x80ABDC8C; // type:func +ObjMure2_SetupWait = 0x80ABDCEC; // type:func +ObjMure2_Wait = 0x80ABDD00; // type:func +func_80B9A658 = 0x80ABDD24; // type:func +func_80B9A668 = 0x80ABDD38; // type:func +func_80B9A6E8 = 0x80ABDDB8; // type:func +func_80B9A6F8 = 0x80ABDDCC; // type:func +ObjMure2_Update = 0x80ABDE5C; // type:func +EnGo_SetupAction = 0x80ABE040; // type:func +EnGo_GetTextID = 0x80ABE04C; // type:func +EnGo_UpdateTalkState = 0x80ABE3DC; // type:func +EnGo_UpdateTalking = 0x80ABE7FC; // type:func +EnGo_ChangeAnim = 0x80ABE8BC; // type:func +EnGo_IsActorSpawned = 0x80ABE96C; // type:func +EnGo_GetPlayerTrackingYOffset = 0x80ABEACC; // type:func +func_80A3F060 = 0x80ABEB44; // type:func +func_80A3F0E4 = 0x80ABEBC8; // type:func +EnGo_IsCameraModified = 0x80ABEC40; // type:func +EnGo_ReverseAnimation = 0x80ABED44; // type:func +EnGo_UpdateShadow = 0x80ABED5C; // type:func +EnGo_FollowPath = 0x80ABEDE8; // type:func +EnGo_SetMovedPos = 0x80ABEFA4; // type:func +EnGo_SpawnDust = 0x80ABF07C; // type:func +EnGo_IsRollingOnGround = 0x80ABF2A8; // type:func +func_80A3F908 = 0x80ABF3F4; // type:func +EnGo_Init = 0x80ABF624; // type:func +EnGo_Destroy = 0x80ABF974; // type:func +func_80A3FEB4 = 0x80ABF9B4; // type:func +EnGo_StopRolling = 0x80ABF9F8; // type:func +func_80A4008C = 0x80ABFB8C; // type:func +EnGo_GoronLinkRolling = 0x80ABFC1C; // type:func +EnGo_FireGenericActionFunc = 0x80ABFD14; // type:func +EnGo_CurledUp = 0x80ABFD24; // type:func +EnGo_WakeUp = 0x80ABFE24; // type:func +func_80A40494 = 0x80ABFFA0; // type:func +func_80A405CC = 0x80AC00D8; // type:func +EnGo_BiggoronActionFunc = 0x80AC01EC; // type:func +func_80A408D8 = 0x80AC03E4; // type:func +func_80A40A54 = 0x80AC0560; // type:func +func_80A40B1C = 0x80AC0628; // type:func +EnGo_GetItem = 0x80AC0680; // type:func +func_80A40C78 = 0x80AC0788; // type:func +EnGo_Eyedrops = 0x80AC0870; // type:func +func_80A40DCC = 0x80AC08E0; // type:func +EnGo_Update = 0x80AC0964; // type:func +EnGo_DrawCurledUp = 0x80AC0A74; // type:func +EnGo_DrawRolling = 0x80AC0B40; // type:func +EnGo_OverrideLimbDraw = 0x80AC0C6C; // type:func +EnGo_PostLimbDraw = 0x80AC0E88; // type:func +EnGo_Draw = 0x80AC0EE4; // type:func +EnGo_SpawnEffectDust = 0x80AC1084; // type:func +EnGo_UpdateEffects = 0x80AC1128; // type:func +EnGo_DrawEffects = 0x80AC1234; // type:func +EnFu_Init = 0x80AC2680; // type:func +EnFu_Destroy = 0x80AC2794; // type:func +func_80A1D94C = 0x80AC27C0; // type:func +func_80A1DA04 = 0x80AC287C; // type:func +EnFu_WaitChild = 0x80AC2918; // type:func +func_80A1DB60 = 0x80AC29DC; // type:func +func_80A1DBA0 = 0x80AC2A1C; // type:func +func_80A1DBD4 = 0x80AC2A54; // type:func +EnFu_WaitForPlayback = 0x80AC2BC4; // type:func +EnFu_TeachSong = 0x80AC2C2C; // type:func +EnFu_WaitAdult = 0x80AC2CA8; // type:func +EnFu_Update = 0x80AC2DF8; // type:func +EnFu_OverrideLimbDraw = 0x80AC2FA0; // type:func +EnFu_PostLimbDraw = 0x80AC30FC; // type:func +EnFu_Draw = 0x80AC313C; // type:func +EnChanger_Destroy = 0x80AC33D0; // type:func +EnChanger_Init = 0x80AC33E0; // type:func +EnChanger_Wait = 0x80AC38FC; // type:func +EnChanger_OpenChests = 0x80AC39A0; // type:func +EnChanger_SetHeartPieceFlag = 0x80AC3B50; // type:func +EnChanger_Update = 0x80AC3BA0; // type:func +BgJyaMegami_InitDynaPoly = 0x80AC3DB0; // type:func +BgJyaMegami_InitCollider = 0x80AC3E08; // type:func +BgJyaMegami_SpawnEffect = 0x80AC3E5C; // type:func +BgJyaMegami_SetupSpawnEffect = 0x80AC40A0; // type:func +BgJyaMegami_Init = 0x80AC419C; // type:func +BgJyaMegami_Destroy = 0x80AC4230; // type:func +BgJyaMegami_SetupDetectLight = 0x80AC4278; // type:func +BgJyaMegami_DetectLight = 0x80AC4294; // type:func +BgJyaMegami_SetupExplode = 0x80AC4420; // type:func +BgJyaMegami_Explode = 0x80AC44B8; // type:func +BgJyaMegami_Update = 0x80AC4840; // type:func +BgJyaMegami_DrawFace = 0x80AC4864; // type:func +BgJyaMegami_DrawExplode = 0x80AC49A8; // type:func +BgJyaMegami_Draw = 0x80AC4B74; // type:func +BgJyaLift_InitDynapoly = 0x80AC4FA0; // type:func +BgJyaLift_Init = 0x80AC4FF8; // type:func +BgJyaLift_Destroy = 0x80AC50B4; // type:func +BgJyaLift_SetInitPosY = 0x80AC50F8; // type:func +BgJyaLift_DelayMove = 0x80AC511C; // type:func +BgJyaLift_SetupMove = 0x80AC51A0; // type:func +BgJyaLift_Move = 0x80AC51B4; // type:func +BgJyaLift_SetFinalPosY = 0x80AC52D8; // type:func +BgJyaLift_Update = 0x80AC52F0; // type:func +BgJyaLift_Draw = 0x80AC53E0; // type:func +BgJyaBigmirror_SetRoomFlag = 0x80AC54F0; // type:func +BgJyaBigmirror_HandleCobra = 0x80AC5560; // type:func +BgJyaBigmirror_SetBombiwaFlag = 0x80AC56F8; // type:func +BgJyaBigmirror_HandleMirRay = 0x80AC574C; // type:func +BgJyaBigmirror_Init = 0x80AC58F4; // type:func +BgJyaBigmirror_Destroy = 0x80AC5978; // type:func +BgJyaBigmirror_Update = 0x80AC5998; // type:func +BgJyaBigmirror_DrawLightBeam = 0x80AC59E8; // type:func +BgJyaBigmirror_Draw = 0x80AC5B74; // type:func +BgJyaBombchuiwa_SetupCollider = 0x80AC5D40; // type:func +BgJyaBombchuiwa_SetDrawFlags = 0x80AC5D94; // type:func +BgJyaBombchuiwa_Init = 0x80AC5DB8; // type:func +BgJyaBombchuiwa_Destroy = 0x80AC5E38; // type:func +BgJyaBombchuiwa_Break = 0x80AC5E64; // type:func +BgJyaBombchuiwa_SetupWaitForExplosion = 0x80AC60F0; // type:func +BgJyaBombchuiwa_WaitForExplosion = 0x80AC6128; // type:func +BgJyaBombchuiwa_CleanUpAfterExplosion = 0x80AC620C; // type:func +func_808949B8 = 0x80AC6264; // type:func +BgJyaBombchuiwa_SpawnLightRay = 0x80AC62F0; // type:func +BgJyaBombchuiwa_Update = 0x80AC6368; // type:func +BgJyaBombchuiwa_DrawRock = 0x80AC6394; // type:func +BgJyaBombchuiwa_DrawLight = 0x80AC641C; // type:func +BgJyaBombchuiwa_Draw = 0x80AC6678; // type:func +BgJyaAmishutter_InitDynaPoly = 0x80AC6880; // type:func +BgJyaAmishutter_Init = 0x80AC68D8; // type:func +BgJyaAmishutter_Destroy = 0x80AC6920; // type:func +BgJyaAmishutter_SetupWaitForPlayer = 0x80AC6954; // type:func +BgJyaAmishutter_WaitForPlayer = 0x80AC6968; // type:func +func_80893428 = 0x80AC69C4; // type:func +func_80893438 = 0x80AC69D8; // type:func +func_808934B0 = 0x80AC6A50; // type:func +func_808934C0 = 0x80AC6A64; // type:func +func_808934FC = 0x80AC6AA0; // type:func +func_8089350C = 0x80AC6AB4; // type:func +BgJyaAmishutter_Update = 0x80AC6B18; // type:func +BgJyaAmishutter_Draw = 0x80AC6B40; // type:func +BgJyaBombiwa_SetupDynaPoly = 0x80AC6C10; // type:func +BgJyaBombiwa_InitCollider = 0x80AC6C68; // type:func +BgJyaBombiwa_Init = 0x80AC6CBC; // type:func +BgJyaBombiwa_Destroy = 0x80AC6D3C; // type:func +BgJyaBombiwa_Break = 0x80AC6D84; // type:func +BgJyaBombiwa_Update = 0x80AC7018; // type:func +BgJyaBombiwa_Draw = 0x80AC70A8; // type:func +func_808B7710 = 0x80AC71D0; // type:func +func_808B7770 = 0x80AC722C; // type:func +BgSpot18Basket_Init = 0x80AC73E8; // type:func +BgSpot18Basket_Destroy = 0x80AC7534; // type:func +func_808B7AEC = 0x80AC757C; // type:func +func_808B7AFC = 0x80AC7590; // type:func +func_808B7B58 = 0x80AC75EC; // type:func +func_808B7B6C = 0x80AC7604; // type:func +func_808B7BB0 = 0x80AC7648; // type:func +func_808B7BCC = 0x80AC7668; // type:func +func_808B7D38 = 0x80AC77D4; // type:func +func_808B7D50 = 0x80AC77F0; // type:func +func_808B7F74 = 0x80AC7A14; // type:func +func_808B7FC0 = 0x80AC7A64; // type:func +func_808B818C = 0x80AC7C30; // type:func +func_808B81A0 = 0x80AC7C48; // type:func +BgSpot18Basket_Update = 0x80AC7EE0; // type:func +BgSpot18Basket_Draw = 0x80AC7FA4; // type:func +EnGanonOrgan_Init = 0x80AC81C0; // type:func +EnGanonOrgan_Destroy = 0x80AC81DC; // type:func +EnGanonOrgan_Update = 0x80AC81EC; // type:func +EnGanonOrgan_EmptyDList = 0x80AC8230; // type:func +func_80A280BC = 0x80AC8254; // type:func +func_80A28148 = 0x80AC82CC; // type:func +EnGanonOrgan_Draw = 0x80AC833C; // type:func +EnSiofuki_Init = 0x80ACF200; // type:func +EnSiofuki_Destroy = 0x80ACF41C; // type:func +func_80AFBDC8 = 0x80ACF450; // type:func +func_80AFBE8C = 0x80ACF510; // type:func +func_80AFC1D0 = 0x80ACF85C; // type:func +func_80AFC218 = 0x80ACF8A4; // type:func +func_80AFC34C = 0x80ACF9E0; // type:func +func_80AFC3C8 = 0x80ACFA64; // type:func +func_80AFC478 = 0x80ACFB1C; // type:func +func_80AFC544 = 0x80ACFBF0; // type:func +EnSiofuki_Update = 0x80ACFC28; // type:func +EnSiofuki_Draw = 0x80ACFC4C; // type:func +EnStream_SetupAction = 0x80ACFFB0; // type:func +EnStream_Init = 0x80ACFFBC; // type:func +EnStream_Destroy = 0x80AD0024; // type:func +func_80B0B81C = 0x80AD0034; // type:func +EnStream_SuckPlayer = 0x80AD0154; // type:func +EnStream_WaitForPlayer = 0x80AD02EC; // type:func +EnStream_Update = 0x80AD0340; // type:func +EnStream_Draw = 0x80AD0374; // type:func +EnMm_ChangeAnim = 0x80AD0540; // type:func +EnMm_Init = 0x80AD0664; // type:func +EnMm_Destroy = 0x80AD0820; // type:func +func_80AADA70 = 0x80AD084C; // type:func +func_80AADAA0 = 0x80AD0880; // type:func +EnMm_GetTextId = 0x80AD0A14; // type:func +func_80AADCD0 = 0x80AD0AB4; // type:func +EnMm_GetPointCount = 0x80AD0C34; // type:func +func_80AADE60 = 0x80AD0C48; // type:func +func_80AADEF0 = 0x80AD0CDC; // type:func +func_80AAE224 = 0x80AD1014; // type:func +func_80AAE294 = 0x80AD1084; // type:func +func_80AAE50C = 0x80AD12FC; // type:func +func_80AAE598 = 0x80AD1388; // type:func +EnMm_Update = 0x80AD1430; // type:func +EnMm_Draw = 0x80AD14A4; // type:func +EnMm_OverrideLimbDraw = 0x80AD1738; // type:func +EnMm_PostLimbDraw = 0x80AD17CC; // type:func +EnKo_AreObjectsAvailable = 0x80AD1BA0; // type:func +EnKo_AreObjectsLoaded = 0x80AD1CB8; // type:func +EnKo_IsOsAnimeAvailable = 0x80AD1D40; // type:func +EnKo_IsOsAnimeLoaded = 0x80AD1D90; // type:func +EnKo_GetTextIdChild = 0x80AD1DD0; // type:func +EnKo_GetTextIdAdult = 0x80AD2138; // type:func +EnKo_GetTextId = 0x80AD2410; // type:func +EnKo_UpdateTalkState = 0x80AD253C; // type:func +EnKo_GetForestQuestState = 0x80AD293C; // type:func +func_80A97BC0 = 0x80AD29C4; // type:func +func_80A97C7C = 0x80AD2A80; // type:func +EnKo_IsWithinTalkAngle = 0x80AD2B04; // type:func +func_80A97D68 = 0x80AD2B70; // type:func +func_80A97E18 = 0x80AD2C20; // type:func +func_80A97EB0 = 0x80AD2CBC; // type:func +func_80A97F20 = 0x80AD2D30; // type:func +func_80A97F70 = 0x80AD2D80; // type:func +func_80A98034 = 0x80AD2E44; // type:func +func_80A98124 = 0x80AD2F38; // type:func +func_80A98174 = 0x80AD2F88; // type:func +EnKo_ChildStart = 0x80AD306C; // type:func +EnKo_ChildStone = 0x80AD3174; // type:func +EnKo_ChildSaria = 0x80AD327C; // type:func +EnKo_AdultEnemy = 0x80AD3384; // type:func +EnKo_AdultSaved = 0x80AD348C; // type:func +func_80A9877C = 0x80AD3594; // type:func +EnKo_CanSpawn = 0x80AD3750; // type:func +EnKo_Blink = 0x80AD3A34; // type:func +func_80A98CD8 = 0x80AD3AF4; // type:func +EnKo_GetForestQuestState2 = 0x80AD3B4C; // type:func +func_80A98DB4 = 0x80AD3BD8; // type:func +func_80A98ECC = 0x80AD3CF0; // type:func +EnKo_Init = 0x80AD3DB8; // type:func +EnKo_Destroy = 0x80AD3E48; // type:func +func_80A99048 = 0x80AD3E74; // type:func +func_80A99384 = 0x80AD41A4; // type:func +func_80A99438 = 0x80AD4258; // type:func +func_80A99504 = 0x80AD4324; // type:func +func_80A99560 = 0x80AD4384; // type:func +func_80A995CC = 0x80AD43F4; // type:func +EnKo_Update = 0x80AD4530; // type:func +EnKo_OverrideLimbDraw = 0x80AD4694; // type:func +EnKo_PostLimbDraw = 0x80AD49F4; // type:func +EnKo_SetEnvColor = 0x80AD4AC4; // type:func +EnKo_Draw = 0x80AD4B30; // type:func +EnKz_GetTextIdChild = 0x80AD5CE0; // type:func +EnKz_GetTextIdAdult = 0x80AD5D3C; // type:func +EnKz_GetTextId = 0x80AD5DEC; // type:func +EnKz_UpdateTalkState = 0x80AD5E54; // type:func +EnKz_UpdateEyes = 0x80AD6078; // type:func +EnKz_UpdateTalking = 0x80AD60F0; // type:func +func_80A9CB18 = 0x80AD62AC; // type:func +EnKz_FollowPath = 0x80AD646C; // type:func +EnKz_SetMovedPos = 0x80AD65D8; // type:func +EnKz_Init = 0x80AD66A0; // type:func +EnKz_Destroy = 0x80AD682C; // type:func +EnKz_PreMweepWait = 0x80AD6858; // type:func +EnKz_SetupMweep = 0x80AD68C8; // type:func +EnKz_Mweep = 0x80AD69F4; // type:func +EnKz_StopMweep = 0x80AD6B60; // type:func +EnKz_Wait = 0x80AD6BC4; // type:func +EnKz_SetupGetItem = 0x80AD6C2C; // type:func +EnKz_StartTimer = 0x80AD6CC0; // type:func +EnKz_Update = 0x80AD6D58; // type:func +EnKz_OverrideLimbDraw = 0x80AD6E14; // type:func +EnKz_PostLimbDraw = 0x80AD6EE4; // type:func +EnKz_Draw = 0x80AD6F40; // type:func +EnWeatherTag_SetupAction = 0x80AD7280; // type:func +EnWeatherTag_Destroy = 0x80AD728C; // type:func +EnWeatherTag_Init = 0x80AD729C; // type:func +WeatherTag_CheckEnableWeatherEffect = 0x80AD7470; // type:func +WeatherTag_CheckRestoreWeather = 0x80AD7648; // type:func +EnWeatherTag_DisabledCloudyHyruleMarket = 0x80AD7808; // type:func +EnWeatherTag_EnabledCloudyHyruleMarket = 0x80AD7864; // type:func +EnWeatherTag_DisabledCloudyLonLonRanch = 0x80AD78B8; // type:func +EnWeatherTag_EnabledCloudyLonLonRanch = 0x80AD7914; // type:func +EnWeatherTag_DisabledCloudyDeathMountain = 0x80AD7968; // type:func +EnWeatherTag_EnabledCloudyDeathMountain = 0x80AD79C4; // type:func +EnWeatherTag_DisabledCloudySnow = 0x80AD7A18; // type:func +EnWeatherTag_EnabledCloudySnow = 0x80AD7A90; // type:func +EnWeatherTag_DisabledRainLakeHylia = 0x80AD7AFC; // type:func +EnWeatherTag_EnabledRainLakeHylia = 0x80AD7B80; // type:func +EnWeatherTag_DisabledCloudyRainThunderKakariko = 0x80AD7BF8; // type:func +EnWeatherTag_EnabledCloudyRainThunderKakariko = 0x80AD7C90; // type:func +EnWeatherTag_SetSandstormIntensity = 0x80AD7D1C; // type:func +EnWeatherTag_DisabledRainThunder = 0x80AD7E18; // type:func +EnWeatherTag_EnabledRainThunder = 0x80AD7EBC; // type:func +EnWeatherTag_Update = 0x80AD7F70; // type:func +BgSstFloor_Init = 0x80AD8170; // type:func +BgSstFloor_Destroy = 0x80AD81D8; // type:func +BgSstFloor_Update = 0x80AD820C; // type:func +BgSstFloor_Draw = 0x80AD8580; // type:func +EnAni_SetupAction = 0x80AD86D0; // type:func +EnAni_Init = 0x80AD86DC; // type:func +EnAni_Destroy = 0x80AD87F4; // type:func +EnAni_SetText = 0x80AD8820; // type:func +func_809B04F0 = 0x80AD885C; // type:func +func_809B0524 = 0x80AD8894; // type:func +func_809B0558 = 0x80AD88CC; // type:func +func_809B05F0 = 0x80AD8968; // type:func +func_809B064C = 0x80AD89CC; // type:func +func_809B07F8 = 0x80AD8B78; // type:func +func_809B0988 = 0x80AD8D08; // type:func +func_809B0994 = 0x80AD8D18; // type:func +func_809B0A28 = 0x80AD8DAC; // type:func +func_809B0A6C = 0x80AD8DF0; // type:func +EnAni_Update = 0x80AD8E9C; // type:func +EnAni_OverrideLimbDraw = 0x80AD9118; // type:func +EnAni_PostLimbDraw = 0x80AD9160; // type:func +EnAni_Draw = 0x80AD91A0; // type:func +EnExItem_Destroy = 0x80AD9440; // type:func +EnExItem_Init = 0x80AD9450; // type:func +EnExItem_WaitForObject = 0x80AD95AC; // type:func +EnExItem_BowlPrize = 0x80AD9928; // type:func +EnExItem_SetupBowlCounter = 0x80AD9B14; // type:func +EnExItem_BowlCounter = 0x80AD9B3C; // type:func +EnExItem_ExitChest = 0x80AD9B74; // type:func +EnExItem_FairyMagic = 0x80AD9BDC; // type:func +EnExItem_TargetPrizeApproach = 0x80AD9BF4; // type:func +EnExItem_TargetPrizeGive = 0x80AD9E48; // type:func +EnExItem_TargetPrizeFinish = 0x80AD9ED4; // type:func +EnExItem_Update = 0x80AD9F34; // type:func +EnExItem_Draw = 0x80AD9F88; // type:func +EnExItem_DrawItems = 0x80ADA038; // type:func +EnExItem_DrawHeartPiece = 0x80ADA09C; // type:func +EnExItem_DrawMagic = 0x80ADA0D0; // type:func +EnExItem_DrawKey = 0x80ADA118; // type:func +EnExItem_DrawRupee = 0x80ADA208; // type:func +BgJyaIronobj_InitCylinder = 0x80ADA5C0; // type:func +BgJyaIronobj_SpawnPillarParticles = 0x80ADA640; // type:func +BgJyaIronobj_SpawnThroneParticles = 0x80ADAABC; // type:func +BgJyaIronobj_Init = 0x80ADAEE8; // type:func +BgJyaIronobj_Destroy = 0x80ADAF7C; // type:func +func_808992D8 = 0x80ADAFC4; // type:func +func_808992E8 = 0x80ADAFD8; // type:func +BgJyaIronobj_Update = 0x80ADB118; // type:func +BgJyaIronobj_Draw = 0x80ADB13C; // type:func +En_Js_SetupAction = 0x80ADB370; // type:func +EnJs_Init = 0x80ADB37C; // type:func +EnJs_Destroy = 0x80ADB4A0; // type:func +func_80A88F64 = 0x80ADB4CC; // type:func +func_80A89008 = 0x80ADB574; // type:func +func_80A89078 = 0x80ADB5E8; // type:func +func_80A890C0 = 0x80ADB634; // type:func +func_80A8910C = 0x80ADB684; // type:func +func_80A89160 = 0x80ADB6D8; // type:func +func_80A891C4 = 0x80ADB740; // type:func +func_80A89294 = 0x80ADB814; // type:func +func_80A89304 = 0x80ADB888; // type:func +EnJs_Update = 0x80ADB8C0; // type:func +EnJs_OverrideLimbDraw = 0x80ADBB4C; // type:func +EnJs_PostLimbDraw = 0x80ADBB84; // type:func +EnJs_Draw = 0x80ADBBC4; // type:func +EnJsjutan_Init = 0x80ADBD40; // type:func +EnJsjutan_Destroy = 0x80ADBDD4; // type:func +func_80A89860 = 0x80ADBE08; // type:func +func_80A89A6C = 0x80ADC014; // type:func +EnJsjutan_Update = 0x80ADCAF4; // type:func +EnJsjutan_Draw = 0x80ADCBCC; // type:func +EnCs_ChangeAnim = 0x80AE1670; // type:func +EnCs_Init = 0x80AE1794; // type:func +EnCs_Destroy = 0x80AE1928; // type:func +EnCs_GetTalkState = 0x80AE1954; // type:func +EnCs_GetTextId = 0x80AE1A88; // type:func +EnCs_HandleTalking = 0x80AE1B0C; // type:func +EnCs_GetwaypointCount = 0x80AE1C58; // type:func +EnCs_GetPathPoint = 0x80AE1C6C; // type:func +EnCs_HandleWalking = 0x80AE1D00; // type:func +EnCs_Walk = 0x80AE1F18; // type:func +EnCs_Wait = 0x80AE20B8; // type:func +EnCs_Talk = 0x80AE2144; // type:func +EnCs_Update = 0x80AE2208; // type:func +EnCs_Draw = 0x80AE2378; // type:func +EnCs_OverrideLimbDraw = 0x80AE252C; // type:func +EnCs_PostLimbDraw = 0x80AE25BC; // type:func +EnMd_ReverseAnimation = 0x80AE28A0; // type:func +EnMd_UpdateAnimSequence_IdleToHalt = 0x80AE28C8; // type:func +EnMd_UpdateAnimSequence_HaltToCurious = 0x80AE295C; // type:func +EnMd_UpdateAnimSequence_WalkAway = 0x80AE29F0; // type:func +EnMd_UpdateAnimSequence_TwitchIdle_Unused = 0x80AE2AC8; // type:func +EnMd_UpdateAnimSequence_HaltToIdle = 0x80AE2B5C; // type:func +EnMd_UpdateAnimSequence_SurpriseToAnnoyed = 0x80AE2BF8; // type:func +EnMd_UpdateAnimSequence_SurpriseToIdle = 0x80AE2C8C; // type:func +EnMd_UpdateAnimSequence_CuriousToAnnoyed = 0x80AE2D28; // type:func +EnMd_UpdateAnimSequence_AnnoyedToHalt = 0x80AE2DBC; // type:func +EnMd_UpdateAnimSequence_IdleToAnnoyed = 0x80AE2E50; // type:func +EnMd_UpdateAnimSequence_StopWalking = 0x80AE2EE4; // type:func +EnMd_SetAnimSequence = 0x80AE2F80; // type:func +EnMd_UpdateAnimSequence = 0x80AE2F98; // type:func +EnMd_UpdateAnimSequence_WithTalking = 0x80AE3080; // type:func +EnMd_TrackMessageState = 0x80AE32D4; // type:func +EnMd_GetTextIdKokiriForest = 0x80AE3354; // type:func +EnMd_GetTextIdMidosHouse = 0x80AE343C; // type:func +EnMd_GetTextIdLostWoods = 0x80AE3470; // type:func +EnMd_GetTextId = 0x80AE34F0; // type:func +EnMd_UpdateTalkState = 0x80AE3560; // type:func +EnMd_ShouldSpawn = 0x80AE3698; // type:func +EnMd_UpdateEyes = 0x80AE373C; // type:func +EnMd_UpdateTalking = 0x80AE37B4; // type:func +EnMd_FollowPath = 0x80AE39D0; // type:func +EnMd_SetMovedPos = 0x80AE3B3C; // type:func +EnMd_UpdateAlphaByDistance = 0x80AE3C04; // type:func +EnMd_Init = 0x80AE3CB0; // type:func +EnMd_Destroy = 0x80AE3EAC; // type:func +EnMd_Idle = 0x80AE3ED8; // type:func +EnMd_Watch = 0x80AE3F5C; // type:func +EnMd_BlockPath = 0x80AE3FAC; // type:func +EnMd_ListenToOcarina = 0x80AE427C; // type:func +EnMd_Walk = 0x80AE4378; // type:func +EnMd_Update = 0x80AE44A0; // type:func +EnMd_OverrideLimbDraw = 0x80AE4560; // type:func +EnMd_PostLimbDraw = 0x80AE477C; // type:func +EnMd_Draw = 0x80AE47D8; // type:func +EnHy_FindSkelAndHeadObjects = 0x80AE4F10; // type:func +EnHy_AreSkelAndHeadObjectsLoaded = 0x80AE5024; // type:func +EnHy_FindOsAnimeObject = 0x80AE50AC; // type:func +EnHy_IsOsAnimeObjectLoaded = 0x80AE50FC; // type:func +EnHy_GiveItem = 0x80AE513C; // type:func +EnHy_GetTextId = 0x80AE5180; // type:func +EnHy_UpdateTalkState = 0x80AE59C8; // type:func +EnHy_UpdateEyes = 0x80AE5F14; // type:func +EnHy_InitCollider = 0x80AE5FD0; // type:func +EnHy_InitSetProperties = 0x80AE600C; // type:func +EnHy_UpdateCollider = 0x80AE60A4; // type:func +EnHy_OfferBuyBottledItem = 0x80AE61A8; // type:func +EnHy_UpdateNPC = 0x80AE62F0; // type:func +EnHy_ShouldSpawn = 0x80AE6460; // type:func +EnHy_Init = 0x80AE66FC; // type:func +EnHy_Destroy = 0x80AE678C; // type:func +EnHy_WaitForObjects = 0x80AE67B8; // type:func +EnHy_WatchDog = 0x80AE6A84; // type:func +EnHy_Walk = 0x80AE6B40; // type:func +EnHy_Fidget = 0x80AE6C0C; // type:func +EnHy_DoNothing = 0x80AE6C44; // type:func +EnHy_SetupPace = 0x80AE6C54; // type:func +EnHy_Pace = 0x80AE6CE0; // type:func +EnHy_WaitDogFoundRewardGiven = 0x80AE6E5C; // type:func +EnHy_FinishGivingDogFoundReward = 0x80AE6ECC; // type:func +EnHy_Update = 0x80AE6F7C; // type:func +EnHy_OverrideLimbDraw = 0x80AE705C; // type:func +EnHy_PostLimbDraw = 0x80AE73C8; // type:func +EnHy_SetEnvColor = 0x80AE74D4; // type:func +EnHy_Draw = 0x80AE7540; // type:func +EnGanonMant_Init = 0x80AE8850; // type:func +EnGanonMant_Destroy = 0x80AE886C; // type:func +EnGanonMant_Tear = 0x80AE887C; // type:func +EnGanonMant_UpdateStrand = 0x80AE8AD8; // type:func +EnGanonMant_UpdateVertices = 0x80AE909C; // type:func +EnGanonMant_Update = 0x80AE92C0; // type:func +EnGanonMant_DrawCloak = 0x80AE937C; // type:func +EnGanonMant_Draw = 0x80AE9498; // type:func +EnOkarinaEffect_SetupAction = 0x80AECA80; // type:func +EnOkarinaEffect_Destroy = 0x80AECA8C; // type:func +EnOkarinaEffect_Init = 0x80AECB0C; // type:func +EnOkarinaEffect_TriggerStorm = 0x80AECB54; // type:func +EnOkarinaEffect_ManageStorm = 0x80AECBE0; // type:func +EnOkarinaEffect_Update = 0x80AECDB0; // type:func +EnMag_ResetSram = 0x80AECE40; // type:func +EnMag_Init = 0x80AED004; // type:func +EnMag_Destroy = 0x80AED2A8; // type:func +EnMag_CheckSramResetCode = 0x80AED2B0; // type:func +EnMag_Update = 0x80AED3FC; // type:func +EnMag_DrawTextureI8 = 0x80AEDC5C; // type:func +EnMag_DrawEffectTextures = 0x80AEDE8C; // type:func +EnMag_DrawImageRGBA32 = 0x80AEE2EC; // type:func +EnMag_DrawCharTexture = 0x80AEE744; // type:func +EnMag_DrawInner = 0x80AEE8F8; // type:func +EnMag_Draw = 0x80AEFAC0; // type:func +DoorGerudo_Init = 0x80AF1E80; // type:func +DoorGerudo_Destroy = 0x80AF1F30; // type:func +func_809946BC = 0x80AF1F64; // type:func +func_80994750 = 0x80AF1FFC; // type:func +func_8099485C = 0x80AF2108; // type:func +func_8099496C = 0x80AF2218; // type:func +func_809949C8 = 0x80AF2274; // type:func +DoorGerudo_Update = 0x80AF22D0; // type:func +DoorGerudo_Draw = 0x80AF22F4; // type:func +ElfMsg2_SetupAction = 0x80AF2470; // type:func +ElfMsg2_KillCheck = 0x80AF247C; // type:func +ElfMsg2_Init = 0x80AF25B4; // type:func +ElfMsg2_Destroy = 0x80AF2674; // type:func +ElfMsg2_GetMessageId = 0x80AF2684; // type:func +ElfMsg2_WaitForTextClose = 0x80AF2698; // type:func +ElfMsg2_WaitForTextRead = 0x80AF2718; // type:func +ElfMsg2_WaitUntilActivated = 0x80AF2750; // type:func +ElfMsg2_Update = 0x80AF27CC; // type:func +DemoGt_Destroy = 0x80AF28E0; // type:func +DemoGt_PlayEarthquakeSfx = 0x80AF2928; // type:func +DemoGt_PlayExplosion1Sfx = 0x80AF2948; // type:func +DemoGt_PlayExplosion2Sfx = 0x80AF296C; // type:func +DemoGt_Rumble = 0x80AF2990; // type:func +DemoGt_SpawnDust = 0x80AF29C0; // type:func +func_8097D7D8 = 0x80AF2A50; // type:func +DemoGt_SpawnCloudRing = 0x80AF2BD8; // type:func +DemoGt_SpawnExplosionWithSound = 0x80AF2C38; // type:func +DemoGt_SpawnExplosionNoSound = 0x80AF2CEC; // type:func +func_8097DAC8 = 0x80AF2D40; // type:func +func_8097DD28 = 0x80AF2FA0; // type:func +func_8097DF70 = 0x80AF31E8; // type:func +func_8097E1D4 = 0x80AF344C; // type:func +func_8097E454 = 0x80AF36CC; // type:func +DemoGt_IsCutsceneIdle = 0x80AF391C; // type:func +DemoGt_GetCue = 0x80AF393C; // type:func +func_8097E704 = 0x80AF3988; // type:func +func_8097E744 = 0x80AF39C8; // type:func +func_8097E824 = 0x80AF3AA8; // type:func +func_8097ED64 = 0x80AF3FE4; // type:func +DemoGt_IsCutsceneLayer = 0x80AF401C; // type:func +func_8097EDD8 = 0x80AF4044; // type:func +func_8097EE44 = 0x80AF40BC; // type:func +func_8097EEA8_Init0 = 0x80AF4120; // type:func +func_8097EF00 = 0x80AF4178; // type:func +func_8097EF34 = 0x80AF41AC; // type:func +func_8097EF40 = 0x80AF41BC; // type:func +func_8097F0AC = 0x80AF4314; // type:func +func_8097F19C = 0x80AF43F8; // type:func +func_8097F1D8 = 0x80AF443C; // type:func +func_8097F280 = 0x80AF44E4; // type:func +func_8097F3EC = 0x80AF4658; // type:func +DemoGt_Update0 = 0x80AF4698; // type:func +DemoGt_Update8 = 0x80AF4710; // type:func +DemoGt_Draw1 = 0x80AF4788; // type:func +func_8097F904_Init1 = 0x80AF4B4C; // type:func +func_8097F960 = 0x80AF4BA8; // type:func +func_8097F96C = 0x80AF4BB8; // type:func +func_8097FA1C = 0x80AF4C4C; // type:func +func_8097FAFC = 0x80AF4D14; // type:func +func_8097FC1C = 0x80AF4E1C; // type:func +func_8097FCE4 = 0x80AF4ED0; // type:func +func_8097FD70 = 0x80AF4F4C; // type:func +func_8097FDDC = 0x80AF4FC0; // type:func +func_8097FED8 = 0x80AF50C0; // type:func +DemoGt_Update1 = 0x80AF5100; // type:func +DemoGt_Update9 = 0x80AF5150; // type:func +DemoGt_Draw2 = 0x80AF5198; // type:func +func_80980110_Init2 = 0x80AF52CC; // type:func +func_8098016C = 0x80AF5328; // type:func +func_80980178 = 0x80AF5338; // type:func +func_80980184 = 0x80AF5348; // type:func +func_80980218 = 0x80AF53DC; // type:func +func_809802AC = 0x80AF5470; // type:func +func_8098036C = 0x80AF5534; // type:func +func_80980430 = 0x80AF55FC; // type:func +func_80980504 = 0x80AF56BC; // type:func +func_809805D8 = 0x80AF577C; // type:func +func_809806B8 = 0x80AF5844; // type:func +func_8098078C = 0x80AF5904; // type:func +func_8098085C = 0x80AF59C0; // type:func +func_809809C0 = 0x80AF5B0C; // type:func +func_80980AD4 = 0x80AF5C10; // type:func +func_80980B68 = 0x80AF5C90; // type:func +func_80980BFC = 0x80AF5D10; // type:func +func_80980C90 = 0x80AF5D90; // type:func +func_80980D74 = 0x80AF5E7C; // type:func +DemoGt_Update2 = 0x80AF5EBC; // type:func +DemoGt_Update10 = 0x80AF5F00; // type:func +DemoGt_Draw3 = 0x80AF5F3C; // type:func +func_80980F00_Init5 = 0x80AF5FD8; // type:func +func_80980F58 = 0x80AF6030; // type:func +func_80980F8C = 0x80AF6068; // type:func +func_8098103C = 0x80AF611C; // type:func +DemoGt_Update3 = 0x80AF6180; // type:func +DemoGt_Update11 = 0x80AF61C4; // type:func +DemoGt_Update16 = 0x80AF6200; // type:func +DemoGt_Draw4 = 0x80AF6298; // type:func +func_809813CC_Init6 = 0x80AF6480; // type:func +func_80981424 = 0x80AF64D8; // type:func +func_80981458 = 0x80AF6510; // type:func +func_80981524 = 0x80AF65C8; // type:func +DemoGt_Update4 = 0x80AF662C; // type:func +DemoGt_Update12 = 0x80AF6670; // type:func +DemoGt_Update17 = 0x80AF66AC; // type:func +DemoGt_Draw5 = 0x80AF6744; // type:func +func_809818A4_Init7 = 0x80AF6920; // type:func +func_809818FC = 0x80AF6978; // type:func +func_80981930 = 0x80AF69B0; // type:func +DemoGt_Update5 = 0x80AF6A14; // type:func +DemoGt_Update13 = 0x80AF6A58; // type:func +DemoGt_Update18 = 0x80AF6A94; // type:func +DemoGt_Draw6 = 0x80AF6B2C; // type:func +func_80981C94_Init23 = 0x80AF6CE4; // type:func +func_80981CEC = 0x80AF6D3C; // type:func +func_80981D20 = 0x80AF6D74; // type:func +func_80981DC8 = 0x80AF6E1C; // type:func +DemoGt_Update6 = 0x80AF6E5C; // type:func +DemoGt_Update14 = 0x80AF6EA0; // type:func +DemoGt_Draw7 = 0x80AF6EE4; // type:func +func_80982054_Init24 = 0x80AF707C; // type:func +func_809820AC = 0x80AF70D4; // type:func +func_809820E0 = 0x80AF710C; // type:func +func_80982188 = 0x80AF71B4; // type:func +DemoGt_Update7 = 0x80AF71F4; // type:func +DemoGt_Update15 = 0x80AF7238; // type:func +DemoGt_Draw8 = 0x80AF727C; // type:func +DemoGt_Update = 0x80AF7418; // type:func +DemoGt_Init = 0x80AF7460; // type:func +DemoGt_Draw0 = 0x80AF7524; // type:func +DemoGt_Draw = 0x80AF7534; // type:func +EnPoField_Init = 0x80AF7EF0; // type:func +EnPoField_Destroy = 0x80AF80F8; // type:func +EnPoField_SetupWaitForSpawn = 0x80AF8158; // type:func +EnPoField_SetupAppear = 0x80AF821C; // type:func +EnPoField_SetupCirclePlayer = 0x80AF833C; // type:func +EnPoField_SetupFlee = 0x80AF83E4; // type:func +EnPoField_SetupDamage = 0x80AF8478; // type:func +EnPoField_SetupDeath = 0x80AF8534; // type:func +EnPoField_SetupDisappear = 0x80AF8588; // type:func +EnPoField_SetupSoulIdle = 0x80AF8600; // type:func +func_80AD42B0 = 0x80AF86B0; // type:func +func_80AD4384 = 0x80AF8784; // type:func +EnPoField_SetupSoulDisappear = 0x80AF883C; // type:func +EnPoField_SetupInteractWithSoul = 0x80AF8850; // type:func +EnPoField_CorrectYPos = 0x80AF8878; // type:func +EnPoField_SetFleeSpeed = 0x80AF895C; // type:func +EnPoField_WaitForSpawn = 0x80AF8A6C; // type:func +EnPoField_Appear = 0x80AF8CD4; // type:func +EnPoField_CirclePlayer = 0x80AF8E70; // type:func +EnPoField_Flee = 0x80AF90B0; // type:func +EnPoField_Damage = 0x80AF9254; // type:func +EnPoField_Death = 0x80AF92E4; // type:func +EnPoField_Disappear = 0x80AF96FC; // type:func +EnPoField_SoulIdle = 0x80AF97FC; // type:func +EnPoField_SoulUpdateProperties = 0x80AF98E0; // type:func +func_80AD587C = 0x80AF9C88; // type:func +func_80AD58D4 = 0x80AF9CE0; // type:func +EnPoField_SoulDisappear = 0x80AF9EE4; // type:func +EnPoField_SoulInteract = 0x80AF9F24; // type:func +EnPoField_TestForDamage = 0x80AFA084; // type:func +EnPoField_SpawnFlame = 0x80AFA11C; // type:func +EnPoField_UpdateFlame = 0x80AFA170; // type:func +EnPoField_DrawFlame = 0x80AFA29C; // type:func +func_80AD619C = 0x80AFA574; // type:func +func_80AD6330 = 0x80AFA708; // type:func +EnPoField_Update = 0x80AFA87C; // type:func +EnPoField_OverrideLimbDraw2 = 0x80AFA9A8; // type:func +EnPoField_PostLimDraw2 = 0x80AFAAB0; // type:func +EnPoField_Draw = 0x80AFACC0; // type:func +EnPoField_UpdateDead = 0x80AFAFA4; // type:func +EnPoField_DrawSoul = 0x80AFB000; // type:func +EfcErupc_SetupAction = 0x80AFB980; // type:func +EfcErupc_Init = 0x80AFB98C; // type:func +EfcErupc_Destroy = 0x80AFB9F8; // type:func +EfcErupc_UpdateAction = 0x80AFBA08; // type:func +EfcErupc_Update = 0x80AFBC54; // type:func +EfcErupc_Draw = 0x80AFBC90; // type:func +EfcErupc_DrawEffects = 0x80AFBFD0; // type:func +EfcErupc_UpdateEffects = 0x80AFC18C; // type:func +EfcErupc_SpawnEffect = 0x80AFC2B0; // type:func +EfcErupc_InitEffects = 0x80AFC37C; // type:func +BgZg_Destroy = 0x80AFC470; // type:func +func_808C0C50 = 0x80AFC4A4; // type:func +func_808C0C98 = 0x80AFC4EC; // type:func +func_808C0CC8 = 0x80AFC520; // type:func +func_808C0CD4 = 0x80AFC530; // type:func +func_808C0D08 = 0x80AFC564; // type:func +BgZg_Update = 0x80AFC608; // type:func +BgZg_Init = 0x80AFC650; // type:func +func_808C0EEC = 0x80AFC73C; // type:func +BgZg_Draw = 0x80AFC7B8; // type:func +EnHeishi4_Init = 0x80AFC8C0; // type:func +EnHeishi4_Destroy = 0x80AFCAA0; // type:func +func_80A56328 = 0x80AFCACC; // type:func +func_80A563BC = 0x80AFCB60; // type:func +func_80A56544 = 0x80AFCCE8; // type:func +func_80A56614 = 0x80AFCDAC; // type:func +func_80A5673C = 0x80AFCED4; // type:func +func_80A56874 = 0x80AFCFE8; // type:func +func_80A56900 = 0x80AFD074; // type:func +func_80A56994 = 0x80AFD108; // type:func +func_80A56A50 = 0x80AFD1C4; // type:func +func_80A56ACC = 0x80AFD240; // type:func +func_80A56B40 = 0x80AFD2B4; // type:func +EnHeishi4_Update = 0x80AFD428; // type:func +EnHeishi_OverrideLimbDraw = 0x80AFD58C; // type:func +EnHeishi4_Draw = 0x80AFD5F4; // type:func +func_80B533B0 = 0x80AFD7C0; // type:func +func_80B533FC = 0x80AFD80C; // type:func +EnZl3_Destroy = 0x80AFD850; // type:func +func_80B53468 = 0x80AFD87C; // type:func +func_80B53488 = 0x80AFD89C; // type:func +EnZl3_UpdateEyes = 0x80AFD8E8; // type:func +EnZl3_setEyeIndex = 0x80AFD970; // type:func +EnZl3_setMouthIndex = 0x80AFD988; // type:func +func_80B5357C = 0x80AFD9A0; // type:func +func_80B53614 = 0x80AFDA3C; // type:func +func_80B5366C = 0x80AFDA94; // type:func +func_80B536B4 = 0x80AFDADC; // type:func +func_80B536C4 = 0x80AFDAF0; // type:func +func_80B53764 = 0x80AFDB94; // type:func +func_80B537E8 = 0x80AFDC1C; // type:func +func_80B538B0 = 0x80AFDCE4; // type:func +EnZl3_UpdateSkelAnime = 0x80AFDD80; // type:func +func_80B5396C = 0x80AFDDA4; // type:func +func_80B53974 = 0x80AFDDB0; // type:func +func_80B53980 = 0x80AFDDC4; // type:func +func_80B53B64 = 0x80AFDFAC; // type:func +func_80B54360 = 0x80AFE7BC; // type:func +func_80B5458C = 0x80AFE9EC; // type:func +EnZl3_PostLimbDraw = 0x80AFF0E8; // type:func +func_80B54DB4 = 0x80AFF1B4; // type:func +func_80B54DC4 = 0x80AFF1C8; // type:func +func_80B54DD4 = 0x80AFF1DC; // type:func +func_80B54DE0 = 0x80AFF1EC; // type:func +func_80B54E14 = 0x80AFF224; // type:func +func_80B54EA4 = 0x80AFF2B4; // type:func +func_80B54EF4 = 0x80AFF308; // type:func +func_80B54F18 = 0x80AFF330; // type:func +func_80B54FB4 = 0x80AFF3D0; // type:func +func_80B55054 = 0x80AFF454; // type:func +func_80B550F0 = 0x80AFF4F4; // type:func +func_80B55144 = 0x80AFF548; // type:func +func_80B551E0 = 0x80AFF5E8; // type:func +func_80B55220 = 0x80AFF628; // type:func +func_80B55268 = 0x80AFF670; // type:func +func_80B552A8 = 0x80AFF6B0; // type:func +func_80B552DC = 0x80AFF6E4; // type:func +func_80B55334 = 0x80AFF740; // type:func +func_80B55368 = 0x80AFF774; // type:func +func_80B553B4 = 0x80AFF7C0; // type:func +func_80B553E8 = 0x80AFF7F4; // type:func +func_80B55408 = 0x80AFF814; // type:func +func_80B55444 = 0x80AFF850; // type:func +func_80B55550 = 0x80AFF954; // type:func +func_80B555A4 = 0x80AFF9B0; // type:func +func_80B55604 = 0x80AFFA18; // type:func +func_80B5566C = 0x80AFFA88; // type:func +func_80B556CC = 0x80AFFAF0; // type:func +func_80B5572C = 0x80AFFB58; // type:func +func_80B55780 = 0x80AFFBB4; // type:func +func_80B55808 = 0x80AFFC18; // type:func +func_80B5582C = 0x80AFFC40; // type:func +func_80B5585C = 0x80AFFC70; // type:func +func_80B558A8 = 0x80AFFCBC; // type:func +func_80B559C4 = 0x80AFFDDC; // type:func +func_80B55A58 = 0x80AFFE6C; // type:func +func_80B55A84 = 0x80AFFE98; // type:func +func_80B55AC4 = 0x80AFFED8; // type:func +func_80B55B04 = 0x80AFFF18; // type:func +func_80B55B38 = 0x80AFFF4C; // type:func +func_80B55B78 = 0x80AFFF8C; // type:func +func_80B55BAC = 0x80AFFFC0; // type:func +func_80B55C0C = 0x80B00024; // type:func +func_80B55C4C = 0x80B00064; // type:func +func_80B55C70 = 0x80B0008C; // type:func +func_80B55CCC = 0x80B000E4; // type:func +func_80B55D00 = 0x80B00118; // type:func +func_80B55DB0 = 0x80B001CC; // type:func +func_80B55E08 = 0x80B00224; // type:func +func_80B55E48 = 0x80B00264; // type:func +func_80B55E7C = 0x80B00298; // type:func +func_80B55EBC = 0x80B002D8; // type:func +func_80B55EF0 = 0x80B0030C; // type:func +func_80B55F38 = 0x80B00354; // type:func +func_80B55F6C = 0x80B00388; // type:func +func_80B5604C = 0x80B0046C; // type:func +func_80B56090 = 0x80B004B0; // type:func +func_80B56108 = 0x80B0052C; // type:func +func_80B56160 = 0x80B00584; // type:func +func_80B561A0 = 0x80B005C4; // type:func +func_80B561E0 = 0x80B00604; // type:func +func_80B56214 = 0x80B00638; // type:func +func_80B562F4 = 0x80B0071C; // type:func +func_80B5634C = 0x80B00774; // type:func +func_80B5638C = 0x80B007B4; // type:func +func_80B563C0 = 0x80B007E8; // type:func +func_80B56400 = 0x80B00828; // type:func +func_80B56434 = 0x80B0085C; // type:func +func_80B56474 = 0x80B0089C; // type:func +func_80B564A8 = 0x80B008D0; // type:func +func_80B56658 = 0x80B00A70; // type:func +func_80B566AC = 0x80B00ACC; // type:func +func_80B5670C = 0x80B00B34; // type:func +func_80B5676C = 0x80B00B9C; // type:func +func_80B567CC = 0x80B00C04; // type:func +func_80B5682C = 0x80B00C6C; // type:func +func_80B568B4 = 0x80B00CFC; // type:func +func_80B5691C = 0x80B00D6C; // type:func +func_80B5697C = 0x80B00DD4; // type:func +func_80B569E4 = 0x80B00E44; // type:func +func_80B56A68 = 0x80B00ED0; // type:func +func_80B56AE0 = 0x80B00F50; // type:func +func_80B56B54 = 0x80B00FCC; // type:func +func_80B56BA8 = 0x80B01028; // type:func +func_80B56C24 = 0x80B010AC; // type:func +func_80B56C84 = 0x80B01114; // type:func +func_80B56CE4 = 0x80B0117C; // type:func +func_80B56D44 = 0x80B011E4; // type:func +func_80B56DA4 = 0x80B0124C; // type:func +func_80B56DC8 = 0x80B01270; // type:func +func_80B56DEC = 0x80B01298; // type:func +func_80B56E38 = 0x80B012E4; // type:func +func_80B56EB8 = 0x80B01364; // type:func +func_80B56EE4 = 0x80B01394; // type:func +func_80B56F10 = 0x80B013C4; // type:func +func_80B56F8C = 0x80B01418; // type:func +func_80B56FAC = 0x80B01438; // type:func +func_80B57034 = 0x80B014C4; // type:func +func_80B57104 = 0x80B01598; // type:func +func_80B571A8 = 0x80B01640; // type:func +func_80B571FC = 0x80B01694; // type:func +func_80B57240 = 0x80B016D8; // type:func +func_80B57298 = 0x80B01730; // type:func +func_80B572F0 = 0x80B01788; // type:func +func_80B57324 = 0x80B017C0; // type:func +func_80B57350 = 0x80B017EC; // type:func +func_80B573C8 = 0x80B01864; // type:func +func_80B573FC = 0x80B01898; // type:func +func_80B57458 = 0x80B018F4; // type:func +func_80B57564 = 0x80B01A04; // type:func +func_80B575B0 = 0x80B01A58; // type:func +func_80B575D0 = 0x80B01A78; // type:func +func_80B575F0 = 0x80B01A98; // type:func +func_80B5764C = 0x80B01AF4; // type:func +func_80B576C8 = 0x80B01B74; // type:func +func_80B57704 = 0x80B01BB8; // type:func +func_80B5772C = 0x80B01BE4; // type:func +func_80B57754 = 0x80B01C10; // type:func +func_80B577BC = 0x80B01C7C; // type:func +func_80B57858 = 0x80B01D1C; // type:func +func_80B57890 = 0x80B01D58; // type:func +func_80B57A74 = 0x80B01F40; // type:func +func_80B57AAC = 0x80B01F78; // type:func +func_80B57AE0 = 0x80B01FAC; // type:func +func_80B57C54 = 0x80B02124; // type:func +func_80B57C7C = 0x80B0214C; // type:func +func_80B57C8C = 0x80B02160; // type:func +func_80B57CB4 = 0x80B02188; // type:func +func_80B57D60 = 0x80B02230; // type:func +func_80B57D80 = 0x80B02254; // type:func +func_80B57EAC = 0x80B0238C; // type:func +func_80B57EEC = 0x80B023D4; // type:func +func_80B57F1C = 0x80B02408; // type:func +func_80B57F84 = 0x80B02474; // type:func +func_80B58014 = 0x80B0250C; // type:func +func_80B58214 = 0x80B02718; // type:func +func_80B58268 = 0x80B02770; // type:func +func_80B582C8 = 0x80B027D0; // type:func +func_80B584B4 = 0x80B029BC; // type:func +func_80B58624 = 0x80B02B2C; // type:func +func_80B5884C = 0x80B02D5C; // type:func +func_80B58898 = 0x80B02DA8; // type:func +func_80B588E8 = 0x80B02DF8; // type:func +func_80B58938 = 0x80B02E48; // type:func +func_80B5899C = 0x80B02EB0; // type:func +func_80B58A1C = 0x80B02F30; // type:func +func_80B58A50 = 0x80B02F6C; // type:func +func_80B58AAC = 0x80B02FCC; // type:func +func_80B58C08 = 0x80B03128; // type:func +func_80B58D50 = 0x80B03270; // type:func +func_80B58DB0 = 0x80B032D8; // type:func +func_80B58E10 = 0x80B03340; // type:func +func_80B58E7C = 0x80B033B4; // type:func +func_80B58EF4 = 0x80B03434; // type:func +func_80B58F6C = 0x80B034B4; // type:func +func_80B58FDC = 0x80B0352C; // type:func +func_80B5904C = 0x80B035A4; // type:func +func_80B590BC = 0x80B0361C; // type:func +func_80B5912C = 0x80B03694; // type:func +func_80B591BC = 0x80B0372C; // type:func +func_80B5922C = 0x80B037A4; // type:func +func_80B592A8 = 0x80B03828; // type:func +func_80B59340 = 0x80B038C8; // type:func +func_80B593D0 = 0x80B03960; // type:func +func_80B5944C = 0x80B039E4; // type:func +func_80B59698 = 0x80B03BE0; // type:func +func_80B59768 = 0x80B03CB0; // type:func +func_80B59828 = 0x80B03D70; // type:func +func_80B59A80 = 0x80B03FD0; // type:func +func_80B59AD0 = 0x80B04020; // type:func +func_80B59B6C = 0x80B040BC; // type:func +func_80B59DB8 = 0x80B04304; // type:func +EnZl3_Update = 0x80B04374; // type:func +EnZl3_Init = 0x80B043BC; // type:func +EnZl3_OverrideLimbDraw = 0x80B0447C; // type:func +func_80B59FE8 = 0x80B044E4; // type:func +func_80B59FF4 = 0x80B044F4; // type:func +func_80B5A1D0 = 0x80B046A0; // type:func +EnZl3_Draw = 0x80B04848; // type:func +BossGanon2_InitRand = 0x80B05610; // type:func +BossGanon2_RandZeroOne = 0x80B05630; // type:func +func_808FD080 = 0x80B05758; // type:func +BossGanon2_SetObjectSegment = 0x80B057E8; // type:func +func_808FD210 = 0x80B0589C; // type:func +func_808FD27C = 0x80B0590C; // type:func +BossGanon2_Init = 0x80B059EC; // type:func +BossGanon2_Destroy = 0x80B05B1C; // type:func +func_808FD4D4 = 0x80B05B6C; // type:func +func_808FD5C4 = 0x80B05C5C; // type:func +func_808FD5F4 = 0x80B05C90; // type:func +func_808FF898 = 0x80B07F40; // type:func +func_808FFA24 = 0x80B080CC; // type:func +func_808FFAC8 = 0x80B08170; // type:func +func_808FFBBC = 0x80B08268; // type:func +func_808FFC84 = 0x80B08334; // type:func +func_808FFCFC = 0x80B083AC; // type:func +func_808FFDB0 = 0x80B08460; // type:func +func_808FFEBC = 0x80B08570; // type:func +func_808FFF90 = 0x80B08644; // type:func +func_808FFFE0 = 0x80B08694; // type:func +func_809000A0 = 0x80B08754; // type:func +func_80900104 = 0x80B087B4; // type:func +func_80900210 = 0x80B088C0; // type:func +func_8090026C = 0x80B0891C; // type:func +func_809002CC = 0x80B08980; // type:func +func_80900344 = 0x80B089F4; // type:func +func_80900580 = 0x80B08C30; // type:func +func_80900650 = 0x80B08D00; // type:func +func_80900818 = 0x80B08EC8; // type:func +func_80900890 = 0x80B08F40; // type:func +func_80901020 = 0x80B096D4; // type:func +func_8090109C = 0x80B09750; // type:func +func_8090120C = 0x80B098C0; // type:func +func_80902348 = 0x80B0AA04; // type:func +BossGanon2_CollisionCheck = 0x80B0ABE4; // type:func +BossGanon2_Update = 0x80B0AED8; // type:func +func_809034E4 = 0x80B0BBA4; // type:func +func_80903F38 = 0x80B0C5F8; // type:func +func_80904108 = 0x80B0C784; // type:func +func_80904340 = 0x80B0C988; // type:func +func_8090464C = 0x80B0CC78; // type:func +BossGanon2_OverrideLimbDraw = 0x80B0CE0C; // type:func +BossGanon2_PostLimbDraw = 0x80B0CF44; // type:func +func_80904D88 = 0x80B0D308; // type:func +func_80904FC8 = 0x80B0D50C; // type:func +func_8090523C = 0x80B0D730; // type:func +BossGanon2_PostLimbDraw2 = 0x80B0D9C0; // type:func +func_80905674 = 0x80B0DAEC; // type:func +BossGanon2_Draw = 0x80B0DD34; // type:func +BossGanon2_UpdateEffects = 0x80B0E1B4; // type:func +BossGanon2_DrawEffects = 0x80B0E4F8; // type:func +func_80906538 = 0x80B0E8F0; // type:func +BossGanon2_GenShadowTexture = 0x80B0EDB0; // type:func +BossGanon2_DrawShadowTexture = 0x80B0EE68; // type:func +EnKakasi_Destroy = 0x80B18480; // type:func +EnKakasi_Init = 0x80B184AC; // type:func +func_80A8F28C = 0x80B18574; // type:func +func_80A8F320 = 0x80B18608; // type:func +func_80A8F660 = 0x80B18948; // type:func +func_80A8F75C = 0x80B18A44; // type:func +func_80A8F8D0 = 0x80B18BC0; // type:func +func_80A8F9C8 = 0x80B18CAC; // type:func +func_80A8FAA4 = 0x80B18D8C; // type:func +func_80A8FBB8 = 0x80B18E90; // type:func +EnKakasi_Update = 0x80B18F28; // type:func +EnKakasi_Draw = 0x80B1902C; // type:func +EnTakaraMan_Destroy = 0x80B191C0; // type:func +EnTakaraMan_Init = 0x80B191D0; // type:func +func_80B176E0 = 0x80B1931C; // type:func +func_80B1778C = 0x80B193C8; // type:func +func_80B17934 = 0x80B19570; // type:func +func_80B17A6C = 0x80B196A8; // type:func +func_80B17AC4 = 0x80B19704; // type:func +func_80B17B14 = 0x80B19758; // type:func +EnTakaraMan_Update = 0x80B197BC; // type:func +EnTakaraMan_OverrideLimbDraw = 0x80B19894; // type:func +EnTakaraMan_Draw = 0x80B198FC; // type:func +ObjMakeoshihiki_Init = 0x80B19A80; // type:func +ObjMakeoshihiki_Draw = 0x80B19BF4; // type:func +OceffSpot_SetupAction = 0x80B19F10; // type:func +OceffSpot_Init = 0x80B19F1C; // type:func +OceffSpot_Destroy = 0x80B1A078; // type:func +OceffSpot_End = 0x80B1A108; // type:func +OceffSpot_Wait = 0x80B1A1D0; // type:func +OceffSpot_GrowCylinder = 0x80B1A20C; // type:func +OceffSpot_Update = 0x80B1A270; // type:func +OceffSpot_Draw = 0x80B1A548; // type:func +EndTitle_Init = 0x80B1AE40; // type:func +EndTitle_Destroy = 0x80B1AE6C; // type:func +EndTitle_Update = 0x80B1AE74; // type:func +EndTitle_DrawFull = 0x80B1AE7C; // type:func +EndTitle_DrawNintendoLogo = 0x80B1B4D8; // type:func +EnTorch_Init = 0x80B20880; // type:func +DemoEc_Destroy = 0x80B20970; // type:func +DemoEc_Init = 0x80B20994; // type:func +DemoEc_UpdateSkelAnime = 0x80B209DC; // type:func +DemoEc_UpdateBgFlags = 0x80B20A00; // type:func +func_8096D594 = 0x80B20A48; // type:func +func_8096D5D4 = 0x80B20A88; // type:func +func_8096D64C = 0x80B20B00; // type:func +DemoEc_UpdateEyes = 0x80B20B40; // type:func +DemoEc_SetEyeTexIndex = 0x80B20BC8; // type:func +DemoEc_InitSkelAnime = 0x80B20BE0; // type:func +DemoEc_ChangeAnimation = 0x80B20C58; // type:func +DemoEc_AllocColorDList = 0x80B20D14; // type:func +DemoEc_DrawSkeleton = 0x80B20D6C; // type:func +DemoEc_DrawSkeletonCustomColor = 0x80B20EFC; // type:func +DemoEc_UseDrawObject = 0x80B2115C; // type:func +DemoEc_UseAnimationObject = 0x80B211B8; // type:func +DemoEc_GetCue = 0x80B211F0; // type:func +DemoEc_SetStartPosRotFromCue = 0x80B21218; // type:func +DemoEc_InitIngo = 0x80B21298; // type:func +DemoEc_UpdateIngo = 0x80B21338; // type:func +DemoEc_DrawIngo = 0x80B21378; // type:func +DemoEc_InitTalon = 0x80B213AC; // type:func +DemoEc_UpdateTalon = 0x80B2144C; // type:func +DemoEc_DrawTalon = 0x80B2148C; // type:func +DemoEc_InitWindmillMan = 0x80B214C0; // type:func +DemoEc_UpdateWindmillMan = 0x80B21560; // type:func +DemoEc_DrawWindmillMan = 0x80B215A0; // type:func +DemoEc_InitKokiriBoy = 0x80B215D4; // type:func +DemoEc_InitDancingKokiriBoy = 0x80B21674; // type:func +DemoEc_UpdateKokiriBoy = 0x80B21718; // type:func +DemoEc_UpdateDancingKokiriBoy = 0x80B21758; // type:func +DemoEc_DrawKokiriBoy = 0x80B21778; // type:func +DemoEc_InitKokiriGirl = 0x80B217BC; // type:func +DemoEc_InitDancingKokiriGirl = 0x80B2185C; // type:func +DemoEc_UpdateKokiriGirl = 0x80B21900; // type:func +DemoEc_UpdateDancingKokiriGirl = 0x80B21948; // type:func +DemoEc_DrawKokiriGirl = 0x80B21968; // type:func +DemoEc_InitOldMan = 0x80B219BC; // type:func +DemoEc_UpdateOldMan = 0x80B21A5C; // type:func +DemoEc_DrawOldMan = 0x80B21AA4; // type:func +DemoEc_InitBeardedMan = 0x80B21AF8; // type:func +DemoEc_UpdateBeardedMan = 0x80B21B98; // type:func +DemoEc_DrawBeardedMan = 0x80B21BE0; // type:func +DemoEc_InitWoman = 0x80B21C34; // type:func +DemoEc_UpdateWoman = 0x80B21CD4; // type:func +DemoEc_DrawWoman = 0x80B21D1C; // type:func +DemoEc_InitOldWoman = 0x80B21D58; // type:func +DemoEc_UpdateOldWoman = 0x80B21DF8; // type:func +DemoEc_DrawOldWoman = 0x80B21E38; // type:func +DemoEc_InitBossCarpenter = 0x80B21E68; // type:func +DemoEc_UpdateBossCarpenter = 0x80B21F08; // type:func +DemoEc_DrawBossCarpenter = 0x80B21F48; // type:func +DemoEc_InitCarpenter = 0x80B21F74; // type:func +DemoEc_UpdateCarpenter = 0x80B22014; // type:func +DemoEc_CarpenterOverrideLimbDraw = 0x80B22054; // type:func +DemoEc_GetCarpenterPostLimbDList = 0x80B22158; // type:func +DemoEc_CarpenterPostLimbDraw = 0x80B221C0; // type:func +DemoEc_DrawCarpenter = 0x80B22244; // type:func +DemoEc_InitGerudo = 0x80B22280; // type:func +DemoEc_UpdateGerudo = 0x80B22324; // type:func +DemoEc_GetGerudoPostLimbDList = 0x80B2236C; // type:func +DemoEc_GerudoPostLimbDraw = 0x80B223C0; // type:func +DemoEc_DrawGerudo = 0x80B22444; // type:func +DemoEc_InitDancingZora = 0x80B22488; // type:func +DemoEc_UpdateDancingZora = 0x80B2252C; // type:func +DemoEc_DrawDancingZora = 0x80B22574; // type:func +DemoEc_InitKingZora = 0x80B225B0; // type:func +func_8096F1D4 = 0x80B22660; // type:func +func_8096F224 = 0x80B226B0; // type:func +func_8096F26C = 0x80B226F8; // type:func +func_8096F2B0 = 0x80B22740; // type:func +DemoEc_UpdateKingZora = 0x80B227A4; // type:func +func_8096F378 = 0x80B2280C; // type:func +func_8096F3D4 = 0x80B2286C; // type:func +DemoEc_DrawKingZora = 0x80B228B4; // type:func +DemoEc_InitMido = 0x80B228F0; // type:func +func_8096F4FC = 0x80B229A0; // type:func +func_8096F544 = 0x80B229E8; // type:func +func_8096F578 = 0x80B22A1C; // type:func +DemoEc_UpdateMido = 0x80B22A80; // type:func +func_8096F640 = 0x80B22AE8; // type:func +DemoEc_DrawMido = 0x80B22B48; // type:func +DemoEc_InitCucco = 0x80B22B84; // type:func +DemoEc_UpdateCucco = 0x80B22C54; // type:func +DemoEc_DrawCucco = 0x80B22C94; // type:func +DemoEc_InitCuccoLady = 0x80B22CC0; // type:func +DemoEc_UpdateCuccoLady = 0x80B22D64; // type:func +DemoEc_DrawCuccoLady = 0x80B22DAC; // type:func +DemoEc_InitPotionShopOwner = 0x80B22DE8; // type:func +DemoEc_UpdatePotionShopOwner = 0x80B22E8C; // type:func +DemoEc_DrawPotionShopOwner = 0x80B22ED4; // type:func +DemoEc_InitMaskShopOwner = 0x80B22F10; // type:func +DemoEc_UpdateMaskShopOwner = 0x80B22FB4; // type:func +DemoEc_DrawMaskShopOwner = 0x80B22FF4; // type:func +DemoEc_InitFishingOwner = 0x80B23024; // type:func +DemoEc_UpdateFishingOwner = 0x80B230C8; // type:func +DemoEc_FishingOwnerPostLimbDraw = 0x80B23110; // type:func +DemoEc_DrawFishingOwner = 0x80B23190; // type:func +DemoEc_InitBombchuShopOwner = 0x80B231D4; // type:func +DempEc_UpdateBombchuShopOwner = 0x80B23278; // type:func +DemoEc_DrawBombchuShopOwner = 0x80B232C0; // type:func +DemoEc_InitGorons = 0x80B232FC; // type:func +DemoEc_UpdateGorons = 0x80B23434; // type:func +DemoEc_DrawGorons = 0x80B2347C; // type:func +DemoEc_InitMalon = 0x80B234BC; // type:func +DemoEc_UpdateMalon = 0x80B23560; // type:func +DemoEc_DrawMalon = 0x80B235A8; // type:func +DemoEc_InitNpc = 0x80B235E8; // type:func +DemoEc_InitCommon = 0x80B23634; // type:func +DemoEc_Update = 0x80B23708; // type:func +DemoEc_DrawCommon = 0x80B23780; // type:func +DemoEc_Draw = 0x80B23790; // type:func +ShotSun_Init = 0x80B241D0; // type:func +ShotSun_Destroy = 0x80B2428C; // type:func +ShotSun_SpawnFairy = 0x80B242D0; // type:func +ShotSun_TriggerFairy = 0x80B24378; // type:func +ShotSun_UpdateFairySpawner = 0x80B24414; // type:func +ShotSun_UpdateHyliaSun = 0x80B24564; // type:func +ShotSun_Update = 0x80B2479C; // type:func +EnDyExtra_Destroy = 0x80B24890; // type:func +EnDyExtra_Init = 0x80B248A0; // type:func +EnDyExtra_WaitForTrigger = 0x80B24914; // type:func +EnDyExtra_FallAndKill = 0x80B249A8; // type:func +EnDyExtra_Update = 0x80B24A60; // type:func +EnDyExtra_Draw = 0x80B24ACC; // type:func +EnWonderTalk2_Destroy = 0x80B24E30; // type:func +EnWonderTalk2_Init = 0x80B24E40; // type:func +func_80B3A10C = 0x80B24FD0; // type:func +func_80B3A15C = 0x80B25020; // type:func +func_80B3A3D4 = 0x80B251A0; // type:func +func_80B3A4F8 = 0x80B25288; // type:func +EnWonderTalk2_DoNothing = 0x80B253D8; // type:func +EnWonderTalk2_Update = 0x80B253E8; // type:func +EnGe2_ChangeAction = 0x80B254D0; // type:func +EnGe2_Init = 0x80B25578; // type:func +EnGe2_Destroy = 0x80B25790; // type:func +Ge2_DetectPlayerInAction = 0x80B257BC; // type:func +Ge2_DetectPlayerInUpdate = 0x80B25868; // type:func +EnGe2_CheckCarpentersFreed = 0x80B25998; // type:func +EnGe2_CaptureClose = 0x80B259C4; // type:func +EnGe2_CaptureCharge = 0x80B25A98; // type:func +EnGe2_CaptureTurn = 0x80B25BCC; // type:func +EnGe2_KnockedOut = 0x80B25C44; // type:func +EnGe2_TurnPlayerSpotted = 0x80B25D3C; // type:func +EnGe2_AboutTurn = 0x80B25E44; // type:func +EnGe2_Walk = 0x80B25EFC; // type:func +EnGe2_Stand = 0x80B25FC4; // type:func +EnGe2_TurnToFacePlayer = 0x80B26004; // type:func +EnGe2_LookAtPlayer = 0x80B2611C; // type:func +EnGe2_SetActionAfterTalk = 0x80B26230; // type:func +EnGe2_WaitLookAtPlayer = 0x80B262F4; // type:func +EnGe2_WaitTillCardGiven = 0x80B26314; // type:func +EnGe2_GiveCard = 0x80B26378; // type:func +EnGe2_ForceTalk = 0x80B2640C; // type:func +EnGe2_SetupCapturePlayer = 0x80B26490; // type:func +EnGe2_MaintainColliderAndSetAnimState = 0x80B26500; // type:func +EnGe2_MoveAndBlink = 0x80B265A8; // type:func +EnGe2_UpdateFriendly = 0x80B26634; // type:func +EnGe2_UpdateAfterTalk = 0x80B2670C; // type:func +EnGe2_Update = 0x80B26760; // type:func +EnGe2_UpdateStunned = 0x80B26948; // type:func +EnGe2_OverrideLimbDraw = 0x80B26A7C; // type:func +EnGe2_PostLimbDraw = 0x80B26AC4; // type:func +EnGe2_Draw = 0x80B26B04; // type:func +ObjRoomtimer_Init = 0x80B26E70; // type:func +ObjRoomtimer_Destroy = 0x80B26EC4; // type:func +func_80B9D054 = 0x80B26EF8; // type:func +func_80B9D0B0 = 0x80B26F58; // type:func +ObjRoomtimer_Update = 0x80B27034; // type:func +EnSsh_SetupAction = 0x80B270C0; // type:func +EnSsh_SpawnShockwave = 0x80B270CC; // type:func +EnSsh_CreateBlureEffect = 0x80B27154; // type:func +EnSsh_CheckCeilingPos = 0x80B27250; // type:func +EnSsh_AddBlureVertex = 0x80B272E8; // type:func +EnSsh_AddBlureSpace = 0x80B273F0; // type:func +EnSsh_InitColliders = 0x80B2741C; // type:func +EnSsh_SetAnimation = 0x80B2755C; // type:func +EnSsh_SetWaitAnimation = 0x80B27690; // type:func +EnSsh_SetReturnAnimation = 0x80B276B0; // type:func +EnSsh_SetLandAnimation = 0x80B276E4; // type:func +EnSsh_SetDropAnimation = 0x80B27728; // type:func +EnSsh_SetStunned = 0x80B27778; // type:func +EnSsh_SetColliderScale = 0x80B277A4; // type:func +EnSsh_Damaged = 0x80B27918; // type:func +EnSsh_Turn = 0x80B279F4; // type:func +EnSsh_Stunned = 0x80B27AC8; // type:func +EnSsh_UpdateYaw = 0x80B27B68; // type:func +EnSsh_Bob = 0x80B27BA4; // type:func +EnSsh_IsCloseToLink = 0x80B27C10; // type:func +EnSsh_IsCloseToHome = 0x80B27CF8; // type:func +EnSsh_IsCloseToGround = 0x80B27D30; // type:func +EnSsh_Sway = 0x80B27D70; // type:func +EnSsh_CheckBodyStickHit = 0x80B27EB4; // type:func +EnSsh_CheckHitPlayer = 0x80B27F28; // type:func +EnSsh_CheckHitFront = 0x80B28030; // type:func +EnSsh_CheckHitBack = 0x80B2808C; // type:func +EnSsh_CollisionCheck = 0x80B28164; // type:func +EnSsh_SetBodyCylinderAC = 0x80B28218; // type:func +EnSsh_SetLegsCylinderAC = 0x80B2825C; // type:func +EnSsh_SetCylinderOC = 0x80B28314; // type:func +EnSsh_SetColliders = 0x80B284EC; // type:func +EnSsh_Init = 0x80B285B4; // type:func +EnSsh_Destroy = 0x80B28748; // type:func +EnSsh_Wait = 0x80B287C8; // type:func +EnSsh_Talk = 0x80B28824; // type:func +EnSsh_Idle = 0x80B28870; // type:func +EnSsh_Land = 0x80B28B08; // type:func +EnSsh_Drop = 0x80B28BF0; // type:func +EnSsh_Return = 0x80B28CF0; // type:func +EnSsh_UpdateColliderScale = 0x80B28DC4; // type:func +EnSsh_Start = 0x80B28E6C; // type:func +EnSsh_Update = 0x80B28EF4; // type:func +EnSsh_OverrideLimbDraw = 0x80B29014; // type:func +EnSsh_PostLimbDraw = 0x80B29104; // type:func +EnSsh_Draw = 0x80B29140; // type:func +EnSth_SetupAction = 0x80B296B0; // type:func +EnSth_Init = 0x80B296BC; // type:func +EnSth_SetupShapeColliderUpdate2AndDraw = 0x80B297B8; // type:func +EnSth_SetupAfterObjectLoaded = 0x80B2983C; // type:func +EnSth_Destroy = 0x80B29960; // type:func +EnSth_WaitForObject = 0x80B2998C; // type:func +EnSth_FacePlayer = 0x80B299E0; // type:func +EnSth_LookAtPlayer = 0x80B29AF8; // type:func +EnSth_RewardObtainedTalk = 0x80B29C0C; // type:func +EnSth_ParentRewardObtainedWait = 0x80B29C88; // type:func +EnSth_GivePlayerItem = 0x80B29D14; // type:func +EnSth_GiveReward = 0x80B29DB0; // type:func +EnSth_RewardUnobtainedTalk = 0x80B29E30; // type:func +EnSth_RewardUnobtainedWait = 0x80B29EAC; // type:func +EnSth_ChildRewardObtainedWait = 0x80B29F50; // type:func +EnSth_Update = 0x80B29FFC; // type:func +EnSth_Update2 = 0x80B2A020; // type:func +EnSth_OverrideLimbDraw = 0x80B2A124; // type:func +EnSth_PostLimbDraw = 0x80B2A280; // type:func +EnSth_AllocColorDList = 0x80B2A2F8; // type:func +EnSth_Draw = 0x80B2A364; // type:func +OceffWipe_Init = 0x80B2D770; // type:func +OceffWipe_Destroy = 0x80B2D7CC; // type:func +OceffWipe_Update = 0x80B2D818; // type:func +OceffWipe_Draw = 0x80B2D878; // type:func +EffectSsDust_Init = 0x80B2E4F0; // type:func +EffectSsDust_Draw = 0x80B2E6A4; // type:func +EffectSsDust_Update = 0x80B2E9EC; // type:func +EffectSsDust_UpdateFire = 0x80B2EAE4; // type:func +EffectSsKiraKira_Init = 0x80B2ED30; // type:func +EffectSsKiraKira_Draw = 0x80B2EED0; // type:func +func_809AABF0 = 0x80B2F0EC; // type:func +func_809AACAC = 0x80B2F1A4; // type:func +func_809AAD6C = 0x80B2F260; // type:func +EffectSsBomb_Init = 0x80B2F3A0; // type:func +EffectSsBomb_Draw = 0x80B2F468; // type:func +EffectSsBomb_Update = 0x80B2F6A0; // type:func +EffectSsBomb2_Init = 0x80B2F7D0; // type:func +EffectSsBomb2_DrawFade = 0x80B2F8C8; // type:func +EffectSsBomb2_DrawLayered = 0x80B2FAB8; // type:func +EffectSsBomb2_Update = 0x80B2FDEC; // type:func +EffectSsBlast_Init = 0x80B300D0; // type:func +EffectSsBlast_Draw = 0x80B3022C; // type:func +EffectSsBlast_Update = 0x80B30398; // type:func +EffectSsGSpk_Init = 0x80B30460; // type:func +EffectSsGSpk_Draw = 0x80B305D0; // type:func +EffectSsGSpk_Update = 0x80B307C4; // type:func +EffectSsGSpk_UpdateNoAccel = 0x80B308CC; // type:func +EffectSsDFire_Init = 0x80B30A10; // type:func +EffectSsDFire_Draw = 0x80B30B5C; // type:func +EffectSsDFire_Update = 0x80B30DA4; // type:func +EffectSsBubble_Init = 0x80B30F00; // type:func +EffectSsBubble_Draw = 0x80B31090; // type:func +EffectSsBubble_Update = 0x80B311E4; // type:func +EffectSsGRipple_Init = 0x80B31380; // type:func +EffectSsGRipple_DrawRipple = 0x80B314FC; // type:func +EffectSsGRipple_Draw = 0x80B316F8; // type:func +EffectSsGRipple_Update = 0x80B31730; // type:func +EffectSsGSplash_Init = 0x80B318E0; // type:func +EffectSsGSplash_Draw = 0x80B31B00; // type:func +EffectSsGSplash_Update = 0x80B31C08; // type:func +EffectSsGMagma_Init = 0x80B31D90; // type:func +EffectSsGMagma_Draw = 0x80B31EE8; // type:func +EffectSsGMagma_Update = 0x80B31F44; // type:func +EffectSsGFire_Init = 0x80B31FF0; // type:func +EffectSsGFire_Draw = 0x80B32130; // type:func +EffectSsGFire_Update = 0x80B321D8; // type:func +EffectSsLightning_Init = 0x80B32280; // type:func +EffectSsLightning_NewLightning = 0x80B32368; // type:func +EffectSsLightning_Draw = 0x80B3240C; // type:func +EffectSsLightning_Update = 0x80B326A4; // type:func +EffectSsDtBubble_Init = 0x80B32950; // type:func +EffectSsDtBubble_Draw = 0x80B32BA4; // type:func +EffectSsDtBubble_Update = 0x80B32DE4; // type:func +EffectSsHahen_CheckForObject = 0x80B32EE0; // type:func +EffectSsHahen_Init = 0x80B32F54; // type:func +EffectSsHahen_Draw = 0x80B330F0; // type:func +EffectSsHahen_DrawGray = 0x80B33250; // type:func +EffectSsHahen_Update = 0x80B333F8; // type:func +EffectSsStick_Init = 0x80B33520; // type:func +EffectSsStick_Draw = 0x80B33680; // type:func +EffectSsStick_Update = 0x80B33820; // type:func +EffectSsSibuki_Init = 0x80B338C0; // type:func +EffectSsSibuki_Draw = 0x80B33A78; // type:func +EffectSsSibuki_Update = 0x80B33C28; // type:func +EffectSsSibuki2_Init = 0x80B33F90; // type:func +EffectSsSibuki2_Draw = 0x80B34040; // type:func +EffectSsSibuki2_Update = 0x80B34224; // type:func +EffectSsGMagma2_Init = 0x80B342C0; // type:func +EffectSsGMagma2_Draw = 0x80B3448C; // type:func +EffectSsGMagma2_Update = 0x80B346A4; // type:func +EffectSsStone1_Init = 0x80B347D0; // type:func +EffectSsStone1_Draw = 0x80B3485C; // type:func +EffectSsStone1_Update = 0x80B34A58; // type:func +EffectSsHitMark_Init = 0x80B34B50; // type:func +EffectSsHitMark_Draw = 0x80B34C50; // type:func +EffectSsHitMark_Update = 0x80B34E5C; // type:func +EffectSsFhgFlash_Init = 0x80B350A0; // type:func +EffectSsFhgFlash_DrawLightBall = 0x80B353EC; // type:func +EffectSsFhgFlash_DrawShock = 0x80B355E0; // type:func +EffectSsFhgFlash_UpdateLightBall = 0x80B357EC; // type:func +EffectSsFhgFlash_UpdateShock = 0x80B35884; // type:func +EffectSsKFire_Init = 0x80B36020; // type:func +EffectSsKFire_Draw = 0x80B360F0; // type:func +EffectSsKFire_Update = 0x80B36358; // type:func +EffectSsSolderSrchBall_Init = 0x80B36460; // type:func +EffectSsSolderSrchBall_Update = 0x80B364E0; // type:func +EffectSsKakera_Init = 0x80B36610; // type:func +func_809A9818 = 0x80B3679C; // type:func +EffectSsKakera_Draw = 0x80B367D8; // type:func +func_809A9BA8 = 0x80B36AC4; // type:func +func_809A9C10 = 0x80B36B30; // type:func +func_809A9DC0 = 0x80B36CE0; // type:func +func_809A9DD8 = 0x80B36CFC; // type:func +func_809A9DEC = 0x80B36D18; // type:func +func_809A9E28 = 0x80B36D54; // type:func +func_809A9E68 = 0x80B36D94; // type:func +func_809A9E88 = 0x80B36DB4; // type:func +func_809A9F10 = 0x80B36E44; // type:func +func_809A9F4C = 0x80B36E84; // type:func +func_809A9FD8 = 0x80B36F18; // type:func +func_809AA0B8 = 0x80B36FF4; // type:func +func_809AA0EC = 0x80B3702C; // type:func +func_809AA230 = 0x80B37174; // type:func +EffectSsKakera_Update = 0x80B37374; // type:func +EffectSsIcePiece_Init = 0x80B376A0; // type:func +EffectSsIcePiece_Draw = 0x80B377EC; // type:func +EffectSsIcePiece_Update = 0x80B37A20; // type:func +EffectSsEnIce_Init = 0x80B37AE0; // type:func +EffectSsEnIce_Draw = 0x80B37D88; // type:func +EffectSsEnIce_UpdateFlying = 0x80B380F8; // type:func +EffectSsEnIce_Update = 0x80B382D0; // type:func +EffectSsFireTail_Init = 0x80B383A0; // type:func +EffectSsFireTail_Draw = 0x80B384BC; // type:func +EffectSsFireTail_Update = 0x80B389C4; // type:func +EffectSsEnFire_Init = 0x80B38AA0; // type:func +EffectSsEnFire_Draw = 0x80B38C68; // type:func +EffectSsEnFire_Update = 0x80B38F70; // type:func +EffectSsExtra_Init = 0x80B391F0; // type:func +EffectSsExtra_Draw = 0x80B39334; // type:func +EffectSsExtra_Update = 0x80B394E8; // type:func +EffectSsFcircle_Init = 0x80B395B0; // type:func +EffectSsFcircle_Draw = 0x80B39670; // type:func +EffectSsFcircle_Update = 0x80B3993C; // type:func +EffectSsDeadDb_Init = 0x80B39A60; // type:func +EffectSsDeadDb_Draw = 0x80B39B7C; // type:func +EffectSsDeadDb_Update = 0x80B39D50; // type:func +EffectSsDeadDd_Init = 0x80B39F40; // type:func +EffectSsDeadDd_Draw = 0x80B3A208; // type:func +EffectSsDeadDd_Update = 0x80B3A3D8; // type:func +EffectSsDeadDs_Init = 0x80B3A4D0; // type:func +EffectSsDeadDs_Draw = 0x80B3A5B8; // type:func +EffectSsDeadDs_Update = 0x80B3A88C; // type:func +EffectSsDeadSound_Init = 0x80B3A950; // type:func +EffectSsDeadSound_Update = 0x80B3A9DC; // type:func +OceffStorm_SetupAction = 0x80B3AA90; // type:func +OceffStorm_Init = 0x80B3AA9C; // type:func +OceffStorm_Destroy = 0x80B3AB6C; // type:func +OceffStorm_DefaultAction = 0x80B3ABB8; // type:func +OceffStorm_UnkAction = 0x80B3AD7C; // type:func +OceffStorm_Update = 0x80B3AD9C; // type:func +OceffStorm_Draw2 = 0x80B3AE08; // type:func +OceffStorm_Draw = 0x80B3AFB8; // type:func +EnWeiyer_Init = 0x80B3C640; // type:func +EnWeiyer_Destroy = 0x80B3C710; // type:func +func_80B32384 = 0x80B3C73C; // type:func +func_80B32434 = 0x80B3C7F0; // type:func +func_80B32494 = 0x80B3C850; // type:func +func_80B32508 = 0x80B3C8C4; // type:func +func_80B32538 = 0x80B3C8F8; // type:func +func_80B325A0 = 0x80B3C964; // type:func +func_80B32660 = 0x80B3CA24; // type:func +func_80B32724 = 0x80B3CAE8; // type:func +func_80B327B0 = 0x80B3CB74; // type:func +func_80B327D8 = 0x80B3CBA0; // type:func +func_80B32804 = 0x80B3CBD0; // type:func +func_80B328E8 = 0x80B3CCB4; // type:func +func_80B32C2C = 0x80B3CFF8; // type:func +func_80B32D30 = 0x80B3D0FC; // type:func +func_80B32DEC = 0x80B3D1B8; // type:func +func_80B32E34 = 0x80B3D204; // type:func +func_80B33018 = 0x80B3D3EC; // type:func +func_80B331CC = 0x80B3D5A0; // type:func +func_80B332B4 = 0x80B3D688; // type:func +func_80B33338 = 0x80B3D70C; // type:func +func_80B333B8 = 0x80B3D78C; // type:func +func_80B3349C = 0x80B3D870; // type:func +func_80B3368C = 0x80B3DA64; // type:func +EnWeiyer_Update = 0x80B3DB44; // type:func +EnWeiyer_OverrideLimbDraw = 0x80B3DCB8; // type:func +EnWeiyer_Draw = 0x80B3DCE8; // type:func +BgSpot05Soko_Init = 0x80B3E040; // type:func +BgSpot05Soko_Destroy = 0x80B3E14C; // type:func +func_808AE5A8 = 0x80B3E180; // type:func +func_808AE5B4 = 0x80B3E190; // type:func +func_808AE630 = 0x80B3E20C; // type:func +BgSpot05Soko_Update = 0x80B3E274; // type:func +BgSpot05Soko_Draw = 0x80B3E298; // type:func +BgJya1flift_InitDynapoly = 0x80B3E360; // type:func +BgJya1flift_InitCollision = 0x80B3E3B8; // type:func +BgJya1flift_Init = 0x80B3E40C; // type:func +BgJya1flift_Destroy = 0x80B3E504; // type:func +BgJya1flift_SetupWaitForSwitch = 0x80B3E55C; // type:func +BgJya1flift_WaitForSwitch = 0x80B3E57C; // type:func +BgJya1flift_SetupDoNothing = 0x80B3E5C0; // type:func +BgJya1flift_DoNothing = 0x80B3E5E0; // type:func +BgJya1flift_ChangeDirection = 0x80B3E5F0; // type:func +BgJya1flift_Move = 0x80B3E618; // type:func +BgJya1flift_ResetMoveDelay = 0x80B3E6FC; // type:func +BgJya1flift_DelayMove = 0x80B3E714; // type:func +BgJya1flift_Update = 0x80B3E754; // type:func +BgJya1flift_Draw = 0x80B3E870; // type:func +BgJyaHaheniron_ColliderInit = 0x80B3E9F0; // type:func +BgJyaHaheniron_SpawnFragments = 0x80B3EA44; // type:func +BgJyaHaheniron_Init = 0x80B3EC70; // type:func +BgJyaHaheniron_Destroy = 0x80B3ED3C; // type:func +BgJyaHaheniron_SetupChairCrumble = 0x80B3ED74; // type:func +BgJyaHaheniron_ChairCrumble = 0x80B3ED88; // type:func +BgJyaHaheniron_SetupPillarCrumble = 0x80B3EEC4; // type:func +BgJyaHaheniron_PillarCrumble = 0x80B3EED8; // type:func +BgJyaHaheniron_SetupRubbleCollide = 0x80B3EF58; // type:func +BgJyaHaheniron_RubbleCollide = 0x80B3EF6C; // type:func +BgJyaHaheniron_Update = 0x80B3EFD0; // type:func +BgJyaHaheniron_Draw = 0x80B3EFFC; // type:func +BgSpot12Gate_InitDynaPoly = 0x80B3F1E0; // type:func +BgSpot12Gate_Init = 0x80B3F238; // type:func +BgSpot12Gate_Destroy = 0x80B3F2B8; // type:func +func_808B30C0 = 0x80B3F2EC; // type:func +func_808B30D8 = 0x80B3F308; // type:func +func_808B3134 = 0x80B3F364; // type:func +func_808B314C = 0x80B3F380; // type:func +func_808B317C = 0x80B3F3B0; // type:func +func_808B318C = 0x80B3F3C4; // type:func +func_808B3274 = 0x80B3F4AC; // type:func +func_808B3298 = 0x80B3F4D4; // type:func +BgSpot12Gate_Update = 0x80B3F4E4; // type:func +BgSpot12Gate_Draw = 0x80B3F518; // type:func +func_808B3420 = 0x80B3F5F0; // type:func +BgSpot12Saku_Init = 0x80B3F648; // type:func +BgSpot12Saku_Destroy = 0x80B3F6C8; // type:func +func_808B3550 = 0x80B3F6FC; // type:func +func_808B357C = 0x80B3F72C; // type:func +func_808B35E4 = 0x80B3F794; // type:func +func_808B3604 = 0x80B3F7B4; // type:func +func_808B3714 = 0x80B3F8C4; // type:func +func_808B37AC = 0x80B3F958; // type:func +BgSpot12Saku_Update = 0x80B3F968; // type:func +BgSpot12Saku_Draw = 0x80B3F99C; // type:func +EnHintnuts_Init = 0x80B3FAB0; // type:func +EnHintnuts_Destroy = 0x80B3FC50; // type:func +EnHintnuts_HitByScrubProjectile1 = 0x80B3FC8C; // type:func +EnHintnuts_SetupWait = 0x80B3FD10; // type:func +EnHintnuts_SetupLookAround = 0x80B3FD90; // type:func +EnHintnuts_SetupThrowScrubProjectile = 0x80B3FDD8; // type:func +EnHintnuts_SetupStand = 0x80B3FE18; // type:func +EnHintnuts_SetupBurrow = 0x80B3FE80; // type:func +EnHintnuts_HitByScrubProjectile2 = 0x80B3FED0; // type:func +EnHintnuts_SetupRun = 0x80B3FFC0; // type:func +EnHintnuts_SetupTalk = 0x80B40008; // type:func +EnHintnuts_SetupLeave = 0x80B40054; // type:func +EnHintnuts_SetupFreeze = 0x80B40114; // type:func +EnHintnuts_Wait = 0x80B401C0; // type:func +EnHintnuts_LookAround = 0x80B40424; // type:func +EnHintnuts_Stand = 0x80B404A8; // type:func +EnHintnuts_ThrowNut = 0x80B4056C; // type:func +EnHintnuts_Burrow = 0x80B406A8; // type:func +EnHintnuts_BeginRun = 0x80B407BC; // type:func +EnHintnuts_BeginFreeze = 0x80B40820; // type:func +EnHintnuts_CheckProximity = 0x80B4085C; // type:func +EnHintnuts_Run = 0x80B408F0; // type:func +EnHintnuts_Talk = 0x80B40B80; // type:func +EnHintnuts_Leave = 0x80B40BEC; // type:func +EnHintnuts_Freeze = 0x80B40DA8; // type:func +EnHintnuts_ColliderCheck = 0x80B40ED4; // type:func +EnHintnuts_Update = 0x80B40F88; // type:func +EnHintnuts_OverrideLimbDraw = 0x80B41110; // type:func +EnHintnuts_Draw = 0x80B41244; // type:func +EnNutsball_Init = 0x80B414E0; // type:func +EnNutsball_Destroy = 0x80B4159C; // type:func +func_80ABBB34 = 0x80B415C8; // type:func +func_80ABBBA8 = 0x80B41640; // type:func +EnNutsball_Update = 0x80B41810; // type:func +EnNutsball_Draw = 0x80B4192C; // type:func +BgSpot00Break_Init = 0x80B41B00; // type:func +BgSpot00Break_Destroy = 0x80B41BAC; // type:func +BgSpot00Break_Update = 0x80B41BE0; // type:func +BgSpot00Break_Draw = 0x80B41BF0; // type:func +EnShopnuts_Init = 0x80B41CA0; // type:func +EnShopnuts_Destroy = 0x80B41DDC; // type:func +EnShopnuts_SetupIdle = 0x80B41E08; // type:func +EnShopnuts_SetupLookAround = 0x80B41E70; // type:func +EnShopnuts_SetupThrowNut = 0x80B41EB8; // type:func +EnShopnuts_SetupPeek = 0x80B41EF8; // type:func +EnShopnuts_SetupBurrow = 0x80B41F60; // type:func +EnShopnuts_SetupSpawnSalesman = 0x80B41FB0; // type:func +EnShopnuts_Idle = 0x80B42008; // type:func +EnShopnuts_LookAround = 0x80B4226C; // type:func +EnShopnuts_Peek = 0x80B422F0; // type:func +EnShopnuts_ThrowNut = 0x80B423B4; // type:func +EnShopnuts_Burrow = 0x80B424F0; // type:func +EnShopnuts_SpawnSalesman = 0x80B425B4; // type:func +EnShopnuts_ColliderCheck = 0x80B42650; // type:func +EnShopnuts_Update = 0x80B426B0; // type:func +EnShopnuts_OverrideLimbDraw = 0x80B427F0; // type:func +EnShopnuts_PostLimbDraw = 0x80B42828; // type:func +EnShopnuts_Draw = 0x80B429C8; // type:func +EnIt_Init = 0x80B42BB0; // type:func +EnIt_Destroy = 0x80B42C1C; // type:func +EnIt_Update = 0x80B42C48; // type:func +EnGeldB_SetupAction = 0x80B42D40; // type:func +EnGeldB_Init = 0x80B42D4C; // type:func +EnGeldB_Destroy = 0x80B42F70; // type:func +EnGeldB_ReactToPlayer = 0x80B42FD8; // type:func +EnGeldB_SetupWait = 0x80B433B0; // type:func +EnGeldB_Wait = 0x80B43444; // type:func +EnGeldB_SetupFlee = 0x80B435C8; // type:func +EnGeldB_Flee = 0x80B43660; // type:func +EnGeldB_SetupReady = 0x80B43788; // type:func +EnGeldB_Ready = 0x80B43810; // type:func +EnGeldB_SetupAdvance = 0x80B43AF4; // type:func +EnGeldB_Advance = 0x80B43B74; // type:func +EnGeldB_SetupRollForward = 0x80B44020; // type:func +EnGeldB_RollForward = 0x80B440D4; // type:func +EnGeldB_SetupPivot = 0x80B4422C; // type:func +EnGeldB_Pivot = 0x80B44278; // type:func +EnGeldB_SetupCircle = 0x80B44458; // type:func +EnGeldB_Circle = 0x80B4452C; // type:func +EnGeldB_SetupSpinDodge = 0x80B44B08; // type:func +EnGeldB_SpinDodge = 0x80B44C70; // type:func +EnGeldB_SetupSlash = 0x80B450C0; // type:func +EnGeldB_Slash = 0x80B45130; // type:func +EnGeldB_SetupSpinAttack = 0x80B45380; // type:func +EnGeldB_SpinAttack = 0x80B45414; // type:func +EnGeldB_SetupRollBack = 0x80B457C8; // type:func +EnGeldB_RollBack = 0x80B45844; // type:func +EnGeldB_SetupStunned = 0x80B45948; // type:func +EnGeldB_Stunned = 0x80B459F4; // type:func +EnGeldB_SetupDamaged = 0x80B45AB0; // type:func +EnGeldB_Damaged = 0x80B45B48; // type:func +EnGeldB_SetupJump = 0x80B45CF0; // type:func +EnGeldB_Jump = 0x80B45DA8; // type:func +EnGeldB_SetupBlock = 0x80B45E90; // type:func +EnGeldB_Block = 0x80B45F48; // type:func +EnGeldB_SetupSidestep = 0x80B46234; // type:func +EnGeldB_Sidestep = 0x80B463C4; // type:func +EnGeldB_SetupDefeated = 0x80B46AE4; // type:func +EnGeldB_Defeated = 0x80B46B88; // type:func +EnGeldB_TurnHead = 0x80B46C44; // type:func +EnGeldB_CollisionCheck = 0x80B46D44; // type:func +EnGeldB_Update = 0x80B46F10; // type:func +EnGeldB_OverrideLimbDraw = 0x80B470FC; // type:func +EnGeldB_PostLimbDraw = 0x80B47244; // type:func +EnGeldB_Draw = 0x80B474BC; // type:func +EnGeldB_DodgeRanged = 0x80B4782C; // type:func +OceffWipe2_Init = 0x80B480F0; // type:func +OceffWipe2_Destroy = 0x80B4814C; // type:func +OceffWipe2_Update = 0x80B48198; // type:func +OceffWipe2_Draw = 0x80B481F8; // type:func +OceffWipe3_Init = 0x80B49860; // type:func +OceffWipe3_Destroy = 0x80B498BC; // type:func +OceffWipe3_Update = 0x80B49908; // type:func +OceffWipe3_Draw = 0x80B49968; // type:func +EnNiwGirl_Init = 0x80B4AFB0; // type:func +EnNiwGirl_Destroy = 0x80B4B150; // type:func +EnNiwGirl_Jump = 0x80B4B160; // type:func +func_80AB9210 = 0x80B4B1E4; // type:func +EnNiwGirl_Talk = 0x80B4B398; // type:func +func_80AB94D0 = 0x80B4B4A8; // type:func +EnNiwGirl_Update = 0x80B4B59C; // type:func +EnNiwGirlOverrideLimbDraw = 0x80B4B7C4; // type:func +EnNiwGirl_Draw = 0x80B4B82C; // type:func +EnDog_PlayWalkSFX = 0x80B4BA80; // type:func +EnDog_PlayRunSFX = 0x80B4BAE8; // type:func +EnDog_PlayBarkSFX = 0x80B4BB50; // type:func +EnDog_PlayAnimAndSFX = 0x80B4BBB8; // type:func +EnDog_CanFollow = 0x80B4BD50; // type:func +EnDog_UpdateWaypoint = 0x80B4BDD4; // type:func +EnDog_Orient = 0x80B4BE60; // type:func +EnDog_Init = 0x80B4BF04; // type:func +EnDog_Destroy = 0x80B4C154; // type:func +EnDog_FollowPath = 0x80B4C180; // type:func +EnDog_ChooseMovement = 0x80B4C318; // type:func +EnDog_FollowPlayer = 0x80B4C408; // type:func +EnDog_RunAway = 0x80B4C588; // type:func +EnDog_FaceLink = 0x80B4C62C; // type:func +EnDog_Wait = 0x80B4C734; // type:func +EnDog_Update = 0x80B4C78C; // type:func +EnDog_OverrideLimbDraw = 0x80B4C858; // type:func +EnDog_PostLimbDraw = 0x80B4C874; // type:func +EnDog_Draw = 0x80B4C88C; // type:func +EnSi_Init = 0x80B4CC30; // type:func +EnSi_Destroy = 0x80B4CCC0; // type:func +func_80AFB748 = 0x80B4CCEC; // type:func +func_80AFB768 = 0x80B4CD10; // type:func +func_80AFB89C = 0x80B4CE44; // type:func +func_80AFB950 = 0x80B4CEFC; // type:func +EnSi_Update = 0x80B4CF90; // type:func +EnSi_Draw = 0x80B4D004; // type:func +BgSpot01Objects2_Init = 0x80B4D130; // type:func +BgSpot01Objects2_Destroy = 0x80B4D20C; // type:func +func_808AC22C = 0x80B4D21C; // type:func +func_808AC2BC = 0x80B4D2B0; // type:func +func_808AC474 = 0x80B4D460; // type:func +BgSpot01Objects2_Update = 0x80B4D470; // type:func +func_808AC4A4 = 0x80B4D494; // type:func +ObjComb_Break = 0x80B4D5F0; // type:func +ObjComb_ChooseItemDrop = 0x80B4D8E0; // type:func +ObjComb_Init = 0x80B4D9B0; // type:func +ObjComb_Destroy = 0x80B4DA20; // type:func +ObjComb_SetupWait = 0x80B4DA4C; // type:func +ObjComb_Wait = 0x80B4DA60; // type:func +ObjComb_Update = 0x80B4DB4C; // type:func +ObjComb_Draw = 0x80B4DBC4; // type:func +func_808B2180 = 0x80B4DE50; // type:func +func_808B2218 = 0x80B4DEE4; // type:func +BgSpot11Bakudankabe_Init = 0x80B4E1FC; // type:func +BgSpot11Bakudankabe_Destroy = 0x80B4E298; // type:func +BgSpot11Bakudankabe_Update = 0x80B4E2E0; // type:func +BgSpot11Bakudankabe_Draw = 0x80B4E37C; // type:func +ObjKibako2_InitCollider = 0x80B4E490; // type:func +ObjKibako2_Break = 0x80B4E4E8; // type:func +ObjKibako2_SpawnCollectible = 0x80B4E764; // type:func +ObjKibako2_Init = 0x80B4E7B4; // type:func +ObjKibako2_Destroy = 0x80B4E860; // type:func +ObjKibako2_Idle = 0x80B4E8A8; // type:func +ObjKibako2_Kill = 0x80B4E980; // type:func +ObjKibako2_Update = 0x80B4EA04; // type:func +ObjKibako2_Draw = 0x80B4EA28; // type:func +EnDntDemo_Destroy = 0x80B4EB50; // type:func +EnDntDemo_Init = 0x80B4EB60; // type:func +EnDntDemo_Judge = 0x80B4ECD0; // type:func +EnDntDemo_Results = 0x80B4F2F0; // type:func +EnDntDemo_Prize = 0x80B4F564; // type:func +EnDntDemo_Update = 0x80B4F640; // type:func +EnDntJiji_Init = 0x80B4F870; // type:func +EnDntJiji_Destroy = 0x80B4F950; // type:func +EnDntJiji_SetFlower = 0x80B4F97C; // type:func +EnDntJiji_SetupWait = 0x80B4F9BC; // type:func +EnDntJiji_Wait = 0x80B4FA6C; // type:func +EnDntJiji_SetupUp = 0x80B4FB24; // type:func +EnDntJiji_Up = 0x80B4FC08; // type:func +EnDntJiji_SetupUnburrow = 0x80B4FC78; // type:func +EnDntJiji_Unburrow = 0x80B4FD5C; // type:func +EnDntJiji_SetupWalk = 0x80B4FDE4; // type:func +EnDntJiji_Walk = 0x80B4FE94; // type:func +EnDntJiji_SetupBurrow = 0x80B4FFD0; // type:func +EnDntJiji_Burrow = 0x80B500C0; // type:func +EnDntJiji_SetupCower = 0x80B500EC; // type:func +EnDntJiji_Cower = 0x80B5022C; // type:func +EnDntJiji_SetupTalk = 0x80B502D0; // type:func +EnDntJiji_Talk = 0x80B50364; // type:func +EnDntJiji_SetupGivePrize = 0x80B50430; // type:func +EnDntJiji_GivePrize = 0x80B504A0; // type:func +EnDntJiji_SetupHide = 0x80B505B0; // type:func +EnDntJiji_Hide = 0x80B50648; // type:func +EnDntJiji_SetupReturn = 0x80B506B4; // type:func +EnDntJiji_Return = 0x80B50764; // type:func +EnDntJiji_Update = 0x80B508DC; // type:func +EnDntJiji_Draw = 0x80B50AB4; // type:func +EnDntNomal_Init = 0x80B50D90; // type:func +EnDntNomal_Destroy = 0x80B50EB8; // type:func +EnDntNomal_WaitForObject = 0x80B50F04; // type:func +EnDntNomal_SetFlower = 0x80B51054; // type:func +EnDntNomal_SetupTargetWait = 0x80B510AC; // type:func +EnDntNomal_TargetWait = 0x80B51154; // type:func +EnDntNomal_SetupTargetUnburrow = 0x80B51430; // type:func +EnDntNomal_TargetUnburrow = 0x80B5154C; // type:func +EnDntNomal_SetupTargetWalk = 0x80B515B8; // type:func +EnDntNomal_TargetWalk = 0x80B5165C; // type:func +EnDntNomal_TargetFacePlayer = 0x80B51748; // type:func +EnDntNomal_SetupTargetTalk = 0x80B517FC; // type:func +EnDntNomal_TargetTalk = 0x80B518A8; // type:func +EnDntNomal_SetupTargetGivePrize = 0x80B51950; // type:func +EnDntNomal_TargetGivePrize = 0x80B519E8; // type:func +EnDntNomal_TargetReturn = 0x80B51B50; // type:func +EnDntNomal_TargetBurrow = 0x80B51D20; // type:func +EnDntNomal_SetupStageWait = 0x80B51D8C; // type:func +EnDntNomal_StageWait = 0x80B51E44; // type:func +EnDntNomal_SetupStageUp = 0x80B51E70; // type:func +EnDntNomal_StageUp = 0x80B51F7C; // type:func +EnDntNomal_SetupStageUnburrow = 0x80B521B0; // type:func +EnDntNomal_StageUnburrow = 0x80B522A4; // type:func +EnDntNomal_SetupStageCelebrate = 0x80B5237C; // type:func +EnDntNomal_StageCelebrate = 0x80B52424; // type:func +EnDntNomal_SetupStageDance = 0x80B5262C; // type:func +EnDntNomal_StageDance = 0x80B5273C; // type:func +EnDntNomal_SetupStageHide = 0x80B528A0; // type:func +EnDntNomal_StageHide = 0x80B5297C; // type:func +EnDntNomal_StageAttackHide = 0x80B52B40; // type:func +EnDntNomal_SetupStageAttack = 0x80B52B74; // type:func +EnDntNomal_StageAttack = 0x80B52C40; // type:func +EnDntNomal_StageSetupReturn = 0x80B52F04; // type:func +EnDntNomal_StageReturn = 0x80B52FA8; // type:func +EnDntNomal_Update = 0x80B530AC; // type:func +EnDntNomal_OverrideLimbDraw = 0x80B53370; // type:func +EnDntNomal_PostLimbDraw = 0x80B53420; // type:func +EnDntNomal_DrawStageScrub = 0x80B534A8; // type:func +EnDntNomal_DrawTargetScrub = 0x80B53698; // type:func +EnGuest_Init = 0x80B53B90; // type:func +EnGuest_Destroy = 0x80B53BF0; // type:func +EnGuest_Update = 0x80B53C1C; // type:func +func_80A5046C = 0x80B53D8C; // type:func +func_80A50518 = 0x80B53E38; // type:func +func_80A5057C = 0x80B53EA0; // type:func +func_80A505CC = 0x80B53EF4; // type:func +func_80A50708 = 0x80B54034; // type:func +EnGuest_OverrideLimbDraw = 0x80B540A0; // type:func +EnGuest_Draw = 0x80B542C8; // type:func +BgBomGuard_SetupAction = 0x80B54530; // type:func +BgBomGuard_Init = 0x80B5453C; // type:func +BgBomGuard_Destroy = 0x80B545D8; // type:func +func_8086E638 = 0x80B5460C; // type:func +BgBomGuard_Update = 0x80B546D8; // type:func +EnHs2_Init = 0x80B54750; // type:func +EnHs2_Destroy = 0x80B54830; // type:func +func_80A6F0B4 = 0x80B5485C; // type:func +func_80A6F164 = 0x80B54910; // type:func +func_80A6F1A4 = 0x80B5494C; // type:func +EnHs2_Update = 0x80B54998; // type:func +EnHs2_OverrideLimbDraw = 0x80B54B04; // type:func +EnHs2_PostLimbDraw = 0x80B54B8C; // type:func +EnHs2_Draw = 0x80B54BCC; // type:func +DemoKekkai_CheckEventFlag = 0x80B54D30; // type:func +DemoKekkai_Init = 0x80B54D74; // type:func +DemoKekkai_Destroy = 0x80B54FA4; // type:func +DemoKekkai_SpawnParticles = 0x80B54FE4; // type:func +DemoKekkai_TowerBarrier = 0x80B55238; // type:func +DemoKekkai_Update = 0x80B55354; // type:func +DemoKekkai_TrialBarrierDispel = 0x80B55480; // type:func +DemoKekkai_TrialBarrierIdle = 0x80B555E0; // type:func +DemoKekkai_DrawTrialBarrier = 0x80B55704; // type:func +DemoKekkai_DrawTowerBarrier = 0x80B55C18; // type:func +func_808B02D0 = 0x80B56020; // type:func +func_808B0324 = 0x80B56074; // type:func +BgSpot08Bakudankabe_Init = 0x80B5636C; // type:func +BgSpot08Bakudankabe_Destroy = 0x80B5640C; // type:func +BgSpot08Bakudankabe_Update = 0x80B56454; // type:func +BgSpot08Bakudankabe_Draw = 0x80B56508; // type:func +func_808B6BC0 = 0x80B566C0; // type:func +BgSpot17Bakudankabe_Init = 0x80B569F0; // type:func +BgSpot17Bakudankabe_Destroy = 0x80B56A84; // type:func +BgSpot17Bakudankabe_Update = 0x80B56AB8; // type:func +BgSpot17Bakudankabe_Draw = 0x80B56B4C; // type:func +func_80B9A9D0 = 0x80B56DB0; // type:func +func_80B9AA90 = 0x80B56E70; // type:func +func_80B9ABA0 = 0x80B56F80; // type:func +func_80B9ACE4 = 0x80B570C4; // type:func +func_80B9ADCC = 0x80B571B0; // type:func +ObjMure3_Init = 0x80B572A4; // type:func +ObjMure3_Destroy = 0x80B57304; // type:func +func_80B9AF24 = 0x80B57314; // type:func +func_80B9AF34 = 0x80B57328; // type:func +func_80B9AF54 = 0x80B5734C; // type:func +func_80B9AF64 = 0x80B57360; // type:func +func_80B9AFEC = 0x80B573E8; // type:func +func_80B9AFFC = 0x80B573FC; // type:func +ObjMure3_Update = 0x80B57478; // type:func +EnTg_GetTextId = 0x80B57580; // type:func +EnTg_UpdateTalkState = 0x80B5761C; // type:func +EnTg_Init = 0x80B576D8; // type:func +EnTg_Destroy = 0x80B577AC; // type:func +EnTg_SpinIfNotTalking = 0x80B577EC; // type:func +EnTg_Update = 0x80B57810; // type:func +EnTg_OverrideLimbDraw = 0x80B57930; // type:func +EnTg_PostLimbDraw = 0x80B5794C; // type:func +EnTg_SetColor = 0x80B579A8; // type:func +EnTg_Draw = 0x80B57A14; // type:func +EnMu_SetupAction = 0x80B57C60; // type:func +EnMu_Interact = 0x80B57C6C; // type:func +EnMu_GetTextId = 0x80B57DCC; // type:func +EnMu_UpdateTalkState = 0x80B57E10; // type:func +EnMu_Init = 0x80B57E7C; // type:func +EnMu_Destroy = 0x80B57F54; // type:func +EnMu_Pose = 0x80B57F78; // type:func +EnMu_Update = 0x80B57FB0; // type:func +EnMu_OverrideLimbDraw = 0x80B580F8; // type:func +EnMu_PostLimbDraw = 0x80B581E4; // type:func +EnMu_DisplayListSetColor = 0x80B581FC; // type:func +EnMu_Draw = 0x80B58268; // type:func +EnGo2_SpawnEffectDust = 0x80B58580; // type:func +EnGo2_UpdateEffects = 0x80B58624; // type:func +EnGo2_DrawEffects = 0x80B58730; // type:func +EnGo2_SpawnDust = 0x80B58A28; // type:func +EnGo2_GetItem = 0x80B58C40; // type:func +EnGo2_GetDialogState = 0x80B58C84; // type:func +EnGo2_GoronFireGenericGetTextId = 0x80B58D04; // type:func +EnGo2_GetTextIdGoronCityRollingBig = 0x80B58D80; // type:func +EnGo2_UpdateTalkStateGoronCityRollingBig = 0x80B58E08; // type:func +EnGo2_GetTextIdGoronDmtBombFlower = 0x80B58F00; // type:func +EnGo2_UpdateTalkStateGoronDmtBombFlower = 0x80B58F3C; // type:func +EnGo2_GetTextIdGoronDmtRollingSmall = 0x80B59054; // type:func +EnGo2_UpdateTalkStateGoronDmtRollingSmall = 0x80B590AC; // type:func +EnGo2_GetTextIdGoronDmtDcEntrance = 0x80B590E8; // type:func +EnGo2_UpdateTalkStateGoronDmtDcEntrance = 0x80B59184; // type:func +EnGo2_GetTextIdGoronCityEntrance = 0x80B591E4; // type:func +EnGo2_UpdateTalkStateGoronCityEntrance = 0x80B59264; // type:func +EnGo2_GetTextIdGoronCityIsland = 0x80B592C4; // type:func +EnGo2_UpdateTalkStateGoronCityIsland = 0x80B59344; // type:func +EnGo2_GetTextIdGoronCityLowestFloor = 0x80B593A4; // type:func +EnGo2_UpdateTalkStateGoronCityLowestFloor = 0x80B59480; // type:func +EnGo2_GetTextIdGoronCityLink = 0x80B594E0; // type:func +EnGo2_UpdateTalkStateGoronCityLink = 0x80B595BC; // type:func +EnGo2_GetTextIdGoronDmtBiggoron = 0x80B597D4; // type:func +EnGo2_UpdateTalkStateGoronDmtBiggoron = 0x80B59854; // type:func +EnGo2_GetTextIdGoronFireGeneric = 0x80B59A68; // type:func +EnGo2_UpdateTalkStateGoronFireGeneric = 0x80B59AA0; // type:func +EnGo2_GetTextIdGoronCityStairwell = 0x80B59B3C; // type:func +EnGo2_UpdateTalkStateGoronCityStairwell = 0x80B59B8C; // type:func +EnGo2_GetTextIdGoronMarketBazaar = 0x80B59BEC; // type:func +EnGo2_UpdateTalkStateGoronMarketBazaar = 0x80B59C00; // type:func +EnGo2_GetTextIdGoronCityLostWoods = 0x80B59C3C; // type:func +EnGo2_UpdateTalkStateGoronCityLostWoods = 0x80B59CAC; // type:func +EnGo2_GetTextIdGoronDmtFairyHint = 0x80B59D0C; // type:func +EnGo2_UpdateTalkStateGoronDmtFairyHint = 0x80B59D64; // type:func +EnGo2_GetTextId = 0x80B59DA0; // type:func +EnGo2_UpdateTalkState = 0x80B59EE4; // type:func +func_80A44790 = 0x80B59FFC; // type:func +EnGo2_SetColliderDim = 0x80B5A0F8; // type:func +EnGo2_SetShape = 0x80B5A134; // type:func +EnGo2_CheckCollision = 0x80B5A1AC; // type:func +EnGo2_SwapInitialFrameAnimFrameCount = 0x80B5A308; // type:func +func_80A44AB0 = 0x80B5A320; // type:func +EnGo2_UpdateWaypoint = 0x80B5A4DC; // type:func +EnGo2_Orient = 0x80B5A558; // type:func +func_80A44D84 = 0x80B5A5FC; // type:func +EnGo2_IsWakingUp = 0x80B5A634; // type:func +EnGo2_IsRollingOnGround = 0x80B5A764; // type:func +EnGo2_BiggoronSetTextId = 0x80B5A900; // type:func +func_80A45288 = 0x80B5AB00; // type:func +func_80A45360 = 0x80B5ABDC; // type:func +EnGo2_RollForward = 0x80B5ACE8; // type:func +func_80A454CC = 0x80B5AD48; // type:func +EnGo2_GetTargetXZSpeed = 0x80B5ADF4; // type:func +EnGo2_IsCameraModified = 0x80B5AE98; // type:func +EnGo2_DefaultWakingUp = 0x80B5AFB4; // type:func +EnGo2_WakingUp = 0x80B5B00C; // type:func +EnGo2_BiggoronWakingUp = 0x80B5B07C; // type:func +EnGo2_SelectGoronWakingUp = 0x80B5B0CC; // type:func +EnGo2_EyeMouthTexState = 0x80B5B1B0; // type:func +EnGo2_SitDownAnimation = 0x80B5B284; // type:func +EnGo2_GetDustData = 0x80B5B39C; // type:func +EnGo2_RollingAnimation = 0x80B5B424; // type:func +EnGo2_WakeUp = 0x80B5B4D8; // type:func +EnGo2_GetItemAnimation = 0x80B5B5CC; // type:func +EnGo2_SetupRolling = 0x80B5B630; // type:func +EnGo2_StopRolling = 0x80B5B6D8; // type:func +EnGo2_IsFreeingGoronInFire = 0x80B5B798; // type:func +EnGo2_IsGoronDmtBombFlower = 0x80B5B830; // type:func +EnGo2_IsGoronRollingBig = 0x80B5B8B0; // type:func +EnGo2_IsGoronFireGeneric = 0x80B5B910; // type:func +EnGo2_IsGoronLinkReversing = 0x80B5B94C; // type:func +EnGo2_IsRolling = 0x80B5B9A8; // type:func +EnGo2_GoronLinkAnimation = 0x80B5BA3C; // type:func +EnGo2_GoronFireCamera = 0x80B5BB70; // type:func +EnGo2_GoronFireClearCamera = 0x80B5BC70; // type:func +EnGo2_BiggoronAnimation = 0x80B5BCB0; // type:func +EnGo2_Init = 0x80B5BD64; // type:func +EnGo2_Destroy = 0x80B5C1F8; // type:func +EnGo2_CurledUp = 0x80B5C208; // type:func +func_80A46B40 = 0x80B5C3DC; // type:func +EnGo2_GoronDmtBombFlowerAnimation = 0x80B5C574; // type:func +EnGo2_GoronRollingBigContinueRolling = 0x80B5C5F8; // type:func +EnGo2_ContinueRolling = 0x80B5C658; // type:func +EnGo2_SlowRolling = 0x80B5C6F0; // type:func +EnGo2_GroundRolling = 0x80B5C828; // type:func +EnGo2_ReverseRolling = 0x80B5C8C4; // type:func +EnGo2_SetupGetItem = 0x80B5C98C; // type:func +EnGo2_SetGetItem = 0x80B5CA00; // type:func +EnGo2_BiggoronEyedrops = 0x80B5CB08; // type:func +EnGo2_GoronLinkStopRolling = 0x80B5CD3C; // type:func +EnGo2_GoronFireGenericAction = 0x80B5CE2C; // type:func +EnGo2_Update = 0x80B5D158; // type:func +EnGo2_DrawCurledUp = 0x80B5D26C; // type:func +EnGo2_DrawRolling = 0x80B5D330; // type:func +EnGo2_OverrideLimbDraw = 0x80B5D46C; // type:func +EnGo2_PostLimbDraw = 0x80B5D688; // type:func +EnGo2_Draw = 0x80B5D6E4; // type:func +EnWf_SetupAction = 0x80B5E5C0; // type:func +EnWf_Init = 0x80B5E5CC; // type:func +EnWf_Destroy = 0x80B5E800; // type:func +EnWf_ChangeAction = 0x80B5E89C; // type:func +EnWf_SetupWaitToAppear = 0x80B5EC6C; // type:func +EnWf_WaitToAppear = 0x80B5ED14; // type:func +EnWf_SetupWait = 0x80B5EE48; // type:func +EnWf_Wait = 0x80B5EED0; // type:func +EnWf_SetupRunAtPlayer = 0x80B5F0EC; // type:func +EnWf_RunAtPlayer = 0x80B5F16C; // type:func +EnWf_SetupSearchForPlayer = 0x80B5F5EC; // type:func +EnWf_SearchForPlayer = 0x80B5F638; // type:func +EnWf_SetupRunAroundPlayer = 0x80B5F818; // type:func +EnWf_RunAroundPlayer = 0x80B5F914; // type:func +EnWf_SetupSlash = 0x80B5FE34; // type:func +EnWf_Slash = 0x80B5FEB0; // type:func +EnWf_SetupRecoilFromBlockedSlash = 0x80B60204; // type:func +EnWf_RecoilFromBlockedSlash = 0x80B602A0; // type:func +EnWf_SetupBackflipAway = 0x80B60498; // type:func +EnWf_BackflipAway = 0x80B60514; // type:func +EnWf_SetupStunned = 0x80B6061C; // type:func +EnWf_Stunned = 0x80B60694; // type:func +EnWf_SetupDamaged = 0x80B60750; // type:func +EnWf_Damaged = 0x80B607E8; // type:func +EnWf_SetupSomersaultAndAttack = 0x80B609F0; // type:func +EnWf_SomersaultAndAttack = 0x80B60AA8; // type:func +EnWf_SetupBlocking = 0x80B60B90; // type:func +EnWf_Blocking = 0x80B60C30; // type:func +EnWf_SetupSidestep = 0x80B60EB4; // type:func +EnWf_Sidestep = 0x80B6104C; // type:func +EnWf_SetupDie = 0x80B6159C; // type:func +EnWf_Die = 0x80B6164C; // type:func +func_80B36F40 = 0x80B61854; // type:func +EnWf_UpdateDamage = 0x80B6194C; // type:func +EnWf_Update = 0x80B61B1C; // type:func +EnWf_OverrideLimbDraw = 0x80B61D70; // type:func +EnWf_PostLimbDraw = 0x80B61DB4; // type:func +EnWf_Draw = 0x80B61F5C; // type:func +EnWf_DodgeRanged = 0x80B62118; // type:func +EnSkb_SetupAction = 0x80B628D0; // type:func +EnSkb_SpawnDebris = 0x80B628DC; // type:func +EnSkb_Init = 0x80B62A8C; // type:func +EnSkb_Destroy = 0x80B62C44; // type:func +EnSkb_DecideNextAction = 0x80B62C9C; // type:func +EnSkb_SetupRiseFromGround = 0x80B62D38; // type:func +EnSkb_RiseFromGround = 0x80B62D9C; // type:func +EnSkb_SetupDespawn = 0x80B62E88; // type:func +EnSkb_Despawn = 0x80B62F30; // type:func +EnSkb_SetupWalkForward = 0x80B62FE4; // type:func +EnSkb_WalkForward = 0x80B6307C; // type:func +EnSkb_SetupAttack = 0x80B6327C; // type:func +EnSkb_Attack = 0x80B63314; // type:func +EnSkb_SetupRecoil = 0x80B633C0; // type:func +EnSkb_Recoil = 0x80B6344C; // type:func +EnSkb_SetupStunned = 0x80B63488; // type:func +EnSkb_Stunned = 0x80B634E4; // type:func +EnSkb_SetupTakeDamage = 0x80B6358C; // type:func +EnSkb_TakeDamage = 0x80B63614; // type:func +EnSkb_SetupDeath = 0x80B63700; // type:func +EnSkb_Death = 0x80B637CC; // type:func +EnSkb_CheckDamage = 0x80B638B8; // type:func +EnSkb_Update = 0x80B63B68; // type:func +EnSkb_OverrideLimbDraw = 0x80B63C90; // type:func +EnSkb_PostLimbDraw = 0x80B63E60; // type:func +EnSkb_Draw = 0x80B63F08; // type:func +DemoGj_GetCollectibleType = 0x80B641C0; // type:func +DemoGj_GetCollectibleAmount = 0x80B641D4; // type:func +DemoGj_GetType = 0x80B641E8; // type:func +DemoGj_InitCylinder = 0x80B641F8; // type:func +DemoGj_HitByExplosion = 0x80B64240; // type:func +DemoGj_DestroyCylinder = 0x80B64278; // type:func +DemoGj_Destroy = 0x80B64330; // type:func +DemoGj_PlayExplosionSfx = 0x80B64374; // type:func +DemoGj_SpawnSmoke = 0x80B643AC; // type:func +DemoGj_DropCollectible = 0x80B64440; // type:func +DemoGj_Explode = 0x80B644D4; // type:func +DemoGj_IsCutsceneLayer = 0x80B64770; // type:func +DemoGj_FindGanon = 0x80B64798; // type:func +DemoGj_InitCommon = 0x80B647E4; // type:func +DemoGj_InitSetIndices = 0x80B6485C; // type:func +DemoGj_DrawCommon = 0x80B648C0; // type:func +DemoGj_DrawRotated = 0x80B6495C; // type:func +DemoGj_SetupRotation = 0x80B64A38; // type:func +func_809797E4 = 0x80B64FD0; // type:func +DemoGj_IsGanondorfRisingFromRubble = 0x80B65004; // type:func +DemoGj_IsGanondorfFloatingInAir = 0x80B65028; // type:func +DemoGj_SetupMovement = 0x80B6504C; // type:func +DemoGj_CheckIfTransformedIntoGanon = 0x80B65770; // type:func +DemoGj_InitRubblePile1 = 0x80B657A8; // type:func +func_8097A000 = 0x80B657D8; // type:func +DemoGj_SpawnSmokePreBattle1 = 0x80B65854; // type:func +func_8097A0E4 = 0x80B658C0; // type:func +func_8097A130 = 0x80B65914; // type:func +DemoGj_Update01 = 0x80B65948; // type:func +DemoGj_Update08 = 0x80B65980; // type:func +DemoGj_DrawRubble2 = 0x80B659B8; // type:func +DemoGj_DrawRotatedRubble2 = 0x80B659DC; // type:func +DemoGj_InitRubblePile2 = 0x80B65A00; // type:func +func_8097A238 = 0x80B65A30; // type:func +DemoGj_SpawnSmokePreBattle2 = 0x80B65AAC; // type:func +func_8097A320 = 0x80B65B1C; // type:func +func_8097A36C = 0x80B65B70; // type:func +DemoGj_Update02 = 0x80B65BA4; // type:func +DemoGj_Update09 = 0x80B65BDC; // type:func +DemoGj_DrawRubble3 = 0x80B65C14; // type:func +DemoGj_DrawRotatedRubble3 = 0x80B65C38; // type:func +DemoGj_InitRubblePile3 = 0x80B65C5C; // type:func +func_8097A474 = 0x80B65C8C; // type:func +func_8097A4F0 = 0x80B65D08; // type:func +func_8097A53C = 0x80B65D5C; // type:func +DemoGj_Update03 = 0x80B65D90; // type:func +DemoGj_Update10 = 0x80B65DC8; // type:func +DemoGj_DrawRubble4 = 0x80B65E00; // type:func +DemoGj_DrawRotatedRubble4 = 0x80B65E24; // type:func +DemoGj_InitRubblePile4 = 0x80B65E48; // type:func +func_8097A644 = 0x80B65E78; // type:func +func_8097A6C0 = 0x80B65EF4; // type:func +func_8097A70C = 0x80B65F48; // type:func +DemoGj_Update04 = 0x80B65F7C; // type:func +DemoGj_Update11 = 0x80B65FB4; // type:func +DemoGj_DrawRubble5 = 0x80B65FEC; // type:func +DemoGj_DrawRotatedRubble5 = 0x80B66010; // type:func +DemoGj_InitRubblePile5 = 0x80B66034; // type:func +func_8097A814 = 0x80B66064; // type:func +func_8097A890 = 0x80B660E0; // type:func +func_8097A8DC = 0x80B66134; // type:func +DemoGj_Update05 = 0x80B66168; // type:func +DemoGj_Update12 = 0x80B661A0; // type:func +DemoGj_DrawRubble6 = 0x80B661D8; // type:func +DemoGj_DrawRotatedRubble6 = 0x80B661FC; // type:func +DemoGj_InitRubblePile6 = 0x80B66220; // type:func +func_8097A9E4 = 0x80B66250; // type:func +func_8097AA60 = 0x80B662CC; // type:func +func_8097AAAC = 0x80B66320; // type:func +DemoGj_Update06 = 0x80B66354; // type:func +DemoGj_Update13 = 0x80B6638C; // type:func +DemoGj_DrawRubble7 = 0x80B663C4; // type:func +DemoGj_DrawRotatedRubble7 = 0x80B663E8; // type:func +DemoGj_InitRubblePile7 = 0x80B6640C; // type:func +func_8097ABB4 = 0x80B6643C; // type:func +DemoGj_SpawnSmokePreBattle3 = 0x80B664B8; // type:func +func_8097AC9C = 0x80B66528; // type:func +func_8097ACE8 = 0x80B6657C; // type:func +DemoGj_Update07 = 0x80B665B0; // type:func +DemoGj_Update14 = 0x80B665E8; // type:func +DemoGj_DrawRubbleTall = 0x80B66620; // type:func +DemoGj_DrawRotatedRubbleTall = 0x80B66644; // type:func +DemoGj_InitRubbleAroundArena = 0x80B66668; // type:func +DemoGj_UpdateRubbleAroundArena = 0x80B66698; // type:func +DemoGj_DrawRubbleAroundArena = 0x80B666E8; // type:func +DemoGj_InitDestructableRubble1 = 0x80B6670C; // type:func +func_8097AEE8 = 0x80B66794; // type:func +DemoGj_SetCylindersAsAC = 0x80B66928; // type:func +DemoGj_DirectedExplosion = 0x80B66994; // type:func +func_8097B128 = 0x80B669D0; // type:func +DemoGj_HasCylinderAnyExploded = 0x80B66A60; // type:func +func_8097B22C = 0x80B66ADC; // type:func +DemoGj_Update15 = 0x80B66BF4; // type:func +DemoGj_Update18 = 0x80B66C2C; // type:func +DemoGj_DrawDestructableRubble1 = 0x80B66C4C; // type:func +DemoGj_InitDestructableRubble2 = 0x80B66C70; // type:func +func_8097B450 = 0x80B66CF8; // type:func +DemoGj_SetCylindersAsAC2 = 0x80B66E48; // type:func +DemoGj_HasCylinderAnyExploded2 = 0x80B66EB4; // type:func +DemoGj_DirectedExplosion2 = 0x80B66F30; // type:func +func_8097B6C4 = 0x80B66F6C; // type:func +func_8097B750 = 0x80B66FFC; // type:func +DemoGj_Update16 = 0x80B67114; // type:func +DemoGj_Update19 = 0x80B6714C; // type:func +DemoGj_DemoGj_InitDestructableRubble2 = 0x80B6716C; // type:func +DemoGj_InitDestructableRubbleTall = 0x80B67190; // type:func +DemoGj_DirectedDoubleExplosion = 0x80B671DC; // type:func +func_8097B9BC = 0x80B67260; // type:func +func_8097BA48 = 0x80B672F0; // type:func +DemoGj_Update17 = 0x80B67424; // type:func +DemoGj_Update20 = 0x80B6745C; // type:func +DemoGj_DemoGj_InitDestructableRubbleTall = 0x80B6747C; // type:func +DemoGj_Update = 0x80B674A0; // type:func +DemoGj_Init = 0x80B674E8; // type:func +DemoGj_DrawNothing = 0x80B675F0; // type:func +DemoGj_Draw = 0x80B67600; // type:func +DemoGeff_Destroy = 0x80B67E70; // type:func +DemoGeff_Init = 0x80B67E80; // type:func +func_80977EA8 = 0x80B67EC8; // type:func +func_80977F80 = 0x80B67F64; // type:func +func_80978030 = 0x80B67FC0; // type:func +func_809781FC = 0x80B6818C; // type:func +func_809782A0 = 0x80B68230; // type:func +func_80978308 = 0x80B68298; // type:func +func_80978344 = 0x80B682D0; // type:func +func_80978370 = 0x80B68300; // type:func +func_809783D4 = 0x80B6834C; // type:func +DemoGeff_Update = 0x80B683E8; // type:func +func_809784D4 = 0x80B68430; // type:func +DemoGeff_Draw = 0x80B68440; // type:func +BgGndFiremeiro_Init = 0x80B68690; // type:func +BgGndFiremeiro_Destroy = 0x80B68744; // type:func +BgGndFiremeiro_Sink = 0x80B68784; // type:func +BgGndFiremeiro_Shake = 0x80B68840; // type:func +BgGndFiremeiro_Rise = 0x80B689E4; // type:func +BgGndFiremeiro_Update = 0x80B68AA4; // type:func +BgGndFiremeiro_Draw = 0x80B68AC8; // type:func +BgGndDarkmeiro_ToggleBlock = 0x80B68BE0; // type:func +BgGndDarkmeiro_Init = 0x80B68C6C; // type:func +BgGndDarkmeiro_Destroy = 0x80B68E98; // type:func +BgGndDarkmeiro_Noop = 0x80B68EE0; // type:func +BgGndDarkmeiro_UpdateBlockTimer = 0x80B68EF0; // type:func +BgGndDarkmeiro_UpdateStaticBlock = 0x80B690E4; // type:func +BgGndDarkmeiro_UpdateSwitchBlock = 0x80B690F4; // type:func +BgGndDarkmeiro_Update = 0x80B69158; // type:func +BgGndDarkmeiro_DrawInvisiblePath = 0x80B6917C; // type:func +BgGndDarkmeiro_DrawSwitchBlock = 0x80B691AC; // type:func +BgGndDarkmeiro_DrawStaticBlock = 0x80B692C4; // type:func +BgGndSoulmeiro_Init = 0x80B693A0; // type:func +BgGndSoulmeiro_Destroy = 0x80B694E4; // type:func +func_8087AF38 = 0x80B69520; // type:func +func_8087B284 = 0x80B6986C; // type:func +func_8087B350 = 0x80B69938; // type:func +BgGndSoulmeiro_Update = 0x80B6998C; // type:func +BgGndSoulmeiro_Draw = 0x80B699B8; // type:func +BgGndNisekabe_Init = 0x80B69C00; // type:func +BgGndNisekabe_Destroy = 0x80B69C3C; // type:func +BgGndNisekabe_Update = 0x80B69C4C; // type:func +BgGndNisekabe_Draw = 0x80B69C80; // type:func +BgGndIceblock_Init = 0x80B69D70; // type:func +BgGndIceblock_Destroy = 0x80B69E5C; // type:func +BgGndIceblock_SetPosition = 0x80B69E90; // type:func +BgGndIceblock_CheckForBlock = 0x80B69F9C; // type:func +BgGndIceblock_NextAction = 0x80B69FD8; // type:func +BgGndIceblock_SetNextPosition = 0x80B6A024; // type:func +BgGndIceblock_Idle = 0x80B6A354; // type:func +BgGndIceblock_Reset = 0x80B6A410; // type:func +BgGndIceblock_Fall = 0x80B6A4D4; // type:func +BgGndIceblock_Hole = 0x80B6A58C; // type:func +BgGndIceblock_Slide = 0x80B6A628; // type:func +BgGndIceblock_Update = 0x80B6A958; // type:func +BgGndIceblock_Draw = 0x80B6A97C; // type:func +BgYdanSp_Init = 0x80B6AE70; // type:func +BgYdanSp_Destroy = 0x80B6B258; // type:func +BgYdanSp_UpdateFloorWebCollision = 0x80B6B2A0; // type:func +BgYdanSp_BurnWeb = 0x80B6B374; // type:func +BgYdanSp_BurnFloorWeb = 0x80B6B3E4; // type:func +BgYdanSp_FloorWebBroken = 0x80B6B6B8; // type:func +BgYdanSp_FloorWebBreaking = 0x80B6B6F8; // type:func +BgYdanSp_FloorWebIdle = 0x80B6B8B8; // type:func +BgYdanSp_BurnWallWeb = 0x80B6BB94; // type:func +BgYdanSp_WallWebIdle = 0x80B6BECC; // type:func +BgYdanSp_Update = 0x80B6C00C; // type:func +BgYdanSp_Draw = 0x80B6C030; // type:func +func_80A2F180 = 0x80B6C590; // type:func +EnGb_Init = 0x80B6C5C0; // type:func +EnGb_Destroy = 0x80B6C9C0; // type:func +func_80A2F608 = 0x80B6CA1C; // type:func +func_80A2F760 = 0x80B6CB74; // type:func +func_80A2F7C0 = 0x80B6CBD4; // type:func +func_80A2F83C = 0x80B6CC50; // type:func +func_80A2F94C = 0x80B6CD6C; // type:func +func_80A2F9C0 = 0x80B6CDE4; // type:func +func_80A2FA50 = 0x80B6CE78; // type:func +func_80A2FB40 = 0x80B6CF68; // type:func +func_80A2FBB0 = 0x80B6CFDC; // type:func +func_80A2FC0C = 0x80B6D03C; // type:func +func_80A2FC70 = 0x80B6D0A4; // type:func +EnGb_Update = 0x80B6D1A8; // type:func +EnGb_Draw = 0x80B6D2E0; // type:func +EnGb_UpdateCagedSouls = 0x80B6D400; // type:func +EnGb_DrawCagedSouls = 0x80B6D758; // type:func +EnGs_Init = 0x80B6DCC0; // type:func +EnGs_Destroy = 0x80B6DD84; // type:func +func_80A4E3EC = 0x80B6DD94; // type:func +func_80A4E470 = 0x80B6DE1C; // type:func +func_80A4E648 = 0x80B6DFDC; // type:func +func_80A4E754 = 0x80B6E0EC; // type:func +func_80A4E910 = 0x80B6E2AC; // type:func +func_80A4EA08 = 0x80B6E3A8; // type:func +func_80A4EB3C = 0x80B6E4DC; // type:func +func_80A4ED34 = 0x80B6E6D4; // type:func +func_80A4F13C = 0x80B6EAE0; // type:func +func_80A4F700 = 0x80B6F0A4; // type:func +func_80A4F734 = 0x80B6F0D8; // type:func +func_80A4F77C = 0x80B6F120; // type:func +EnGs_Update = 0x80B6F19C; // type:func +EnGs_Draw = 0x80B6F334; // type:func +BgMizuBwall_RotateVec3f = 0x80B6FB30; // type:func +BgMizuBwall_Init = 0x80B6FB84; // type:func +BgMizuBwall_Destroy = 0x80B70400; // type:func +BgMizuBwall_SetAlpha = 0x80B70448; // type:func +BgMizuBwall_SpawnDebris = 0x80B705CC; // type:func +BgMizuBwall_Idle = 0x80B708A0; // type:func +BgMizuBwall_Break = 0x80B709A0; // type:func +BgMizuBwall_DoNothing = 0x80B709CC; // type:func +BgMizuBwall_Update = 0x80B709DC; // type:func +BgMizuBwall_Draw = 0x80B70A00; // type:func +BgMizuShutter_Init = 0x80B71000; // type:func +BgMizuShutter_Destroy = 0x80B71260; // type:func +BgMizuShutter_WaitForSwitch = 0x80B71294; // type:func +BgMizuShutter_WaitForCutscene = 0x80B71328; // type:func +BgMizuShutter_Move = 0x80B71374; // type:func +BgMizuShutter_WaitForTimer = 0x80B71560; // type:func +BgMizuShutter_Update = 0x80B715E0; // type:func +BgMizuShutter_Draw = 0x80B71604; // type:func +EnDaikuKakariko_ChangeAnim = 0x80B71800; // type:func +EnDaikuKakariko_Init = 0x80B718B4; // type:func +EnDaikuKakariko_Destroy = 0x80B71C0C; // type:func +EnDaikuKakariko_GetTalkState = 0x80B71C38; // type:func +EnDaikuKakariko_HandleTalking = 0x80B71CDC; // type:func +EnDaikuKakariko_Talk = 0x80B71E98; // type:func +EnDaikuKakariko_Wait = 0x80B71F6C; // type:func +EnDaikuKakariko_StopRunning = 0x80B72008; // type:func +EnDaikuKakariko_Run = 0x80B720B8; // type:func +EnDaikuKakariko_Update = 0x80B72438; // type:func +EnDaikuKakariko_OverrideLimbDraw = 0x80B725B0; // type:func +EnDaikuKakariko_PostLimbDraw = 0x80B72770; // type:func +EnDaikuKakariko_Draw = 0x80B727EC; // type:func +BgBowlWall_Init = 0x80B72BC0; // type:func +BgBowlWall_Destroy = 0x80B72C78; // type:func +BgBowlWall_SpawnBullseyes = 0x80B72CAC; // type:func +BgBowlWall_WaitForHit = 0x80B72E7C; // type:func +BgBowlWall_FallDoEffects = 0x80B72EA0; // type:func +BgBowlWall_FinishFall = 0x80B73154; // type:func +BgBowlWall_Reset = 0x80B73234; // type:func +BgBowlWall_Update = 0x80B732CC; // type:func +BgBowlWall_Draw = 0x80B73300; // type:func +EnWallTubo_Init = 0x80B73540; // type:func +EnWallTubo_Destroy = 0x80B73570; // type:func +EnWallTubo_FindGirl = 0x80B73580; // type:func +EnWallTubo_DetectChu = 0x80B735C4; // type:func +EnWallTubo_SetWallFall = 0x80B737E0; // type:func +EnWallTubo_Update = 0x80B7394C; // type:func +EnPoDesert_Init = 0x80B73A30; // type:func +EnPoDesert_Destroy = 0x80B73BA0; // type:func +EnPoDesert_SetNextPathPoint = 0x80B73BE8; // type:func +EnPoDesert_SetupMoveToNextPoint = 0x80B73D44; // type:func +EnPoDesert_SetupDisappear = 0x80B73D88; // type:func +EnPoDesert_UpdateSpeedModifier = 0x80B73DE8; // type:func +EnPoDesert_WaitForPlayer = 0x80B73E58; // type:func +EnPoDesert_MoveToNextPoint = 0x80B73F24; // type:func +EnPoDesert_Disappear = 0x80B740B8; // type:func +EnPoDesert_Update = 0x80B741A0; // type:func +EnPoDesert_OverrideLimbDraw = 0x80B74294; // type:func +EnPoDesert_PostLimbDraw = 0x80B74320; // type:func +EnPoDesert_Draw = 0x80B74574; // type:func +EnCrow_Init = 0x80B747F0; // type:func +EnCrow_Destroy = 0x80B748E0; // type:func +EnCrow_SetupFlyIdle = 0x80B7490C; // type:func +EnCrow_SetupDiveAttack = 0x80B74940; // type:func +EnCrow_SetupDamaged = 0x80B74974; // type:func +EnCrow_SetupDie = 0x80B74C94; // type:func +EnCrow_SetupTurnAway = 0x80B74CAC; // type:func +EnCrow_SetupRespawn = 0x80B74D34; // type:func +EnCrow_FlyIdle = 0x80B74E28; // type:func +EnCrow_DiveAttack = 0x80B75254; // type:func +EnCrow_Damaged = 0x80B753F8; // type:func +EnCrow_Die = 0x80B75520; // type:func +EnCrow_TurnAway = 0x80B755D0; // type:func +EnCrow_Respawn = 0x80B75674; // type:func +EnCrow_UpdateDamage = 0x80B75740; // type:func +EnCrow_Update = 0x80B757F0; // type:func +EnCrow_OverrideLimbDraw = 0x80B75A0C; // type:func +EnCrow_PostLimbDraw = 0x80B75AF8; // type:func +EnCrow_Draw = 0x80B75BB8; // type:func +DoorKiller_Init = 0x80B75E90; // type:func +DoorKiller_Destroy = 0x80B761E8; // type:func +DoorKiller_SpawnRubble = 0x80B76238; // type:func +DoorKiller_FallAsRubble = 0x80B763E0; // type:func +DoorKiller_IsHit = 0x80B764A0; // type:func +DoorKiller_SetAC = 0x80B764D4; // type:func +DoorKiller_Die = 0x80B76534; // type:func +DoorKiller_RiseBackUp = 0x80B76584; // type:func +DoorKiller_FallOver = 0x80B76734; // type:func +DoorKiller_Wobble = 0x80B76B00; // type:func +DoorKiller_WaitBeforeWobble = 0x80B76C70; // type:func +DoorKiller_Wait = 0x80B76CA4; // type:func +DoorKiller_UpdateTexture = 0x80B76F04; // type:func +DoorKiller_WaitForObject = 0x80B76F98; // type:func +DoorKiller_Update = 0x80B7704C; // type:func +DoorKiller_SetTexture = 0x80B77070; // type:func +DoorKiller_DrawDoor = 0x80B7709C; // type:func +DoorKiller_DrawRubble = 0x80B770F8; // type:func +func_808B27F0 = 0x80B77400; // type:func +func_808B280C = 0x80B77420; // type:func +BgSpot11Oasis_Init = 0x80B77534; // type:func +func_808B2970 = 0x80B77588; // type:func +func_808B2980 = 0x80B7759C; // type:func +func_808B29E0 = 0x80B775FC; // type:func +func_808B29F0 = 0x80B77610; // type:func +func_808B2AA8 = 0x80B776C8; // type:func +func_808B2AB8 = 0x80B776DC; // type:func +BgSpot11Oasis_Update = 0x80B776EC; // type:func +BgSpot11Oasis_Draw = 0x80B778E0; // type:func +BgSpot18Futa_Init = 0x80B77B30; // type:func +BgSpot18Futa_Destroy = 0x80B77B9C; // type:func +BgSpot18Futa_Update = 0x80B77BD0; // type:func +BgSpot18Futa_Draw = 0x80B77C34; // type:func +BgSpot18Shutter_Init = 0x80B77CD0; // type:func +BgSpot18Shutter_Destroy = 0x80B77E80; // type:func +func_808B95AC = 0x80B77EB4; // type:func +func_808B95B8 = 0x80B77EC4; // type:func +func_808B9618 = 0x80B77F24; // type:func +func_808B9698 = 0x80B77FAC; // type:func +func_808B971C = 0x80B78030; // type:func +BgSpot18Shutter_Update = 0x80B7810C; // type:func +BgSpot18Shutter_Draw = 0x80B78130; // type:func +EnMa3_GetTextId = 0x80B78220; // type:func +EnMa3_UpdateTalkState = 0x80B78358; // type:func +func_80AA2E54 = 0x80B785D8; // type:func +func_80AA2EC8 = 0x80B7864C; // type:func +func_80AA2F28 = 0x80B786B0; // type:func +EnMa3_UpdateEyes = 0x80B78708; // type:func +EnMa3_ChangeAnim = 0x80B78794; // type:func +EnMa3_Init = 0x80B78804; // type:func +EnMa3_Destroy = 0x80B78958; // type:func +func_80AA3200 = 0x80B78998; // type:func +EnMa3_Update = 0x80B789CC; // type:func +EnMa3_OverrideLimbDraw = 0x80B78AE0; // type:func +EnMa3_PostLimbDraw = 0x80B78D20; // type:func +EnMa3_Draw = 0x80B78DD4; // type:func +EnCow_RotateY = 0x80B791D0; // type:func +EnCow_SetColliderPos = 0x80B79268; // type:func +EnCow_SetTailPos = 0x80B7935C; // type:func +EnCow_Init = 0x80B793D8; // type:func +EnCow_Destroy = 0x80B79810; // type:func +EnCow_UpdateAnimation = 0x80B7985C; // type:func +EnCow_TalkEnd = 0x80B79A84; // type:func +EnCow_GiveMilkEnd = 0x80B79AFC; // type:func +EnCow_GiveMilkWait = 0x80B79B44; // type:func +EnCow_GiveMilk = 0x80B79BA8; // type:func +EnCow_CheckForEmptyBottle = 0x80B79C44; // type:func +EnCow_Talk = 0x80B79CD4; // type:func +EnCow_Idle = 0x80B79D48; // type:func +EnCow_IdleTail = 0x80B79E64; // type:func +EnCow_Update = 0x80B79FFC; // type:func +EnCow_UpdateTail = 0x80B7A278; // type:func +EnCow_OverrideLimbDraw = 0x80B7A364; // type:func +EnCow_PostLimbDraw = 0x80B7A3B4; // type:func +EnCow_Draw = 0x80B7A3F4; // type:func +EnCow_DrawTail = 0x80B7A454; // type:func +BgIceTurara_Init = 0x80B7A630; // type:func +BgIceTurara_Destroy = 0x80B7A70C; // type:func +BgIceTurara_Break = 0x80B7A754; // type:func +BgIceTurara_Stalagmite = 0x80B7A934; // type:func +BgIceTurara_Wait = 0x80B7A99C; // type:func +BgIceTurara_Shiver = 0x80B7A9D4; // type:func +BgIceTurara_Fall = 0x80B7AB40; // type:func +BgIceTurara_Regrow = 0x80B7AC98; // type:func +BgIceTurara_Update = 0x80B7ACE8; // type:func +BgIceTurara_Draw = 0x80B7AD0C; // type:func +func_80891AC0 = 0x80B7AE60; // type:func +BgIceShutter_Init = 0x80B7AEE8; // type:func +BgIceShutter_Destroy = 0x80B7B068; // type:func +func_80891CF4 = 0x80B7B09C; // type:func +func_80891D6C = 0x80B7B114; // type:func +func_80891DD4 = 0x80B7B17C; // type:func +BgIceShutter_Update = 0x80B7B1E4; // type:func +BgIceShutter_Draw = 0x80B7B208; // type:func +EnKakasi2_Init = 0x80B7B2D0; // type:func +EnKakasi2_Destroy = 0x80B7B42C; // type:func +func_80A90264 = 0x80B7B458; // type:func +func_80A904D8 = 0x80B7B5B0; // type:func +func_80A90578 = 0x80B7B650; // type:func +func_80A9062C = 0x80B7B704; // type:func +func_80A906C4 = 0x80B7B79C; // type:func +EnKakasi2_Update = 0x80B7B80C; // type:func +func_80A90948 = 0x80B7B8CC; // type:func +EnKakasi3_Destroy = 0x80B7B9F0; // type:func +EnKakasi3_Init = 0x80B7BA1C; // type:func +func_80A90E28 = 0x80B7BAE4; // type:func +func_80A90EBC = 0x80B7BB78; // type:func +func_80A911F0 = 0x80B7BEAC; // type:func +func_80A91284 = 0x80B7BF40; // type:func +func_80A91348 = 0x80B7C004; // type:func +func_80A915B8 = 0x80B7C27C; // type:func +func_80A91620 = 0x80B7C2E8; // type:func +func_80A91760 = 0x80B7C428; // type:func +func_80A917FC = 0x80B7C4C8; // type:func +func_80A9187C = 0x80B7C550; // type:func +func_80A918E4 = 0x80B7C5BC; // type:func +func_80A91A90 = 0x80B7C700; // type:func +EnKakasi3_Update = 0x80B7C800; // type:func +EnKakasi3_Draw = 0x80B7C8F8; // type:func +OceffWipe4_Init = 0x80B7CAD0; // type:func +OceffWipe4_Destroy = 0x80B7CB2C; // type:func +OceffWipe4_Update = 0x80B7CB50; // type:func +OceffWipe4_Draw = 0x80B7CBB0; // type:func +EnEg_PlayVoidOutSFX = 0x80B7DAB0; // type:func +EnEg_Destroy = 0x80B7DAD0; // type:func +EnEg_Init = 0x80B7DAE0; // type:func +func_809FFDC8 = 0x80B7DAF0; // type:func +EnEg_Update = 0x80B7DB88; // type:func +EnEg_Draw = 0x80B7DBD0; // type:func +BgMenkuriNisekabe_Init = 0x80B7DC60; // type:func +BgMenkuriNisekabe_Destroy = 0x80B7DC88; // type:func +BgMenkuriNisekabe_Update = 0x80B7DC98; // type:func +BgMenkuriNisekabe_Draw = 0x80B7DCCC; // type:func +EnZo_SpawnRipple = 0x80B7DDB0; // type:func +EnZo_SpawnBubble = 0x80B7DE44; // type:func +EnZo_SpawnSplash = 0x80B7DF74; // type:func +EnZo_UpdateEffectsRipples = 0x80B7E0E0; // type:func +EnZo_UpdateEffectsBubbles = 0x80B7E19C; // type:func +EnZo_UpdateEffectsSplashes = 0x80B7E2CC; // type:func +EnZo_DrawEffectsRipples = 0x80B7E404; // type:func +EnZo_DrawEffectsBubbles = 0x80B7E5B4; // type:func +EnZo_DrawEffectsSplashes = 0x80B7E760; // type:func +EnZo_TreadWaterRipples = 0x80B7E918; // type:func +EnZo_SpawnSplashes = 0x80B7E994; // type:func +EnZo_GetTextId = 0x80B7EB08; // type:func +EnZo_UpdateTalkState = 0x80B7ED7C; // type:func +EnZo_Blink = 0x80B7EEE0; // type:func +EnZo_Dialog = 0x80B7EF58; // type:func +EnZo_PlayerInProximity = 0x80B7F038; // type:func +EnZo_SetAnimation = 0x80B7F0D8; // type:func +EnZo_Init = 0x80B7F1D0; // type:func +EnZo_Destroy = 0x80B7F3D8; // type:func +EnZo_Standing = 0x80B7F3E8; // type:func +EnZo_Submerged = 0x80B7F4CC; // type:func +EnZo_Surface = 0x80B7F50C; // type:func +EnZo_TreadWater = 0x80B7F5F0; // type:func +EnZo_Dive = 0x80B7F7A0; // type:func +EnZo_Update = 0x80B7F8E8; // type:func +EnZo_OverrideLimbDraw = 0x80B7FAC8; // type:func +EnZo_PostLimbDraw = 0x80B7FCE8; // type:func +EnZo_Draw = 0x80B7FD44; // type:func +EffectSsIceSmoke_Init = 0x80B80370; // type:func +EffectSsIceSmoke_Draw = 0x80B80490; // type:func +EffectSsIceSmoke_Update = 0x80B80770; // type:func +ObjMakekinsuta_Init = 0x80B80850; // type:func +func_80B98320 = 0x80B80868; // type:func +ObjMakekinsuta_DoNothing = 0x80B8091C; // type:func +ObjMakekinsuta_Update = 0x80B8092C; // type:func +EnGe3_ChangeAction = 0x80B809A0; // type:func +EnGe3_Init = 0x80B80A48; // type:func +EnGe3_Destroy = 0x80B80B50; // type:func +EnGe3_TurnToFacePlayer = 0x80B80B7C; // type:func +EnGe3_LookAtPlayer = 0x80B80C94; // type:func +EnGe3_Wait = 0x80B80DA8; // type:func +EnGe3_WaitLookAtPlayer = 0x80B80E0C; // type:func +EnGe3_WaitTillCardGiven = 0x80B80E2C; // type:func +EnGe3_GiveCard = 0x80B80E90; // type:func +EnGe3_ForceTalk = 0x80B80F24; // type:func +EnGe3_UpdateCollision = 0x80B80FDC; // type:func +EnGe3_MoveAndBlink = 0x80B81084; // type:func +EnGe3_UpdateWhenNotTalking = 0x80B81110; // type:func +EnGe3_Update = 0x80B811C4; // type:func +EnGe3_OverrideLimbDraw = 0x80B81210; // type:func +EnGe3_PostLimbDraw = 0x80B81364; // type:func +EnGe3_Draw = 0x80B813C0; // type:func +ObjTimeblock_CalculateIsVisible = 0x80B815E0; // type:func +ObjTimeblock_SpawnDemoEffect = 0x80B816A0; // type:func +ObjTimeblock_ToggleSwitchFlag = 0x80B81714; // type:func +ObjTimeblock_Init = 0x80B8175C; // type:func +ObjTimeblock_Destroy = 0x80B81910; // type:func +ObjTimeblock_PlayerIsInRange = 0x80B81944; // type:func +ObjTimeblock_WaitForOcarina = 0x80B81A24; // type:func +ObjTimeblock_WaitForSong = 0x80B81AA4; // type:func +ObjTimeblock_SetupDoNothing = 0x80B81B1C; // type:func +ObjTimeblock_DoNothing = 0x80B81B30; // type:func +ObjTimeblock_SetupNormal = 0x80B81B40; // type:func +ObjTimeblock_Normal = 0x80B81B54; // type:func +func_80BA06AC = 0x80B81CD0; // type:func +ObjTimeblock_SetupAltBehaviorVisible = 0x80B81D80; // type:func +ObjTimeblock_AltBehaviorVisible = 0x80B81D94; // type:func +ObjTimeblock_SetupAltBehaviourNotVisible = 0x80B81E60; // type:func +ObjTimeblock_AltBehaviourNotVisible = 0x80B81E74; // type:func +ObjTimeblock_Update = 0x80B81F44; // type:func +ObjTimeblock_Draw = 0x80B81FCC; // type:func +ObjHamishi_InitCollision = 0x80B82230; // type:func +ObjHamishi_Shake = 0x80B82288; // type:func +ObjHamishi_Break = 0x80B82404; // type:func +ObjHamishi_Init = 0x80B826B0; // type:func +ObjHamishi_Destroy = 0x80B82798; // type:func +ObjHamishi_Update = 0x80B827C4; // type:func +ObjHamishi_Draw = 0x80B828F4; // type:func +EnZl4_SetActiveCamDir = 0x80B82A80; // type:func +EnZl4_SetActiveCamMove = 0x80B82B58; // type:func +EnZl4_GetTextId = 0x80B82BDC; // type:func +EnZl4_UpdateTalkState = 0x80B82C80; // type:func +EnZl4_UpdateFace = 0x80B82CBC; // type:func +EnZl4_SetMove = 0x80B82E0C; // type:func +func_80B5BB78 = 0x80B82E4C; // type:func +EnZl4_GetCueStartPos = 0x80B82E98; // type:func +EnZl4_SetupFromLegendCs = 0x80B82EDC; // type:func +EnZl4_InMovingAnim = 0x80B82FB4; // type:func +EnZl4_Init = 0x80B83084; // type:func +EnZl4_Destroy = 0x80B83240; // type:func +EnZl4_SetNextAnim = 0x80B8326C; // type:func +EnZl4_ReverseAnimation = 0x80B832C0; // type:func +EnZl4_CsWaitForPlayer = 0x80B832E8; // type:func +EnZl4_CsMeetPlayer = 0x80B83448; // type:func +EnZl4_CsAskStone = 0x80B83740; // type:func +EnZl4_CsAskName = 0x80B83C6C; // type:func +EnZl4_CsTellLegend = 0x80B84258; // type:func +EnZl4_CsLookWindow = 0x80B846B4; // type:func +EnZl4_CsWarnAboutGanon = 0x80B848F8; // type:func +EnZl4_CsMakePlan = 0x80B84DC0; // type:func +EnZl4_Cutscene = 0x80B85104; // type:func +EnZl4_Idle = 0x80B8537C; // type:func +EnZl4_TheEnd = 0x80B853F4; // type:func +EnZl4_Update = 0x80B855A4; // type:func +EnZl4_OverrideLimbDraw = 0x80B85654; // type:func +EnZl4_PostLimbDraw = 0x80B857E4; // type:func +EnZl4_Draw = 0x80B85840; // type:func +EnMm2_ChangeAnim = 0x80B874B0; // type:func +func_80AAEF70 = 0x80B875D4; // type:func +EnMm2_Init = 0x80B876A4; // type:func +EnMm2_Destroy = 0x80B8785C; // type:func +func_80AAF224 = 0x80B87888; // type:func +func_80AAF2BC = 0x80B87924; // type:func +func_80AAF330 = 0x80B87998; // type:func +func_80AAF3C0 = 0x80B87A28; // type:func +func_80AAF57C = 0x80B87BE4; // type:func +func_80AAF5EC = 0x80B87C58; // type:func +func_80AAF668 = 0x80B87CD4; // type:func +EnMm2_Update = 0x80B87DC8; // type:func +EnMm2_Draw = 0x80B87F10; // type:func +EnMm2_OverrideLimbDraw = 0x80B87FDC; // type:func +EnMm2_PostLimbDraw = 0x80B88064; // type:func +BgJyaBlock_Init = 0x80B88270; // type:func +BgJyaBlock_Destroy = 0x80B88328; // type:func +BgJyaBlock_Update = 0x80B8835C; // type:func +BgJyaBlock_Draw = 0x80B88380; // type:func +ObjWarp2block_Spawn = 0x80B884E0; // type:func +func_80BA1ECC = 0x80B885BC; // type:func +ObjWarp2block_SwapWithChild = 0x80B8873C; // type:func +func_80BA2218 = 0x80B8890C; // type:func +func_80BA228C = 0x80B8898C; // type:func +func_80BA2304 = 0x80B88A04; // type:func +ObjWarp2block_Init = 0x80B88A48; // type:func +ObjWarp2block_Destroy = 0x80B88B68; // type:func +ObjWarp2block_SetInactive = 0x80B88BA8; // type:func +ObjWarp2block_DoNothing = 0x80B88BC0; // type:func +func_80BA24E8 = 0x80B88BD0; // type:func +func_80BA24F8 = 0x80B88BE4; // type:func +func_80BA2600 = 0x80B88CC8; // type:func +func_80BA2610 = 0x80B88CDC; // type:func +ObjWarp2block_Update = 0x80B88D8C; // type:func +ObjWarp2block_Draw = 0x80B88DC8; // type:func diff --git a/tools/disasm/ique-cn/variables.txt b/tools/disasm/ique-cn/variables.txt new file mode 100644 index 0000000000..3103f86a63 --- /dev/null +++ b/tools/disasm/ique-cn/variables.txt @@ -0,0 +1,23 @@ +gCartHandle = 0x80009D60; // size:0x4 type:OSPiHandle* +gCurrentRegion = 0x80009F00; // size:0x4 type:u32 +__osRunQueue = 0x80009F38; // size:0x4 type:OSThread* +__osRunningThread = 0x80009F40; // size:0x4 type:OSThread* +__osFaultedThread = 0x80009F44; // size:0x4 type:OSThread* +__osHwIntTable = 0x8000A070; // size:0x28 +__osPiIntTable = 0x8000A098; // size:0x8 +__osShutdown = 0x8000A0FC; // size:0x4 type:u32 +__OSGlobalIntMask = 0x8000A100; // type:OSHWIntr +__osIntOffTable = 0x8000A670; // size:0x20 type:u8 +__osIntTable = 0x8000A690; // size:0x24 +__osRcpImTable = 0x8000A6C0; // type:u16 +__DriveRomHandle = 0x80010760; // size:0x74 type:OSPiHandle +__osThreadSave = 0x80012BE0; // type:OSThread +__osEventStateTab = 0x80012F40; // size:0x78 +gGameStateOverlayTable = 0x800F8F30; // size:0x120 type:GameStateOverlay +gRegEditor = 0x80127760; // size:0x4 type:RegEditor* +sZeldaArena = 0x80127C50; // size:0x24 type:Arena +gSegments = 0x80129048; // size:0x40 +sFaultDrawer = 0x8012E030; // size:0x3C type:FaultDrawer +sArenaLockMsg = 0x80137E40; // size:0x4 type:OSMesg +gSystemArena = 0x80137E50; // type:Arena +gSaveContext = 0x80137F40; // size:0x1428 type:SaveContext diff --git a/extract_assets.py b/tools/extract_assets.py similarity index 99% rename from extract_assets.py rename to tools/extract_assets.py index acf01cb71a..09519cb1ea 100755 --- a/extract_assets.py +++ b/tools/extract_assets.py @@ -8,7 +8,7 @@ import multiprocessing from pathlib import Path -from tools import version_config +import version_config def SignalHandler(sig, frame): diff --git a/tools/audio_extraction.py b/tools/extract_audio.py similarity index 100% rename from tools/audio_extraction.py rename to tools/extract_audio.py diff --git a/tools/msgdis.py b/tools/extract_text.py similarity index 90% rename from tools/msgdis.py rename to tools/extract_text.py index 3422988a6c..d9d9b50b61 100755 --- a/tools/msgdis.py +++ b/tools/extract_text.py @@ -1814,7 +1814,6 @@ def __init__(self) -> None: 0x1F : ("TIME", "", None), } extraction_charmap = { - 0x7F : '‾', 0x80 : 'À', 0x81 : 'î', 0x82 : 'Â', @@ -1883,6 +1882,148 @@ def format_color(self, c : int) -> str: 0x47 : "BLACK", }[c] +# Chinese Characters ordered according to their appearance in nes_font_static. +# This unfortunately does not appear to match any standard encoding. +CHN_CHARS = """你借到了一\ +颗口袋鸡蛋过夜后就会孵出只，用完\ +别忘记把它还回去。归得克洛！与不\ +同很少啼叫个奇异蘑菇新鲜的都容易\ +变质快拿卡利科药店吧之知道这两人\ +间发生什么事但带迷失森林物原主偷\ +猎者锯定是那年轻留下炸弹枚卢比买\ +德库子可以装弓换破损格雷剑大城修\ +好交处方见卓拉王⋯兑券急切地希望\ +点铸卖掉巨刀铁匠师所造坚摧卷眼青\ +蛙趁凉海鲁湖世上最水在前送蠃啦骷\ +髅面具按戴试看着真像怪恐怖吓基顿\ +受欢迎哦兔兜帽长耳朵太爱让头起来\ +有女孩？理更多我们娱乐中心：保龄\ +球场想奖品吗秘密付钱才告诉玩次要\ +瞄准洞放鼠十机预备开始再差（）捡\ +扔没能恢复正常请救其他兄弟给励诅\ +咒解除谢报呀啊被小消灭蜘蛛已经减\ +弱富办法越些验帮助寻找首先晚行动\ +第二住喜松柔土壤仔细观察周围全靠\ +成样因为种界每现徽章收集作战绩证\ +明征途状态窗此图标旁边数字显示目\ +量如果区名说里家族身感止错担需箭\ +关系强迫游戏著射击从台够五支武器\ +争取祝运堆软泥精灵选择或键并立即\ +时举置跑投掷疑型甚至飞檐走壁闪光\ +使敌眩晕旋镖攻远短钩条力链勾体获\ +自己根木棒挥舞站携浪费锤砸碎废沉\ +双手镜神井外也耗魔停笛塞尔达宝散\ +芒施展花风返避退火勋圣尼亚觉醒将\ +赐予茹特她萨莉娅魂纳波若暗英帕空\ +瓶红色命份绿蓝和抓伙伴活随呼唤鱼\ +非美豆园合适趣对纪念演奏各律重握\ +盾蹲防御移表滑反升级延伸距离倍套\ +件隔热穿潜服淹死坛充满靴浮悬缺摩\ +擦段勇敢相信超东哥猛龙胃做幸银臂\ +答应遵守诺言金焰入冷艳包钥匙打锁\ +门限于宫内老却驱喝进然域烁当位拨\ +查某层罗盘隐藏振石继续努哇公签临\ +西便箱意惊话左右赌徒值威增冰结授\ +艰苦训练该拥而荣义邪恶学步曲烈安\ +影梦幻镯拔虫员张据翡翠伟树托代传\ +碧商讲妖婆堡男情隆牛奶营养排销售\ +榜朋友搬日客碰烧毁折断斗习骑士又\ +承制尺码护炙侵害底溺掌丁妮席性危\ +往创建娜产罩刚清舒爽般暂脱参加嗯\ +顾片四整三房干稍候赛鳞跳深歌伊阳\ +摇篮雪壮管术接智慧气疲惫治疗伤且\ +硬技斩积蓄直释转效谈听束刻注嗨皇\ +探儿附近半思仅燃紫价高百索何输虽\ +惜幽妙愿勉网墙布藤蔓平爬屏幕顶端\ +挂旧梯嘿饰熄久通狭路慢躲调视角弯\ +旦侧落块推向兴引爆呢山坑楼绝总巧\ +脸私语足导写险雕流粘浑电尾巴几瞧\ +旗哪召跟拜访牧爸拯窟卜肚白马丢河\ +殿村云吹寒庄谁教沙漠盖侬夫等介联\ +声嘻曾领统疆怕鸟黑睛暴雨息初六聚\ +封印七认识必须未梭另渡船乘艘咯扇\ +许鬼板画廊扭天味冻音座锈漩涡吞嘛\ +牢固殊静墓培睡掘阅读式租货款仍；\ +载贪婪仇恨血腥历史诡计谜题亡闭今\ +业早招聘兼职杂指启遗极亮照闯穴伏\ +阻拦朝囚室贝泊泉黎童纯洁翻嘴陷野\ +研究考坏竟坐玛录钓磅分纹誓忠哈眠\ +瀑国务盯毯踩资瞎难倒阱塘屈镇径窄\ +慌允禁激颁喷扰砍持草泰沿实峡谷册\ +追赶市蜃崖灼宣疯狂滚伞脚共部免规\ +递登补肉歉刺杀节横纵礼貌米无孪姐\ +妹改池胆跃任句线范逃期待丽问闲泳\ +连北棵锐虑挤障碍盔甲假设温际顽皮\ +姆违盗贼蝴蝶崇象猫鹰凯普・博古化\ +笨朗匹雄赚寄卵幼突袭腹绦食笔竖枯\ +矮丛吃震撼吸败蜥蜴蝙蝠否则阿莫斯\ +母绕触傻遭汀幅敬诱泡挡沃衣炬黏背\ +抵权核挑壳肌缩邦苏透僵尸麻痹咬吉\ +乃穷尽裂拢娃傀儡亲巫低骨斧漏莱彼\ +塔扫描烟蛇弗扎挺八爪迪困陆嗜仙狼\ +懈贩麦判乔绽速嗄羞永稻终薇呵父程\ +工存氛笼令敏项欧谅众悍怎亏掏毕缓\ +冲酷俯瞰哼蚀功糟呸黄类篇论控括冒\ +度检单懂屋户致腾模嗒咔咋萎紧决呆\ +闷畏骗苗茁算猜残妇婴蔽唯响抚吵境\ +隙逝忆喂辈肩洋溢确迹凝髓混沌降健\ +耕耘星倾沛础堂万宗源本替缝惩罚遇\ +懒惰衷势维秩序抗衡旅顺叛愤辽阔茂\ +称讨厌靶饲求材耶谊噓遍谱议吼薄饶\ +稽齐懦抱千辛漂环配帝焦乎欠驯圈局\ +咩既劳祭伪弃耐岗唔佳搭档负责攀绍\ +忙提缠唉亳毛笑欣赏怜瓜奔啧踢志宜\ +仿楚挖由捕播谣勤陌杰骏鞭抽享栏逛\ +汊烦匆妈唱墟粗虐乡彻咕哝简优惠民\ +灰聪南澈卫熟悉故乌兆企抢夺拼粉番\ +群秒料肯赋婚诚邀斜诞及盛典拍轰植\ +矿采阴罕昏压悦饿忍咳弄舔醉怀尊严\ +滋农饥沮丧奋省撑脑灯隧派狗呜咣警\ +挪窜峙含痛夸艺撒谎昨炎痒泪稳况磨\ +休柱敲油菜盟骄傲献噢窒医甜鰓恼耽\ +搁孤丈订戒贵财惹腐剂融厚映妻狠泄\ +咿瞒咽恭涨嘎悔犹豫呃糕埃荡漾饵晃\ +约专剔窍．乱甩鳅剧竿杆符呱团饱犯\ +肃啵吟月诗碑奥扬舍副袖夏赖仆摆雇\ +疙瘩居簧车剩玻璃赔欺育珍床蛮啄、\ +稀栋柜鼻厉乏饭胡叮咚兵勃苛薪痴挣\ +馊扑良竭慷慨欲愚蠢嘉监狱喔港逆误\ +独划措颜奴罢洗俊罪偿牺牲劲岁恩账\ +珂艾组织伯社架桥碟卑鄙臭占讶兽刷\ +竞帐篷迟繁倦罐牌晨景田孔钻浓盒溜\ +街概盹敞扉文撞姑娘糊涂依辐微汇缚\ +宰摸侍垒扮惕估执悲拖累弥渴班搞谛\ +哀圆鸣俩善塌埋孙凶聊寃怨购涌劈狐\ +狸票闻哟唬摘愉呦棺溶褐肤颤逗娶逼\ +悠蒙漆彩丰""" +# Ensure the contents of the above is unique +assert len(set(CHN_CHARS)) == len(CHN_CHARS), (len(set(CHN_CHARS)), len(CHN_CHARS)) + +class MessageDecoderCHN(MessageDecoderNES): + def __init__(self) -> None: + # The CHN text encoding is mostly the same as the NES encoding, except it lacks + # the D-Pad Icon and has multi-byte sequences for Chinese characters. + super().__init__() + # Remove D-Pad Icon + self.extraction_charmap.pop(0xAB) + # Add Chinese Characters + for i,c in enumerate(CHN_CHARS): + self.extraction_charmap[0xA08C + i] = c + self.pop_char = self.pop_char_chn + + def pop_char_chn(self) -> int: + c = self.pop_byte() + # AA acts like a sort of escape sequence for single-byte + # chars that are >= 0xA0 that should not be interpreted + # as a multi-byte sequence + if c == 0xAA: + return self.pop_byte() + # For other chars >= 0xA0, it indicates a multi-byte sequence + if c >= 0xA0: + return (c << 8) | self.pop_byte() + # If neither of the above, treat as a single byte char + return c + class MessageTableDesc: def __init__(self, table_name : str, seg_name : str, decoder : MessageDecoder, parent : Optional[int]) -> None: self.table_name : str = table_name @@ -1896,6 +2037,9 @@ class MessageTableEntry: def __init__(self, text_id : int, box_type : int, box_pos : int, addr : int) -> None: self.text_id, self.box_type, self.box_pos, self.addr = text_id, box_type, box_pos, addr + def __str__(self) -> str: + return f"MessageTableEntry(0x{self.text_id:04X}, {self.box_type}, {self.box_pos}, 0x{self.addr:08X})" + @staticmethod def from_bin(data : bytes) -> "MessageTableEntry": text_id,info,addr = struct.unpack(">HBxI", data) @@ -1948,8 +2092,9 @@ def decode(self) -> str: # Valid for all languages out += self.define_message("DEFINE_MESSAGE", shared_box_type, shared_box_pos, self.data) else: - # Some NTSC messages have different box types/positions between JPN and NES, + # Some NTSC/iQue messages have different box types/positions between JPN and NES/CHN, # so emit both DEFINE_MESSAGE_JPN and DEFINE_MESSAGE_NES + assert len(self.data) == 4 assert self.data[0] is not None assert self.data[1] is not None assert self.data[2] is None @@ -1960,7 +2105,7 @@ def decode(self) -> str: # JPN only out += self.define_message("DEFINE_MESSAGE_JPN", self.data[0].box_type, self.data[0].box_pos, self.data) elif selection == (False,True,True,True): - # NES only + # NES/CHN only out += self.define_message("DEFINE_MESSAGE_NES", self.data[1].box_type, self.data[1].box_pos, self.data) else: # Other unimplemented cases @@ -2071,22 +2216,31 @@ def main(): jpn_decoder = MessageDecoderJPN() nes_decoder = MessageDecoderNES() + chn_decoder = MessageDecoderCHN() - message_tables : List[Optional[MessageTableDesc]] = [None for _ in range(4)] # JP, EN, FR, DE + message_tables : List[Optional[MessageTableDesc]] = [None for _ in range(4)] # JP, EN/CN, FR, DE message_table_staff : MessageTableDesc = None - if config.text_lang_pal: + if config.text_lang == "NTSC": + message_tables[0] = MessageTableDesc("sJpnMessageEntryTable", "jpn_message_data_static", jpn_decoder, None) + message_tables[1] = MessageTableDesc("sNesMessageEntryTable", "nes_message_data_static", nes_decoder, None) + message_tables[2] = None + message_tables[3] = None + message_table_staff = MessageTableDesc("sStaffMessageEntryTable", "staff_message_data_static", nes_decoder, None) + elif config.text_lang == "PAL": message_tables[0] = None message_tables[1] = MessageTableDesc("sNesMessageEntryTable", "nes_message_data_static", nes_decoder, None) message_tables[2] = MessageTableDesc("sGerMessageEntryTable", "ger_message_data_static", nes_decoder, 1) message_tables[3] = MessageTableDesc("sFraMessageEntryTable", "fra_message_data_static", nes_decoder, 1) message_table_staff = MessageTableDesc("sStaffMessageEntryTable", "staff_message_data_static", nes_decoder, None) - else: + elif config.text_lang == "CN": message_tables[0] = MessageTableDesc("sJpnMessageEntryTable", "jpn_message_data_static", jpn_decoder, None) - message_tables[1] = MessageTableDesc("sNesMessageEntryTable", "nes_message_data_static", nes_decoder, None) + message_tables[1] = MessageTableDesc("sNesMessageEntryTable", "nes_message_data_static", chn_decoder, None) message_tables[2] = None message_tables[3] = None message_table_staff = MessageTableDesc("sStaffMessageEntryTable", "staff_message_data_static", nes_decoder, None) + else: + raise Exception(f"Unsupported text language: {config.text_lang}") messages = collect_messages(message_tables, baserom_segments_dir, config, code_vram, code_bin) staff_messages = collect_messages([message_table_staff], baserom_segments_dir, config, code_vram, code_bin) diff --git a/tools/ido_recomp/linux/5.3/as0 b/tools/ido_recomp/linux/5.3/as0 deleted file mode 100755 index cdac712e5f..0000000000 Binary files a/tools/ido_recomp/linux/5.3/as0 and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/as1 b/tools/ido_recomp/linux/5.3/as1 deleted file mode 100755 index f89911f80f..0000000000 Binary files a/tools/ido_recomp/linux/5.3/as1 and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/cc b/tools/ido_recomp/linux/5.3/cc deleted file mode 100755 index be5bed557d..0000000000 Binary files a/tools/ido_recomp/linux/5.3/cc and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/cfe b/tools/ido_recomp/linux/5.3/cfe deleted file mode 100755 index c257f65a62..0000000000 Binary files a/tools/ido_recomp/linux/5.3/cfe and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/err.english.cc b/tools/ido_recomp/linux/5.3/err.english.cc deleted file mode 100755 index 6976e38a95..0000000000 --- a/tools/ido_recomp/linux/5.3/err.english.cc +++ /dev/null @@ -1,1260 +0,0 @@ -@ - 358 358 358 - 6464 6482 6553 - 6553 6593 6728 - 6728 6746 6803 - 6803 6808 6808 - 6808 6818 6818 - 6818 6826 6826 - 6826 6847 6847 - 6847 6875 6922 - 6922 6930 6930 - 6930 6939 6939 - 6939 6948 6948 - 6948 6974 7120 - 7120 7149 7204 - 7210 7248 7311 - 7317 7350 7442 - 7450 7497 7627 - 7635 7709 7930 - 7938 7975 8063 - 8071 8113 8253 - 8261 8289 8289 - 8298 8338 8445 - 8460 8502 8635 - 8650 8690 8819 - 8834 8857 8965 - 8965 9008 9113 - 9119 9142 9227 - 9235 9282 9451 - 9451 9462 9462 - 9462 9477 9477 - 9477 9497 9497 - 9497 9545 9545 - 9545 9584 9584 - 9584 9604 9662 - 9662 9682 9720 - 9720 9749 9749 - 9749 9788 9788 - 9788 9802 9802 - 9802 9829 9829 - 9829 9861 9861 - 9861 9904 9904 - 9904 9920 9920 - 9920 9962 9962 - 9962 9988 9988 - 9988 10014 10014 -10014 10035 10035 -10035 10054 10097 -10097 10115 10115 -10115 10147 10147 -10147 10183 10183 -10183 10208 10208 -10208 10236 10236 -10236 10269 10269 -10269 10304 10304 -10304 10328 10328 -10328 10351 10351 -10351 10371 10371 -10371 10402 10402 -10402 10447 10447 -10447 10497 10497 -10497 10533 10533 -10533 10598 10598 -10606 10630 10630 -10640 10671 10671 -10690 10719 10719 -10728 10752 10795 -10795 10837 10837 -10837 10876 10876 -10876 10900 10900 -10900 10948 10948 -10960 11021 11103 -11103 11128 11128 -11128 11153 11153 -11153 11216 11216 -11216 11239 11239 -11239 11303 11303 -11303 11347 11347 -11357 11393 11393 -11393 11432 11432 -11442 11494 11494 -11494 11536 11536 -11536 11595 11595 -11595 11622 11622 -11622 11684 11684 -11684 11726 11726 -11738 11778 11778 -11782 11813 11813 -11813 11850 11850 -11850 11900 12087 -12111 12120 12120 -12120 12129 12129 -12129 12158 12158 -12158 12192 12192 -12192 12237 12237 -12237 12273 12273 -12273 12326 12326 -12330 12366 12366 -12366 12423 12423 -12427 12482 12482 -12486 12560 12560 -12568 12631 12631 -12637 12691 12691 -12691 12743 12743 -12743 12785 12785 -12785 12826 12826 -12826 12865 12865 -12865 12883 12883 -12883 12946 12946 -12956 12995 12995 -13005 13066 13066 -13077 13163 13163 -13163 13211 13211 -13211 13270 13270 -13270 13318 13318 -13318 13350 13350 -13350 13387 13387 -13387 13428 13428 -13428 13464 13533 -13533 13580 13737 -13737 13776 13854 -13854 13913 13913 -13913 13950 13950 -13950 14118 14118 -14118 14150 14150 -14150 14163 14194 -14194 14224 14255 -14255 14275 14319 -14319 14353 14458 -14466 14484 14530 -14534 14567 14567 -14567 14635 14682 -14690 14742 14742 -14742 14789 14789 -14801 14875 14875 -14886 14947 14947 -14947 14992 14992 -14992 15035 15085 -15085 15134 15205 -15214 15267 15448 -15454 15496 16810 -16822 16875 16960 -16972 17053 17179 -17191 17236 17332 -17344 17491 17841 -17853 17939 18304 -18316 18471 18774 -18786 18952 19323 -19335 19364 19496 -19500 19527 19598 -19598 19613 19776 -19797 19808 19837 -19837 19862 19862 -19868 19927 20026 -20034 20075 20179 -20187 20223 20223 -20223 20290 20382 -20392 20441 20589 -20601 20656 20656 -20656 20699 20818 -20826 20860 21038 -21046 21094 21191 -21203 21236 21314 -21326 21395 21457 -21469 21502 21502 -21502 21587 21731 -21756 21789 21864 -21875 21901 21976 -22013 22059 22220 -22257 22397 22561 -22561 22595 22595 -22603 22623 22623 -22631 22667 22828 -22865 22919 22994 -23031 23059 23120 -23132 23201 23201 -23212 23274 23274 -23285 23345 23345 -23356 23393 23393 -23399 23431 23532 -23542 23587 23646 -23656 23697 23745 -23755 23796 23844 -23854 23876 23928 -23942 23971 24153 -24160 24243 24243 -24247 24273 24743 -24755 24784 24984 -24996 25034 25034 -25034 25075 25273 -25281 25332 25410 -25420 25467 25544 -25554 25583 25744 -25754 25783 26061 -26071 26111 26185 -26194 26239 26525 -26535 26568 26914 -26924 26951 26998 -27008 27035 27082 -27093 27120 27167 -27178 27206 27251 -27261 27289 27334 -27345 27391 27931 -27938 27959 28007 -28019 28037 28037 -28043 28069 28069 -28077 28147 28199 -28207 28266 28266 -28274 28306 28306 -28314 28339 28339 -28347 28404 28510 -28518 28567 28682 -28690 28728 28728 -28736 28782 29023 -29033 29085 29234 -29246 29303 29383 -29395 29432 29570 -29592 29631 29644 -29644 29693 29758 -29767 29810 29875 -29875 29911 29976 -29984 30014 30014 -30027 30086 30151 -30157 30223 30293 -30301 30369 30445 -30457 30511 30568 -30580 30630 30743 -30755 30812 30874 -30886 30959 31035 -31043 31076 31175 -31183 31243 31243 -31251 31323 31323 -31331 31433 31433 -31445 31544 31686 -31698 31740 31740 -31740 31783 31783 -31783 31824 31824 -31824 31873 31996 -32008 32056 32164 -32176 32210 32210 -32229 32271 32271 -32279 32323 32569 -32581 32642 32718 -32739 32779 32916 -32926 32953 33047 -33057 33116 33315 -33325 33373 33373 -33373 33407 33469 -33494 33527 33527 -33536 33573 33573 -33584 33650 33697 -33705 33763 33763 -33763 33797 33797 -33797 33829 33906 -33915 33976 33976 -33985 34016 34098 -34098 34133 34198 -34198 34261 34261 -34269 34312 34312 -34324 34363 34438 -34444 34530 34530 -34538 34596 34626 -34636 34675 34754 -34764 34821 34821 -34821 34867 34950 -34959 35016 35135 -35145 35198 35198 -35208 35266 35344 -35355 35382 35537 -35547 35576 35629 -35637 35705 35705 -35713 35764 35764 -35764 35784 35876 -35888 35932 35950 -35950 36013 36138 -36150 36191 36280 -36286 36314 36419 -36431 36516 36516 -36516 36554 36642 -36642 36689 36808 -36818 36881 37105 -37113 37183 37204 -37204 37225 37225 -37225 37255 37348 -37348 37388 37388 -37388 37454 37454 -37454 37518 37518 -37518 37584 37584 -37584 37717 37717 -37717 37752 37752 -37752 37783 37889 -37901 37928 38034 -38046 38115 38115 -38115 38140 38187 -38195 38219 38339 -38351 38422 38422 -38422 38486 38486 -38486 38555 38555 -38555 38619 38619 -38619 38641 38641 -38641 38758 38758 -38758 38929 38929 -38929 38975 39043 -39055 39084 39133 -39133 39175 39265 -39275 39310 39494 -39504 39547 39576 -39587 39614 39668 -39674 39697 39797 -39797 39845 40094 -40094 40158 40264 -40264 40369 40523 -40523 40593 40593 -40593 40629 40876 -40876 40911 40971 -40977 41026 41026 -41038 41077 41077 -41077 41116 41116 -41116 41156 41156 -41156 41195 41195 -41195 41237 41237 -41237 41285 41285 -41285 41304 41304 -41304 41371 41371 -41371 41429 41429 -41429 41491 41491 -41491 41519 41519 -41519 41572 41572 -41572 41642 41642 -41642 41676 41676 -41676 41713 41713 -41713 41751 41751 -41751 41792 41792 -41792 41856 41856 -41856 41881 41881 -41881 41936 41936 -41936 41977 41977 -41977 42018 42018 -42018 42090 42090 -42090 42162 42162 -42162 42205 42205 -42205 42267 42267 -42267 42294 42294 -42294 42309 42309 -42309 42338 42386 -42393 42425 42522 -42530 42577 42577 -42577 42623 42623 -42623 42643 42725 -42725 42748 42748 -42748 42829 42897 -42901 42952 42952 -42952 42978 43025 -43025 43116 43116 -43116 43171 43171 -43171 43204 43376 -43386 43453 43471 -43471 43547 43780 -43798 43921 44116 -44120 44120 44120 -Out of memory: %s -There is no more memory left in the system for compiling this program. -Internal Error Unknown Error Message %s -1) An internal error, while attempting to print an unavailable message -2) The error message file is inaccessible or has other problems -Unknown Signal %s -1) An unknown signal has been caught -2) 2 Nested signals -line -Warning: -Fatal: -Source not available -Too many errors... goodbye. -There is a limit of 30 errors before aborting. -Error: -reserved -reserved -Unknown Control Statement -1) The line begins with a '#' and is not of the form: - # "" -2) Please compile this program with the preprocessor enabled. -Unknown character %s ignored -The character is not part of the source character set. -2.2.1 -Unknown control character \%s ignored -The control character is not part of the source character set. -2.2.1 -Illegal character %s in exponent -1) Digits or sign expected after 'e' or 'E'. -2) Digits are expected after sign in exponent. -3.1.3.1 -Constant is out of range and may be truncated. -The constant is too large to be accurately represented and may be -truncated. The limits are in the system include file limits.h. -2.2.4.2 -Constant is out of range for a 32-bit data type, but accepted as written. -The constant is too large to fit in a 32-bit data type, but will be -accurately represented in a wider data type. The value may be truncated, -depending on its context. The limits are in the system include file -limits.h. -2.2.4.2 -Character constant size out of range -1) No characters in a character constant. -2) More than 4 bytes in a character constant. -3.1.3.4 -Wide character constant size out of range -1) No characters in the multibyte sequence (0 assumed). -2) More than 1 byte in the multi-byte sequence (only the first byte was converted). -3.1.3.4 -Invalid multibyte character -4.10.7.2 -Newline in string or character constant -1) Terminate your string or character constant with closing quotes. -2) Put a backslash before the newline. -3.1.3.4, 3.1.4 -Octal character escape too large: %s > %s -1) Terminate end of octal sequence with a non-octal character. -2) Select a character value within the limits. -Value may be truncated -3.1.3.4, 3.1.4 -Hex character escape too large: %s > %s -1) Terminate end of hex sequence with a non-hex character. -2) Select a character value within the limits. -Value may be truncated -3.1.3.4, 3.1.4 -Unexpected End-of-file -1) Unterminated string or character constant -2) Missing closing comment marker (*/) -3) File system problems -Unrecognized escape sequence in string \%s -Recognized escape sequences are \a, \b, \f, \n, \r, \t, and \v. -Character will be treated as un-escaped. -3.9.2 -Illegal octal digit %s -Octal constants, beginning with 0, must only have digits between 0 and 7, -inclusive. -3.1.3.2 -Unable to open temporary file for compiling %s -1) TMPDIR environment variable is set to a directory that you have no - permissions for. -2) The file system is full. -3) System errors beyond the scope of the compiler. -%s: Hangup -%s: Interrupt -%s: Quit (ASCII FS) -%s: Illegal instruction (not reset when caught) -%s: Trace trap (not reset when caught) -%s: IOT instruction -Also SIGABRT, used by abort, replace SIGIOT in the future -%s: EMT instruction -Also SIGXCPU, Exceeded CPU time limit -%s: Floating point exception -%s: Kill (cannot be caught or ignored) -%s: Bus error -%s: Segmentation violation -%s: Bad argument to system call -%s: Write on a pipe with no one to read it -%s: Alarm clock -%s: Software termination signal from kill -%s: User defined signal 1 -%s: User defined signal 2 -%s: Death of a child -Power-fail restart -%s: Also SIGXFSZ, exceeded file size limit -%s: Window change -%s: Handset, line status change -%s: Sendablestop signalnot from tty -%s: Stop signal from tty -%s: Pollable event occurred -%s: Input/Output possible signal -%s: Urgent condition on IO channel -%s: Window size changes -%s: Virtual time alarm -%s: Profiling alarm -%s: Continue a stopped process -%s: To readers pgrp upon background tty read -%s: Like TTIN for output if (tp->t_local<OSTOP) -%s: Resource lost (eg, record-lock) -'auto' and 'register' are not allowed in an external declaration -3.7(10) -must have function type -3.7.1(30) -Functions cannot return arrays -3.7.1(33), 3.3.2.2 -Declaration list not allowed -3.7.1(5) -Too many input files %s -The command line may contain only one file -cpp internal error: input stack underflow -cpp internal error: if stack underflow -Cannot open the file %s -No new-line character at the end of the file %s -2.1.1.2(30) -Fatal: Exceeded the limit of nesting level for #include file -Fatal: Exceeded the limit of nesting level for #include file. This limit -is 200. -Fail to read the file %s -Cannot write the file %s -%s: %s: An if directive is not terminated properly in the file -%s: %s: nested comment -%s:%s: Illegal macro name %s; macro name shall be an identifier -%s:%s: Illegal preprocessing token sequence -3.8.3(35) -%s:%s: Illegal macro parameter name -%s:%s: Non-unique macro parameter name -3.8.3(18) -%s:%s: Missing ')' in parameter list for #define %s -%s:%s: Missing ')' in macro instantiation -%s:%s: Bad punctuator in the parameter list for #define %s -%s:%s: Macro %s redefined. -%s:%s: # operator should be followed by a macro argument name -%s:%s: Badly formed constant expression%s -3.4(9), 3.8 -%s:%s: Division by zero in #if or #elif -3.8 -unknown command line option %s -extraneous input/output file name %s -%s: %s: Unterminated string or character constant -A preprocessing string or character constant token was not -terminated. Note that preprocessing directives are processed -after the source file has been divided into preprocessing tokens. -2.1.1.2(30) 3.1(18) 3.8 -%s: %s: -%s: %s: -%s: %s: Unterminated comment -%s: %s: Unknown directive type %s -%s: %s: #elif or #else after #else directive -%s: %s: Bad identifier after the %s -%s: %s: #%s accepts only one identifier as parameter -3.8 -%s: %s: Bad identifier after the %s -%s: %s: text following #%s violates the ANSI C standard. -3.8 -%s: %s: Bad character %s occurs after the # directive. -3.8 -%s: %s: the ## operator shall not be the %s token in the replacement list -3.8.3.3 -%s: %s: the defined operator takes identifier as operand only. -3.8.1 -%s: %s: Not in a conditional directive while using %s -%s: %s: Illegal filename specification for #include -%s: %s: Invalid file name %s for #include -%s: %s: Cannot open file %s for #include -%s: %s: Bad argument for #line command -%s: %s: #error %s -%s: %s: Tried to redefine predefined macro %s, attempt ignored -3.8.7(22) -%s: %s: Undefining predefined macro %s -3.8.7(22) -%s: %s: Undefined the ANSI standard library defined macro %s -4.1.2.1(9) -%s: %s: The number of arguments in the macro invocation does not match the definition -%s: %s: Illegal character %s in preprocessor if -%s: %s: Illegal character %s for number in preprocessor if -%s: %s: No string is allowed in preprocessor if -%s: %s: Not supported pragma %s -%s: %s: Not supported #pragma format -%s: %s: ANSI C does not allow #ident; %s -%s: %s: Not supported #ident format -This cpp extension accepts the following format: -#ident "any string" -%s: %s: Not supported #assert/#unassert format -This cpp extension accepts the following format: -#assert identifier -#assert identifier ( pp-tokens ) -#unassert identifier -#unassert identifier ( pp-tokens ) -%s: %s: Bad assertion predicate format -The correct syntax for this cpp extension is: -#assert identifier ( pp-token ) -%s: %s: directive is an upward-compatible ANSI C extension -%s: This option requires an argument -%s: %s: A macro has expanded recursively more than %s times. Further expansion will be disabled! Use command-line option: -Wp,-max_rec_depth=depth to recurse deeper. -A status return from cpp to cfe -Syntax Error -The token read was unexpected. -Syntax Error -- cannot backup -The token read was unexpected. -Yacc stack overflow -The expression is too complicated to parse. -Trailing comma in enumerator list -The use of a trailing comma in an enumerator list is not standard C. There -may be portability problems. -3.5.2.2 -Empty declaration -Empty declarations are invalid in standard C. -3.5 -%s declared, but not referenced. -redeclaration of '%s'; previous declaration at line %s in file '%s' -Identifier redeclared in the same scope/block. -3.1.2.3 -'%s' undefined; reoccurrences will not be reported. -Non-function name referenced in function call. -3.3.2.2(18) -The number of arguments doesn't agree with the number in the declaration. -3.3.2.2(5) -'%s' section name longer than 8 characters. Name truncated. -'%s' is already placed by pragma alloc_text. -Cannot write ucode file while compiling %s -1) The file system is full -2) Permissions problem -Must have corresponding formal argument for '%s' -Parameter found in the declaration part, but not in the argument list. -3.7.1(7) -Non-prototype declaration is an obsolescent feature. -The use of function definitions with separate parameter identifier -and declaration lists (not prototype-format parameter type and -identifier declarators) is an obsolescent feature. -3.9.5 -Incompatible function declarations for %s -For two function types to be compatible, both shall specify compatible -return types. Moreover, the parameter type lists, if both are present, -shall agree in the number of parameters and in use of the ellipsis -terminator; corresponding parameters shall have compatible types. If -one type has a parameter type list and the other type is specified by -a function declarator that is not part of a function definition and -contains an empty identifier list, the parameter list shall not have -an ellipsis terminator and the type of each parameter shall be -compatible with they type that results from application of the default -argument promotions. If one type has a parameter type list and the -other is specified by a function definition that contains a (possibly -empty) identifier list, both shall agree in the number of parameters, -and the type of each prototype parameter shall be compatible with the -type that results from application of the default argument promotions -to the type of the corresponding identifier. (For each parameter -declared with function or array type, its type for these comparisons -is the one that results from conversion to a pointer type. For each -parameter declared with qualified type, its type for these comparisons -is the unqualified version of its declared type.) There you have it! -3.5.4.3(15) -Incompatible function return type for this function. -For two function types to be compatible, both shall specify compatible -return types. -3.5.4.3(15) -The number of parameters for function is different from the previous declaration -The parameter type lists, if both are present, shall agree in the -number of parameters and in use of the ellipsis terminator. -3.5.4.3(15) -Incompatible type for the function parameter -If both parameter type lists are present, corresponding -parameters shall have compatible types. -3.5.4.3(15) -Function %s is redeclared with an incompatible argument type (after default argument promotion), which could lead to undefined run-time behaviour. -The redeclaration could cause arguments at a call site to be passed -inconsistently with what the function implementation expects, and -parameters would therefore be accessed erroneously when executing the -function body. Note that a float argument is promoted to a double -when passed (potentially through fp registers) to an unprototyped -function. -3.5.4.3(15) -prototype and non-prototype declaration found for %s, ellipsis terminator not allowed -If one type has a parameter type list and the other type is specified -by a function declarator that is not part of a function definition and -contains an empty identifier list, the parameter list shall not have -an ellipsis terminator and the type of each parameter shall be -compatible with they type that results from application of the default -argument promotions. -3.5.4.3(15) -prototype and non-prototype declaration found for %s, the type of this parameter is not compatible with the type after applying default argument promotion -If one type has a parameter type list and the other type is specified -by a function declarator that is not part of a function definition and -contains an empty identifier list, the type of each parameter shall be -compatible with the type that results from application of the default -argument promotions. -3.5.4.3(15) -prototype declaration and non-prototype definition found for %s, the type of this parameter is not compatible with the type after applying default argument promotion -If one type has a parameter type list and the other is specified by a -function definition that contains a (possibly empty) identifier list, -both shall agree in the number of parameters, and the type of each -prototype parameter shall be compatible with the type that results -from application of the default argument promotions to the type of the -corresponding identifier. -3.5.4.3(15) -Empty declaration specifiers -Standard C requires at least a storage class specifier, type specifier, -or a type qualifier in declarations. 'extern int' assumed. -3.5 -Can't write to the file %s -1) The output file cannot be opened for writing. -2) Out of file space. -Duplicate '%s' -typedef, extern, static, auto, register, const, volatile may not -appear more than once in the same specifier list or qualifier list. -Duplicate occurrence ignored. -3.5.1(10) , 3.5.3(5) -Null input -There is nothing to compile. -Illegal type combination -3.5.2 -Missing ';' at end of structure / union member declaration -In standard C, each member declaration must be terminated by a ';'. A -terminating ';' is assumed. -3.5.2.1 -Missing member name in structure / union -In standard C, each member declaration have a member name. The missing -member is assumed to not exist. -3.5.2.1 -This variable is initialized twice. -Neither 'const' or 'volatile' have any effect on function results. -Qualifiers only apply to expressions designating an object that -can be altered or examined. -3.5.3(10) -An integer constant expression is required here. -The expression that defines the value of an enumeration constant -shall be an integral constant expression that has a value -representable as an int. -3.5.2.2(28) -(previous declaration of '%s' at line %s in file '%s') -Must be an integer type greater than zero. -The array size must be either a char, signed or unsigned integer or -an enumerated type with a value greater than zero. -3.5.4.2 -Array size cannot be a long long. -Arrays with more than 2^32 elements are not yet supported. -The array size must be either a char, signed or unsigned integer or -an enumerated type with a value greater than zero. -3.5.4.2 -bit-field '%s' width is not an integer constant -The expression that specifies the width of a bit-field shall be an -integral constant expression. -3.5.2.1(15) -bit-field '%s' width is negative -The expression that specifies the width of a bit-field shall be -non-negative. -3.5.2.1(15) -bit-field '%s' type required to be int, unsigned int, or signed int. -A bit-field shall have type int, unsigned int, or signed int. -3.5.2.1(30) -bit-field %s's type not integer. -Non-scalar type or pointer type to a non-object for increment or decrement operator. -The operand of the prefix/postfix increment or decrement operator shall have scalar type; if it is of pointer type, it must point to an object. -3.3.2.4(37), 3.3.3.1(25) -Assign value to a function type. -An assignment operator shall have a modifiable lvalue as its left operand. -3.2.2.1(5) -Assign value to an array. -An assignment operator shall have a modifiable lvalue as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Change value for variable of incomplete type. -The operand of increment and decrement operator shall be a modifiable -scalar lvalue. An assignment operator shall have a modifiable lvalue -as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -The left-hand side of the '.' operator must be an addressable lvalue, when a bit-field is not contained within a unit of 32 bits alignment. -This is a restriction in our implementation, which can be worked -around by always accessing long long bit-fields indirectly (i.e. -by means of the '->' operator). -This expression is not an lvalue. -3.2.2.1 -Modified an rvalue. -3.2.2.1 -Change value for constant variable. -The operand of increment and decrement operators shall be modifiable -scalar lvalues. An assignment operator shall have a modifiable lvalue -as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Change value for constant field of a struct or union. -An assignment operator shall have a modifiable lvalue as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Dereferenced a non-pointer. -The operand of the unary * operator shall have pointer type. -3.3.3.2(39) -The operand of the unary + or - operator shall have arithmetic type. -3.3.3.3(6) -The operand of the unary ~ operator shall have integral type. -3.3.3.3(6) -The operand of the unary ! operator shall have scalar type. -3.3.3.3(6) -Constants must have arithmetic type. -3.1.3 -Bad type name for cast operator -The type name for the cast operator should either be void or a -qualified or unqualified scalar type. -3.3.4(22) -Improper cast of non-scalar type expression. -The operand for the cast operator shall be of scalar type. -3.3.4(23) -Cast a pointer into a non-integral type. -A pointer may be converted to an integral type. -3.3.4(31) -Cast a non-integral type into a pointer. -An integral type may be converted to a pointer. -3.3.4(31) -Duplicate member '%s' -Two members of a struct may not have the same name. -3.1.2.2(7,25) -Invalid constant expression. -Constant expressions shall not contain assignment, increment, decrement, -function-call, or comma operators, except when they are contained within -the operand of the sizeof operator. -3.4(9) -Constant expressions must be derived from a constant value or a constant -variable. -3.4 -Dangerous operand of '&'. -The operand of the unary & operator shall be either a function -designator or an lvalue that designates an object that is not a -bit-field and is not declared with the register storage-class -specifier. This operand is NOT an lvalue, but we let it pass. -Note that a segmentation error with possible core dump will result -when the resulting address does not denote a valid (declared) -storage location. This feature will be discontinued in future -releases of the compiler! -3.3.3.2(36) -Unacceptable operand of '&'. -The operand of the unary & operator shall be either a function -designator or an lvalue that designates an object that is not a -bit-field and is not declared with the register storage-class -specifier. -3.3.3.2(36) -'&' before array or function; ignored -Unacceptable operand of sizeof operator. -The sizeof operator shall not be applied to an expression that has -function type or an incomplete type, to the parenthesized name of such -a type, or to an lvalue that designates a bit-field object. -3.3.3.4 -Unacceptable operand of a multiplicative operator. -Each of the operands of a multiplicative operator shall have arithmetic type. -3.3.5(18) -Unacceptable operand of the remainder operator -Each of the operands of the remainder (%) operator shall have integral type. -3.3.5(18) -Unacceptable operand of '+'. -For the + operator, either both operands shall have arithmetic type, or -one operand shall be a pointer to an object type and the other shall -have integral type. -3.3.6(39) -Unacceptable operand of '-'. -For the subtraction operator, one of the following shall hold: both operands -have arithmetic type; operands are pointers to qualified or unqualified -versions of compatible object types; or the left operand is a pointer -to an object type and the right operand has integral type. -3.3.6(39) -Unacceptable operand of shift operator. -Each of the operands of bitwise shift operators shall have integral type. -3.3.7(9) -Unacceptable operand of relational operator. -For relational operators, one of the following shall hold: both -operands have arithmetic type; both operands are pointers to qualified -or unqualified versions of compatible object types; or both operands -are pointers to qualified or unqualified versions of compatible -incomplete types. -3.3.8(32) -Unacceptable operand of == or != -For the == or != operator, one of the following shall hold: both operands -are pointers to qualified or unqualified versions of compatible types; one -operand is a pointer to an object or incomplete type and the other is a -pointer to a qualified or unqualified version of void; or one operand is -a pointer and the other is a null pointer constant. -3.3.9(21) -Unacceptable operand of &. -Each of the operands shall have integral type. -3.3.10(7) -Unacceptable operand of ^. -Each of the operands shall have integral type. -3.3.11(18) -Unacceptable operand of |. -Each of the operands shall have integral type. -3.3.12(30) -Unacceptable operand of &&. -Each of the operands shall have scalar type. -3.3.13(7) -Unacceptable operand of ||. -Each of the operands shall have scalar type. -3.3.14(20) -Unacceptable operand of conditional operator. -The first operand of conditional operator shall have scalar type. One -of the following shall hold for the second and third operands: -both operands have arithmetic type; both operands have compatible -structure or union types; both operands have void type; both operands -are pointers to qualified or unqualified versions of compatible types; -one operand is a pointer and the other is a null pointer constant; or -one operand is pointer to an object or incomplete type and the other -is a pointer to a qualified or unqualified version of void. -3.3.15 -Duplicate label '%s' -A label name can only occur once in a function. -3.1.2.1(25) -Division by zero. -3.3.5 -Subscripting a non-array. -3.3.2.1 -Subscripting an array of incomplete type which is not an object type. -The element of the array shall have an object type. -3.3.2.1 -Should only subscript an array with an integral expression -3.3.2.1 -Subscripting an unbounded array -3.3.2.1 -Array index out of range -3.3.2.1 -Selector requires struct/union pointer as left hand side -In K&R mode the expression is implicitly converted to the '.' selector -for a struct/union left-hand side. -3.3.2.3 -Selector requires struct/union as left hand side -In K&R mode the expression is implicitly converted to the '->' selector -for a struct/union pointer left-hand side. -3.3.2.3 -member of structure or union required -3.3.2.3 -types have different qualifier specifications -For two qualified types to be compatible, both shall have the -identically qualified version of a compatible type; qualified -and unqualified versions of a type are distinct types. For two -types to be compatible their types must be the same. -3.5.3(26) -Incompatible array type due to different array size -For two array types to be compatible, both shall have compatible element -types; if both size specifiers are present, they shall have the -same value. -3.5.4.2(11) -Incompatible array type due to incompatible element type -For two array types to be compatible, both shall have compatible element -types. -3.5.4.2(11) -Incompatible pointer type assignment -The type pointed to by the left-hand side of simple assignment -statement is incompatible with the type pointed to by the right-hand side. -3.3.16.1, 3.5.4.1(21) -Incompatible base type of pointer type -K&R feature. -Type %s of %s is incompatible with type %s of %s -Incompatible types can be resolved by casting or by other means. -3.3.16.1 -illegal combination of pointer and integer -Assigning an integral expression to a pointer is a bad practice. -Type for %s is incompatible with %s -Incompatible types can be resolved by casting or by other means. -3.1.2.6 -Bad operand type for += or -= -3.3.16.2(26) -A case or default label appears outside a switch statement -A case or default label shall appear only in a switch statement. -3.6.1 -The controlling expression of the if statement is not scalar type -The controlling expression of an if statement shall have scalar type. -3.6.4.1 -The controlling expression of switch statement is not integral type -The controlling expression of an switch statement shall have integral type. -3.6.4.2(20) -The case label is not an integral constant expression -The case label shall be an integral constant expression. -3.6.4.2(22) -Duplicate case label in the same switch statement -No two of the case constant expressions in the same switch statement -shall have the same value after conversion. -3.6.4.2(22) -More than one default label in the same switch statement -There may be at most one default label in a switch statement. -3.6.4.2(23) -The controlling expression of the iteration statement is not scalar -type -The controlling expression of a iteration statement shall have scalar -type. -3.6.5.1 -label '%s' used, but not defined -The identifier in a goto statement shall name a label located -somewhere in the enclosing function. -3.6.6.1 -A continue statement shall appear only in or as a loop body -3.6.6.2 -A break statement shall appear only in or as a switch body or loop body -3.6.6.3 -A return statement with an expression should not appear -in a function '%s', whose return type is void -3.6.6.4(24) -A return statement without an expression appears in a -function '%s', whose return type is not void -If a return statement without an expression is executed, and the value -of the function call is used by the caller, the behavior is undefined. -3.6.6.4(33) -Internal Error: statement stack underflow -Long double not supported; double assumed. -Long float not standard; double assumed. -Only 'register' allowed in parameter declaration -The only storage-class specifier that shall occur in a parameter -declaration is 'register'; illegal storage class ignored. -3.5.4.3(25) -Name(s) without types in a function declaration -An old-style function declaration is not allowed to have names -in the parameter list; useless names ignored -3.5.4.3(26) -Functions cannot return functions -3.7.1(33), 3.3.2.2 -Functions cannot return a non-object type -3.3.2.2 -enum declaration must contain enum literals -Although structs or unions may delay the declaration of their members, -a similar construction with enum does not exist and is not necessary, -as there can be no mutual dependencies between the declaration of an -enumerated type and any other type. -3.5.2.3(27) -Register qualification has no effect for this type of object -Register declarations for array, struct, and function types have -no effect. -3.5.1(16), 3.5.1(19) -Functions cannot be declared 'register' -The declaration of an identifier for a function that has block -scope shall have no explicit storage-class specifier other than -'extern'. -3.5.1(19) -'%s' cannot be initialized -The type of the entity to be initialized shall be an object type -or an array of unknown size. -3.5.7(32) -Cannot initialize 'extern' variable '%s' within a function -If the declaration of an identifier has block scope, and the -identifier has 'extern' or 'static' linkage, the declaration -shall have no initializer for the identifier; initialization -allowed anyway. -3.5.7(35) -initializing an 'extern' is an ANSI C extension -conflicting declarations for '%s' -'static' and 'extern' declarations conflict. Which is meant? -3.1.2.2(15), 3.1.2.2(27) -Too many initial values for '%s' -3.5.7(1) -incompatible types in initialization -3.3.16(35) -redefinition of '%s'; previous definition at line %s in file '%s' -Identifier redeclared in the same scope/block. -3.1.2.3 -bit-fields as members of a union are an ANSI C invention. -storage size for '%s' isn't known -type mismatch in initialization -Missing braces in a union initialization or illegally formed -initialization. -3.5.7(5) -union '%s' only allowed one initializer for the first member -3.5.7(5) -width of '%s' exceeds its type -the specified bitfield width is too large to be contained within a -bitfield type. -structure has no member named '%s' -This is allowed for compatibility with AT&T pcc-based compilers. -Reference of an expression of void type or an incomplete type. -3.2.2.1 -element size of an array shall not be zero -3.2.2.5(25) -invalid combination of type specifiers -Although order is unimportant, not all type specifiers can occur together. -3.5.2 -declaration must at least declare an identifier, tag, or the member of an enumeration -3.5(16) -at most one storage class may be given in the declaration -Duplicate occurrence ignored. -3.5.1(10) -size of function's return type is zero -The return type of a function must be void or an object type other than array. -3.7.1(33) -Expecting an integral return type from the main function -identifier missing from parameter declaration -Prototypes for function definitions require identifiers in parameter -declarations. -3.7.1(4) -only 'register' allowed for storage class for parameters -The declarations in the declaration list shall contain no storage class -other than 'register', and no initializations. -3.7.1(10) -parameters declarations can not have initializations -3.7.1(10) -only one instance of 'void' allowed in the parameter list -'void' must occur by itself (specifying that the function has no parameters). -3.5.4.3(1) -%s must have function type -1) An argument list must be explicitly present in the declarator; it cannot - be inherited from a typedef (3.5.4.3). -2) The declarator is not a function. -3.7.1(30) -Illegal hexadecimal constant -You have no digits after the 0x or 0X. 0x0 assumed. -3.1.3.2 -value overflows its type in this context. Value is set to be '%s'! -3.2.1.4 -value is outside range representable for type '%s' -missing member name -K&R mode permits a missing member name; otherwise, only bitfields can omit -the member name. -3.5.2.1(10) -useless keyword or type name in declaration -Type was ignored. -'%s' declared within and is limited to this function prototype -Possible program error, since parameter type checking will always fail -unless the type declaration is visible to the caller. -3.1.2.1(35) -Extra spaces within operator, %s assumed -In ANSI C, the compound assignment operator cannot have embedded -white space characters. -3.1.5 -missing size for array '%s' -Incomplete types permitted for identifiers with internal or -external linkage, but not automatic linkage. -3.1.2.5(10) -can't jump into (from outside of) the body of a 'try' or into either type of handler -'%s' missing, please #include excpt.h -excpt.h required to declare exception statements, intrinsics or compiler -runtime names. -local function declarations cannot be 'static' -A function declaration can only contain the storage-class 'static' -if it is at file scope. Declaration made 'extern'. -3.5.1(19) -static function '%s' declared and referenced, but not defined. -If an identifier declared with internal linkage is used in an -expression (other than as a part of the operand of a sizeof -operator), there shall be exactly one external definition for -the identifier in the translation unit. -3.7(12) -pragma argument '%s' must be declared prior to being used in a pragma -Pragma name ignored. -Pragma not supported -'%s' not enabled as intrinsic -It may have already appeared in a function pragma, or never occurred in -an intrinsic pragma. -'%s' is already enabled as an intrinsic -weak definition for '%s' is later redefined; pragma weak ignored. -definition of primary name '%s' not found; pragma weak ignored. -definition of secondary name '%s' not found; pragma weak ignored. -primary name '%s' is declared as a common or external, and is not defined -with initial value within this file; pragma weak ignored. -useless '%s' storage class ignored -array of functions not allowed -The element type must be an object type representing a region -of data storage which can represent values. -3.1.2.5(23) -array of voids not allowed -The element type must be an object type representing a region -of data storage which can represent values. -3.1.2.5(23) -argument for pragma pack must be an integer constant; pragma ignored -'%s' has wrong tag type. -Identifier redeclared in the same scope/block. -3.1.2.3 -missing dimension bound -For multidimensional arrays, the constant bounds of the array may be -omitted only for the first member of the sequence. -3.1.2.5(23) -Internal error in parameters to function substr; loc: '%s'; len: '%s'. -Internal error in parameters to function insertstr; indx: '%s'. -Internal error in function get_tag_name; input is a non-tagged type. -Internal error in function gen_type_str -- not a type tree '%s' -Cannot open file '%s' -Prototype should be moved after tag or a typedef declaration. -Please look for comments in the extracted header file. -The extracted header file includes prototypes for static functions, -which should be removed, if you wish to include the header in a source file -other than the originator. -ANSI C requires formal parameter before "..." -This extension is meant to be used for compatibility with varargs.h -3.5.4.3(35) -syntax error: "&..." invalid -extension used to access "..." formal arguments. -function '%s' initialized like a variable -The type of entity to be initialized shall be an object type or an -array of unknown size. -3.5.7(31) -initializer not an array aggregate -The initializer for an object that has aggregate type shall be a -brace-enclosed list of initializers for the members of the aggregate, -written in increasing subscript or member order. -3.5.7(20) -'%s' type is incomplete; cannot initialize -Was the struct ever defined? -3.5.7.(31) -'%s' is not standard ANSI. -This keyword/type is not defined in strict ANSI mode. -3.1.1 -not a legal asm string -The first operand of an asm string should be, after argument substitution, -a legal assembly string. -The -float option will be ignored in ANSI mode. -The -float option is ignored, since otherwise program semantics would -violate the ANSI standard. In particular, fp constants are always -'double' with ANSI-C, while with -float the type of fp constants will -depend on the context and may be 'float'. -ANSI C support unavailable with C compiler bundled with RISC/os -The C compiler bundled with RISC/os does not support ANSI C. ANSI -C support requires a separate license. -Ignored invalid warning number(s) in -woff option, %s%s ! -Warning numbers must be in the range %s to %s. -The set of warning numbers in cfe is disjoint from the set of warning numbers -in accom, since accom warnings cannot be mapped one-to-one to cfe warnings. -'%s' not handled as an intrinsic due to incompatible argument types . -'__unalign' only qualifies pointers -'__unalign' indicates the object pointed at by pointer is unaligned (e.g., -int * __unalign p). This is an extension to ANSI C and like 'volatile' -and 'const' can follow the '*' in pointer declarations, but unlike both -cannot qualify a base type. -index expression is an anachronism -ANSI C++ doesn't support array index expressions in delete. -5.3.4 -member cannot be of function or incomplete type. -3.5.2.1(12) -Illegal lint option, '%s', is ignored. -cannot open header message buffer file -cannot write header message buffer file -cannot read header message buffer file -cannot seek in header message buffer file -struct/union/enum '%s' is used, but not defined -static '%s' unused -nonportable character comparison (chars may be signed or unsigned) -redundant comparison of unsigned with constant expression -redundant statement, control flow cannot reach this statement -'%s' may be used before set -function parameter '%s' is not used in function '%s' -'%s' can be const qualified, since it is not set within its lifetime. -'%s' is not used in function '%s' -'%s' set but unused in function '%s' -control may fall through %s statement -function '%s' has return(e); and return; -function '%s' may return random value to place of invocation %s -label without goto: '%s' -width of %s constant is smaller than size of type (%s) -explicit conversion from '%s' to '%s' %s -implicit conversion from '%s' to '%s' %s -'%s' may be indistinguishable from '%s' due to internal name truncation -Promoted formal parameter and promoted argument have incompatible types -No prototype for the definition of '%s' %s -References to '%s' are substituted by its literal initializer - (as included in %s) -============== -unsupported language linkage -string-literal specifies an unsupported linkage -7.4(1) -No prototype for the call to %s -To achieve better type-checking, there should be a full prototype for -the function being called. -3.5.4.3 -'inline' only applies to function declarations -leave statment can occur only within try body -Microsoft extension -Use of a Microsoft extension detected without usage of the -compiler option -msft. -No parameter mentioned -A file with no declarations or definitions is accepted as an extension to ANSI C -The translation unit must contain at least one external definition. -3.7 -Incompatible signed and unsigned version of a type -Yacc initialization error -Internal error: yacc cannot initialize itself. -The cfe option %s may not be in future releases. We suggest that you not use this option! -Incompatible char and unsigned char versions of a type -Lshift with undefined behaviour. -Lshift with a negative right operand, or a right operand that is greater -than or equal to the width in bits of the promoted left operand, results -in undefined behaviour. -3.3.7(11) -useless type name in declaration, possibly a semicolon is missing. -Type was ignored. -constant initializer expression is invalid (refers to automatic variables). -All the expressions in an initializer for an object that has static storage -duration or in the initializer list for an object that has aggregate or -union type shall be constant expressions. Otherwise, unexpected results -may occur. -3.5.7(32) and 3.4 -invalid explicit or implicit conversion of an address constant to an integral value in a constant initializing expression. -An address constant in a constant initializing expression can neither -initialize a bit-field nor be directly or indirectly converted to an -integral type of size different from an address type. -6.4 diff --git a/tools/ido_recomp/linux/5.3/ugen b/tools/ido_recomp/linux/5.3/ugen deleted file mode 100755 index d356300bfc..0000000000 Binary files a/tools/ido_recomp/linux/5.3/ugen and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/ujoin b/tools/ido_recomp/linux/5.3/ujoin deleted file mode 100755 index 5a3162799e..0000000000 Binary files a/tools/ido_recomp/linux/5.3/ujoin and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/uld b/tools/ido_recomp/linux/5.3/uld deleted file mode 100755 index a65a2239ba..0000000000 Binary files a/tools/ido_recomp/linux/5.3/uld and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/umerge b/tools/ido_recomp/linux/5.3/umerge deleted file mode 100755 index 36fa5ac6e6..0000000000 Binary files a/tools/ido_recomp/linux/5.3/umerge and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/uopt b/tools/ido_recomp/linux/5.3/uopt deleted file mode 100755 index f446420873..0000000000 Binary files a/tools/ido_recomp/linux/5.3/uopt and /dev/null differ diff --git a/tools/ido_recomp/linux/5.3/usplit b/tools/ido_recomp/linux/5.3/usplit deleted file mode 100755 index 5aa4151ed4..0000000000 Binary files a/tools/ido_recomp/linux/5.3/usplit and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/as0 b/tools/ido_recomp/macos/5.3/as0 deleted file mode 100755 index 1d2b7a7254..0000000000 Binary files a/tools/ido_recomp/macos/5.3/as0 and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/as1 b/tools/ido_recomp/macos/5.3/as1 deleted file mode 100755 index 44fada1c50..0000000000 Binary files a/tools/ido_recomp/macos/5.3/as1 and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/cc b/tools/ido_recomp/macos/5.3/cc deleted file mode 100755 index 9e3c8f8c99..0000000000 Binary files a/tools/ido_recomp/macos/5.3/cc and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/cfe b/tools/ido_recomp/macos/5.3/cfe deleted file mode 100755 index 86d98c79d3..0000000000 Binary files a/tools/ido_recomp/macos/5.3/cfe and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/err.english.cc b/tools/ido_recomp/macos/5.3/err.english.cc deleted file mode 100755 index 6976e38a95..0000000000 --- a/tools/ido_recomp/macos/5.3/err.english.cc +++ /dev/null @@ -1,1260 +0,0 @@ -@ - 358 358 358 - 6464 6482 6553 - 6553 6593 6728 - 6728 6746 6803 - 6803 6808 6808 - 6808 6818 6818 - 6818 6826 6826 - 6826 6847 6847 - 6847 6875 6922 - 6922 6930 6930 - 6930 6939 6939 - 6939 6948 6948 - 6948 6974 7120 - 7120 7149 7204 - 7210 7248 7311 - 7317 7350 7442 - 7450 7497 7627 - 7635 7709 7930 - 7938 7975 8063 - 8071 8113 8253 - 8261 8289 8289 - 8298 8338 8445 - 8460 8502 8635 - 8650 8690 8819 - 8834 8857 8965 - 8965 9008 9113 - 9119 9142 9227 - 9235 9282 9451 - 9451 9462 9462 - 9462 9477 9477 - 9477 9497 9497 - 9497 9545 9545 - 9545 9584 9584 - 9584 9604 9662 - 9662 9682 9720 - 9720 9749 9749 - 9749 9788 9788 - 9788 9802 9802 - 9802 9829 9829 - 9829 9861 9861 - 9861 9904 9904 - 9904 9920 9920 - 9920 9962 9962 - 9962 9988 9988 - 9988 10014 10014 -10014 10035 10035 -10035 10054 10097 -10097 10115 10115 -10115 10147 10147 -10147 10183 10183 -10183 10208 10208 -10208 10236 10236 -10236 10269 10269 -10269 10304 10304 -10304 10328 10328 -10328 10351 10351 -10351 10371 10371 -10371 10402 10402 -10402 10447 10447 -10447 10497 10497 -10497 10533 10533 -10533 10598 10598 -10606 10630 10630 -10640 10671 10671 -10690 10719 10719 -10728 10752 10795 -10795 10837 10837 -10837 10876 10876 -10876 10900 10900 -10900 10948 10948 -10960 11021 11103 -11103 11128 11128 -11128 11153 11153 -11153 11216 11216 -11216 11239 11239 -11239 11303 11303 -11303 11347 11347 -11357 11393 11393 -11393 11432 11432 -11442 11494 11494 -11494 11536 11536 -11536 11595 11595 -11595 11622 11622 -11622 11684 11684 -11684 11726 11726 -11738 11778 11778 -11782 11813 11813 -11813 11850 11850 -11850 11900 12087 -12111 12120 12120 -12120 12129 12129 -12129 12158 12158 -12158 12192 12192 -12192 12237 12237 -12237 12273 12273 -12273 12326 12326 -12330 12366 12366 -12366 12423 12423 -12427 12482 12482 -12486 12560 12560 -12568 12631 12631 -12637 12691 12691 -12691 12743 12743 -12743 12785 12785 -12785 12826 12826 -12826 12865 12865 -12865 12883 12883 -12883 12946 12946 -12956 12995 12995 -13005 13066 13066 -13077 13163 13163 -13163 13211 13211 -13211 13270 13270 -13270 13318 13318 -13318 13350 13350 -13350 13387 13387 -13387 13428 13428 -13428 13464 13533 -13533 13580 13737 -13737 13776 13854 -13854 13913 13913 -13913 13950 13950 -13950 14118 14118 -14118 14150 14150 -14150 14163 14194 -14194 14224 14255 -14255 14275 14319 -14319 14353 14458 -14466 14484 14530 -14534 14567 14567 -14567 14635 14682 -14690 14742 14742 -14742 14789 14789 -14801 14875 14875 -14886 14947 14947 -14947 14992 14992 -14992 15035 15085 -15085 15134 15205 -15214 15267 15448 -15454 15496 16810 -16822 16875 16960 -16972 17053 17179 -17191 17236 17332 -17344 17491 17841 -17853 17939 18304 -18316 18471 18774 -18786 18952 19323 -19335 19364 19496 -19500 19527 19598 -19598 19613 19776 -19797 19808 19837 -19837 19862 19862 -19868 19927 20026 -20034 20075 20179 -20187 20223 20223 -20223 20290 20382 -20392 20441 20589 -20601 20656 20656 -20656 20699 20818 -20826 20860 21038 -21046 21094 21191 -21203 21236 21314 -21326 21395 21457 -21469 21502 21502 -21502 21587 21731 -21756 21789 21864 -21875 21901 21976 -22013 22059 22220 -22257 22397 22561 -22561 22595 22595 -22603 22623 22623 -22631 22667 22828 -22865 22919 22994 -23031 23059 23120 -23132 23201 23201 -23212 23274 23274 -23285 23345 23345 -23356 23393 23393 -23399 23431 23532 -23542 23587 23646 -23656 23697 23745 -23755 23796 23844 -23854 23876 23928 -23942 23971 24153 -24160 24243 24243 -24247 24273 24743 -24755 24784 24984 -24996 25034 25034 -25034 25075 25273 -25281 25332 25410 -25420 25467 25544 -25554 25583 25744 -25754 25783 26061 -26071 26111 26185 -26194 26239 26525 -26535 26568 26914 -26924 26951 26998 -27008 27035 27082 -27093 27120 27167 -27178 27206 27251 -27261 27289 27334 -27345 27391 27931 -27938 27959 28007 -28019 28037 28037 -28043 28069 28069 -28077 28147 28199 -28207 28266 28266 -28274 28306 28306 -28314 28339 28339 -28347 28404 28510 -28518 28567 28682 -28690 28728 28728 -28736 28782 29023 -29033 29085 29234 -29246 29303 29383 -29395 29432 29570 -29592 29631 29644 -29644 29693 29758 -29767 29810 29875 -29875 29911 29976 -29984 30014 30014 -30027 30086 30151 -30157 30223 30293 -30301 30369 30445 -30457 30511 30568 -30580 30630 30743 -30755 30812 30874 -30886 30959 31035 -31043 31076 31175 -31183 31243 31243 -31251 31323 31323 -31331 31433 31433 -31445 31544 31686 -31698 31740 31740 -31740 31783 31783 -31783 31824 31824 -31824 31873 31996 -32008 32056 32164 -32176 32210 32210 -32229 32271 32271 -32279 32323 32569 -32581 32642 32718 -32739 32779 32916 -32926 32953 33047 -33057 33116 33315 -33325 33373 33373 -33373 33407 33469 -33494 33527 33527 -33536 33573 33573 -33584 33650 33697 -33705 33763 33763 -33763 33797 33797 -33797 33829 33906 -33915 33976 33976 -33985 34016 34098 -34098 34133 34198 -34198 34261 34261 -34269 34312 34312 -34324 34363 34438 -34444 34530 34530 -34538 34596 34626 -34636 34675 34754 -34764 34821 34821 -34821 34867 34950 -34959 35016 35135 -35145 35198 35198 -35208 35266 35344 -35355 35382 35537 -35547 35576 35629 -35637 35705 35705 -35713 35764 35764 -35764 35784 35876 -35888 35932 35950 -35950 36013 36138 -36150 36191 36280 -36286 36314 36419 -36431 36516 36516 -36516 36554 36642 -36642 36689 36808 -36818 36881 37105 -37113 37183 37204 -37204 37225 37225 -37225 37255 37348 -37348 37388 37388 -37388 37454 37454 -37454 37518 37518 -37518 37584 37584 -37584 37717 37717 -37717 37752 37752 -37752 37783 37889 -37901 37928 38034 -38046 38115 38115 -38115 38140 38187 -38195 38219 38339 -38351 38422 38422 -38422 38486 38486 -38486 38555 38555 -38555 38619 38619 -38619 38641 38641 -38641 38758 38758 -38758 38929 38929 -38929 38975 39043 -39055 39084 39133 -39133 39175 39265 -39275 39310 39494 -39504 39547 39576 -39587 39614 39668 -39674 39697 39797 -39797 39845 40094 -40094 40158 40264 -40264 40369 40523 -40523 40593 40593 -40593 40629 40876 -40876 40911 40971 -40977 41026 41026 -41038 41077 41077 -41077 41116 41116 -41116 41156 41156 -41156 41195 41195 -41195 41237 41237 -41237 41285 41285 -41285 41304 41304 -41304 41371 41371 -41371 41429 41429 -41429 41491 41491 -41491 41519 41519 -41519 41572 41572 -41572 41642 41642 -41642 41676 41676 -41676 41713 41713 -41713 41751 41751 -41751 41792 41792 -41792 41856 41856 -41856 41881 41881 -41881 41936 41936 -41936 41977 41977 -41977 42018 42018 -42018 42090 42090 -42090 42162 42162 -42162 42205 42205 -42205 42267 42267 -42267 42294 42294 -42294 42309 42309 -42309 42338 42386 -42393 42425 42522 -42530 42577 42577 -42577 42623 42623 -42623 42643 42725 -42725 42748 42748 -42748 42829 42897 -42901 42952 42952 -42952 42978 43025 -43025 43116 43116 -43116 43171 43171 -43171 43204 43376 -43386 43453 43471 -43471 43547 43780 -43798 43921 44116 -44120 44120 44120 -Out of memory: %s -There is no more memory left in the system for compiling this program. -Internal Error Unknown Error Message %s -1) An internal error, while attempting to print an unavailable message -2) The error message file is inaccessible or has other problems -Unknown Signal %s -1) An unknown signal has been caught -2) 2 Nested signals -line -Warning: -Fatal: -Source not available -Too many errors... goodbye. -There is a limit of 30 errors before aborting. -Error: -reserved -reserved -Unknown Control Statement -1) The line begins with a '#' and is not of the form: - # "" -2) Please compile this program with the preprocessor enabled. -Unknown character %s ignored -The character is not part of the source character set. -2.2.1 -Unknown control character \%s ignored -The control character is not part of the source character set. -2.2.1 -Illegal character %s in exponent -1) Digits or sign expected after 'e' or 'E'. -2) Digits are expected after sign in exponent. -3.1.3.1 -Constant is out of range and may be truncated. -The constant is too large to be accurately represented and may be -truncated. The limits are in the system include file limits.h. -2.2.4.2 -Constant is out of range for a 32-bit data type, but accepted as written. -The constant is too large to fit in a 32-bit data type, but will be -accurately represented in a wider data type. The value may be truncated, -depending on its context. The limits are in the system include file -limits.h. -2.2.4.2 -Character constant size out of range -1) No characters in a character constant. -2) More than 4 bytes in a character constant. -3.1.3.4 -Wide character constant size out of range -1) No characters in the multibyte sequence (0 assumed). -2) More than 1 byte in the multi-byte sequence (only the first byte was converted). -3.1.3.4 -Invalid multibyte character -4.10.7.2 -Newline in string or character constant -1) Terminate your string or character constant with closing quotes. -2) Put a backslash before the newline. -3.1.3.4, 3.1.4 -Octal character escape too large: %s > %s -1) Terminate end of octal sequence with a non-octal character. -2) Select a character value within the limits. -Value may be truncated -3.1.3.4, 3.1.4 -Hex character escape too large: %s > %s -1) Terminate end of hex sequence with a non-hex character. -2) Select a character value within the limits. -Value may be truncated -3.1.3.4, 3.1.4 -Unexpected End-of-file -1) Unterminated string or character constant -2) Missing closing comment marker (*/) -3) File system problems -Unrecognized escape sequence in string \%s -Recognized escape sequences are \a, \b, \f, \n, \r, \t, and \v. -Character will be treated as un-escaped. -3.9.2 -Illegal octal digit %s -Octal constants, beginning with 0, must only have digits between 0 and 7, -inclusive. -3.1.3.2 -Unable to open temporary file for compiling %s -1) TMPDIR environment variable is set to a directory that you have no - permissions for. -2) The file system is full. -3) System errors beyond the scope of the compiler. -%s: Hangup -%s: Interrupt -%s: Quit (ASCII FS) -%s: Illegal instruction (not reset when caught) -%s: Trace trap (not reset when caught) -%s: IOT instruction -Also SIGABRT, used by abort, replace SIGIOT in the future -%s: EMT instruction -Also SIGXCPU, Exceeded CPU time limit -%s: Floating point exception -%s: Kill (cannot be caught or ignored) -%s: Bus error -%s: Segmentation violation -%s: Bad argument to system call -%s: Write on a pipe with no one to read it -%s: Alarm clock -%s: Software termination signal from kill -%s: User defined signal 1 -%s: User defined signal 2 -%s: Death of a child -Power-fail restart -%s: Also SIGXFSZ, exceeded file size limit -%s: Window change -%s: Handset, line status change -%s: Sendablestop signalnot from tty -%s: Stop signal from tty -%s: Pollable event occurred -%s: Input/Output possible signal -%s: Urgent condition on IO channel -%s: Window size changes -%s: Virtual time alarm -%s: Profiling alarm -%s: Continue a stopped process -%s: To readers pgrp upon background tty read -%s: Like TTIN for output if (tp->t_local<OSTOP) -%s: Resource lost (eg, record-lock) -'auto' and 'register' are not allowed in an external declaration -3.7(10) -must have function type -3.7.1(30) -Functions cannot return arrays -3.7.1(33), 3.3.2.2 -Declaration list not allowed -3.7.1(5) -Too many input files %s -The command line may contain only one file -cpp internal error: input stack underflow -cpp internal error: if stack underflow -Cannot open the file %s -No new-line character at the end of the file %s -2.1.1.2(30) -Fatal: Exceeded the limit of nesting level for #include file -Fatal: Exceeded the limit of nesting level for #include file. This limit -is 200. -Fail to read the file %s -Cannot write the file %s -%s: %s: An if directive is not terminated properly in the file -%s: %s: nested comment -%s:%s: Illegal macro name %s; macro name shall be an identifier -%s:%s: Illegal preprocessing token sequence -3.8.3(35) -%s:%s: Illegal macro parameter name -%s:%s: Non-unique macro parameter name -3.8.3(18) -%s:%s: Missing ')' in parameter list for #define %s -%s:%s: Missing ')' in macro instantiation -%s:%s: Bad punctuator in the parameter list for #define %s -%s:%s: Macro %s redefined. -%s:%s: # operator should be followed by a macro argument name -%s:%s: Badly formed constant expression%s -3.4(9), 3.8 -%s:%s: Division by zero in #if or #elif -3.8 -unknown command line option %s -extraneous input/output file name %s -%s: %s: Unterminated string or character constant -A preprocessing string or character constant token was not -terminated. Note that preprocessing directives are processed -after the source file has been divided into preprocessing tokens. -2.1.1.2(30) 3.1(18) 3.8 -%s: %s: -%s: %s: -%s: %s: Unterminated comment -%s: %s: Unknown directive type %s -%s: %s: #elif or #else after #else directive -%s: %s: Bad identifier after the %s -%s: %s: #%s accepts only one identifier as parameter -3.8 -%s: %s: Bad identifier after the %s -%s: %s: text following #%s violates the ANSI C standard. -3.8 -%s: %s: Bad character %s occurs after the # directive. -3.8 -%s: %s: the ## operator shall not be the %s token in the replacement list -3.8.3.3 -%s: %s: the defined operator takes identifier as operand only. -3.8.1 -%s: %s: Not in a conditional directive while using %s -%s: %s: Illegal filename specification for #include -%s: %s: Invalid file name %s for #include -%s: %s: Cannot open file %s for #include -%s: %s: Bad argument for #line command -%s: %s: #error %s -%s: %s: Tried to redefine predefined macro %s, attempt ignored -3.8.7(22) -%s: %s: Undefining predefined macro %s -3.8.7(22) -%s: %s: Undefined the ANSI standard library defined macro %s -4.1.2.1(9) -%s: %s: The number of arguments in the macro invocation does not match the definition -%s: %s: Illegal character %s in preprocessor if -%s: %s: Illegal character %s for number in preprocessor if -%s: %s: No string is allowed in preprocessor if -%s: %s: Not supported pragma %s -%s: %s: Not supported #pragma format -%s: %s: ANSI C does not allow #ident; %s -%s: %s: Not supported #ident format -This cpp extension accepts the following format: -#ident "any string" -%s: %s: Not supported #assert/#unassert format -This cpp extension accepts the following format: -#assert identifier -#assert identifier ( pp-tokens ) -#unassert identifier -#unassert identifier ( pp-tokens ) -%s: %s: Bad assertion predicate format -The correct syntax for this cpp extension is: -#assert identifier ( pp-token ) -%s: %s: directive is an upward-compatible ANSI C extension -%s: This option requires an argument -%s: %s: A macro has expanded recursively more than %s times. Further expansion will be disabled! Use command-line option: -Wp,-max_rec_depth=depth to recurse deeper. -A status return from cpp to cfe -Syntax Error -The token read was unexpected. -Syntax Error -- cannot backup -The token read was unexpected. -Yacc stack overflow -The expression is too complicated to parse. -Trailing comma in enumerator list -The use of a trailing comma in an enumerator list is not standard C. There -may be portability problems. -3.5.2.2 -Empty declaration -Empty declarations are invalid in standard C. -3.5 -%s declared, but not referenced. -redeclaration of '%s'; previous declaration at line %s in file '%s' -Identifier redeclared in the same scope/block. -3.1.2.3 -'%s' undefined; reoccurrences will not be reported. -Non-function name referenced in function call. -3.3.2.2(18) -The number of arguments doesn't agree with the number in the declaration. -3.3.2.2(5) -'%s' section name longer than 8 characters. Name truncated. -'%s' is already placed by pragma alloc_text. -Cannot write ucode file while compiling %s -1) The file system is full -2) Permissions problem -Must have corresponding formal argument for '%s' -Parameter found in the declaration part, but not in the argument list. -3.7.1(7) -Non-prototype declaration is an obsolescent feature. -The use of function definitions with separate parameter identifier -and declaration lists (not prototype-format parameter type and -identifier declarators) is an obsolescent feature. -3.9.5 -Incompatible function declarations for %s -For two function types to be compatible, both shall specify compatible -return types. Moreover, the parameter type lists, if both are present, -shall agree in the number of parameters and in use of the ellipsis -terminator; corresponding parameters shall have compatible types. If -one type has a parameter type list and the other type is specified by -a function declarator that is not part of a function definition and -contains an empty identifier list, the parameter list shall not have -an ellipsis terminator and the type of each parameter shall be -compatible with they type that results from application of the default -argument promotions. If one type has a parameter type list and the -other is specified by a function definition that contains a (possibly -empty) identifier list, both shall agree in the number of parameters, -and the type of each prototype parameter shall be compatible with the -type that results from application of the default argument promotions -to the type of the corresponding identifier. (For each parameter -declared with function or array type, its type for these comparisons -is the one that results from conversion to a pointer type. For each -parameter declared with qualified type, its type for these comparisons -is the unqualified version of its declared type.) There you have it! -3.5.4.3(15) -Incompatible function return type for this function. -For two function types to be compatible, both shall specify compatible -return types. -3.5.4.3(15) -The number of parameters for function is different from the previous declaration -The parameter type lists, if both are present, shall agree in the -number of parameters and in use of the ellipsis terminator. -3.5.4.3(15) -Incompatible type for the function parameter -If both parameter type lists are present, corresponding -parameters shall have compatible types. -3.5.4.3(15) -Function %s is redeclared with an incompatible argument type (after default argument promotion), which could lead to undefined run-time behaviour. -The redeclaration could cause arguments at a call site to be passed -inconsistently with what the function implementation expects, and -parameters would therefore be accessed erroneously when executing the -function body. Note that a float argument is promoted to a double -when passed (potentially through fp registers) to an unprototyped -function. -3.5.4.3(15) -prototype and non-prototype declaration found for %s, ellipsis terminator not allowed -If one type has a parameter type list and the other type is specified -by a function declarator that is not part of a function definition and -contains an empty identifier list, the parameter list shall not have -an ellipsis terminator and the type of each parameter shall be -compatible with they type that results from application of the default -argument promotions. -3.5.4.3(15) -prototype and non-prototype declaration found for %s, the type of this parameter is not compatible with the type after applying default argument promotion -If one type has a parameter type list and the other type is specified -by a function declarator that is not part of a function definition and -contains an empty identifier list, the type of each parameter shall be -compatible with the type that results from application of the default -argument promotions. -3.5.4.3(15) -prototype declaration and non-prototype definition found for %s, the type of this parameter is not compatible with the type after applying default argument promotion -If one type has a parameter type list and the other is specified by a -function definition that contains a (possibly empty) identifier list, -both shall agree in the number of parameters, and the type of each -prototype parameter shall be compatible with the type that results -from application of the default argument promotions to the type of the -corresponding identifier. -3.5.4.3(15) -Empty declaration specifiers -Standard C requires at least a storage class specifier, type specifier, -or a type qualifier in declarations. 'extern int' assumed. -3.5 -Can't write to the file %s -1) The output file cannot be opened for writing. -2) Out of file space. -Duplicate '%s' -typedef, extern, static, auto, register, const, volatile may not -appear more than once in the same specifier list or qualifier list. -Duplicate occurrence ignored. -3.5.1(10) , 3.5.3(5) -Null input -There is nothing to compile. -Illegal type combination -3.5.2 -Missing ';' at end of structure / union member declaration -In standard C, each member declaration must be terminated by a ';'. A -terminating ';' is assumed. -3.5.2.1 -Missing member name in structure / union -In standard C, each member declaration have a member name. The missing -member is assumed to not exist. -3.5.2.1 -This variable is initialized twice. -Neither 'const' or 'volatile' have any effect on function results. -Qualifiers only apply to expressions designating an object that -can be altered or examined. -3.5.3(10) -An integer constant expression is required here. -The expression that defines the value of an enumeration constant -shall be an integral constant expression that has a value -representable as an int. -3.5.2.2(28) -(previous declaration of '%s' at line %s in file '%s') -Must be an integer type greater than zero. -The array size must be either a char, signed or unsigned integer or -an enumerated type with a value greater than zero. -3.5.4.2 -Array size cannot be a long long. -Arrays with more than 2^32 elements are not yet supported. -The array size must be either a char, signed or unsigned integer or -an enumerated type with a value greater than zero. -3.5.4.2 -bit-field '%s' width is not an integer constant -The expression that specifies the width of a bit-field shall be an -integral constant expression. -3.5.2.1(15) -bit-field '%s' width is negative -The expression that specifies the width of a bit-field shall be -non-negative. -3.5.2.1(15) -bit-field '%s' type required to be int, unsigned int, or signed int. -A bit-field shall have type int, unsigned int, or signed int. -3.5.2.1(30) -bit-field %s's type not integer. -Non-scalar type or pointer type to a non-object for increment or decrement operator. -The operand of the prefix/postfix increment or decrement operator shall have scalar type; if it is of pointer type, it must point to an object. -3.3.2.4(37), 3.3.3.1(25) -Assign value to a function type. -An assignment operator shall have a modifiable lvalue as its left operand. -3.2.2.1(5) -Assign value to an array. -An assignment operator shall have a modifiable lvalue as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Change value for variable of incomplete type. -The operand of increment and decrement operator shall be a modifiable -scalar lvalue. An assignment operator shall have a modifiable lvalue -as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -The left-hand side of the '.' operator must be an addressable lvalue, when a bit-field is not contained within a unit of 32 bits alignment. -This is a restriction in our implementation, which can be worked -around by always accessing long long bit-fields indirectly (i.e. -by means of the '->' operator). -This expression is not an lvalue. -3.2.2.1 -Modified an rvalue. -3.2.2.1 -Change value for constant variable. -The operand of increment and decrement operators shall be modifiable -scalar lvalues. An assignment operator shall have a modifiable lvalue -as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Change value for constant field of a struct or union. -An assignment operator shall have a modifiable lvalue as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Dereferenced a non-pointer. -The operand of the unary * operator shall have pointer type. -3.3.3.2(39) -The operand of the unary + or - operator shall have arithmetic type. -3.3.3.3(6) -The operand of the unary ~ operator shall have integral type. -3.3.3.3(6) -The operand of the unary ! operator shall have scalar type. -3.3.3.3(6) -Constants must have arithmetic type. -3.1.3 -Bad type name for cast operator -The type name for the cast operator should either be void or a -qualified or unqualified scalar type. -3.3.4(22) -Improper cast of non-scalar type expression. -The operand for the cast operator shall be of scalar type. -3.3.4(23) -Cast a pointer into a non-integral type. -A pointer may be converted to an integral type. -3.3.4(31) -Cast a non-integral type into a pointer. -An integral type may be converted to a pointer. -3.3.4(31) -Duplicate member '%s' -Two members of a struct may not have the same name. -3.1.2.2(7,25) -Invalid constant expression. -Constant expressions shall not contain assignment, increment, decrement, -function-call, or comma operators, except when they are contained within -the operand of the sizeof operator. -3.4(9) -Constant expressions must be derived from a constant value or a constant -variable. -3.4 -Dangerous operand of '&'. -The operand of the unary & operator shall be either a function -designator or an lvalue that designates an object that is not a -bit-field and is not declared with the register storage-class -specifier. This operand is NOT an lvalue, but we let it pass. -Note that a segmentation error with possible core dump will result -when the resulting address does not denote a valid (declared) -storage location. This feature will be discontinued in future -releases of the compiler! -3.3.3.2(36) -Unacceptable operand of '&'. -The operand of the unary & operator shall be either a function -designator or an lvalue that designates an object that is not a -bit-field and is not declared with the register storage-class -specifier. -3.3.3.2(36) -'&' before array or function; ignored -Unacceptable operand of sizeof operator. -The sizeof operator shall not be applied to an expression that has -function type or an incomplete type, to the parenthesized name of such -a type, or to an lvalue that designates a bit-field object. -3.3.3.4 -Unacceptable operand of a multiplicative operator. -Each of the operands of a multiplicative operator shall have arithmetic type. -3.3.5(18) -Unacceptable operand of the remainder operator -Each of the operands of the remainder (%) operator shall have integral type. -3.3.5(18) -Unacceptable operand of '+'. -For the + operator, either both operands shall have arithmetic type, or -one operand shall be a pointer to an object type and the other shall -have integral type. -3.3.6(39) -Unacceptable operand of '-'. -For the subtraction operator, one of the following shall hold: both operands -have arithmetic type; operands are pointers to qualified or unqualified -versions of compatible object types; or the left operand is a pointer -to an object type and the right operand has integral type. -3.3.6(39) -Unacceptable operand of shift operator. -Each of the operands of bitwise shift operators shall have integral type. -3.3.7(9) -Unacceptable operand of relational operator. -For relational operators, one of the following shall hold: both -operands have arithmetic type; both operands are pointers to qualified -or unqualified versions of compatible object types; or both operands -are pointers to qualified or unqualified versions of compatible -incomplete types. -3.3.8(32) -Unacceptable operand of == or != -For the == or != operator, one of the following shall hold: both operands -are pointers to qualified or unqualified versions of compatible types; one -operand is a pointer to an object or incomplete type and the other is a -pointer to a qualified or unqualified version of void; or one operand is -a pointer and the other is a null pointer constant. -3.3.9(21) -Unacceptable operand of &. -Each of the operands shall have integral type. -3.3.10(7) -Unacceptable operand of ^. -Each of the operands shall have integral type. -3.3.11(18) -Unacceptable operand of |. -Each of the operands shall have integral type. -3.3.12(30) -Unacceptable operand of &&. -Each of the operands shall have scalar type. -3.3.13(7) -Unacceptable operand of ||. -Each of the operands shall have scalar type. -3.3.14(20) -Unacceptable operand of conditional operator. -The first operand of conditional operator shall have scalar type. One -of the following shall hold for the second and third operands: -both operands have arithmetic type; both operands have compatible -structure or union types; both operands have void type; both operands -are pointers to qualified or unqualified versions of compatible types; -one operand is a pointer and the other is a null pointer constant; or -one operand is pointer to an object or incomplete type and the other -is a pointer to a qualified or unqualified version of void. -3.3.15 -Duplicate label '%s' -A label name can only occur once in a function. -3.1.2.1(25) -Division by zero. -3.3.5 -Subscripting a non-array. -3.3.2.1 -Subscripting an array of incomplete type which is not an object type. -The element of the array shall have an object type. -3.3.2.1 -Should only subscript an array with an integral expression -3.3.2.1 -Subscripting an unbounded array -3.3.2.1 -Array index out of range -3.3.2.1 -Selector requires struct/union pointer as left hand side -In K&R mode the expression is implicitly converted to the '.' selector -for a struct/union left-hand side. -3.3.2.3 -Selector requires struct/union as left hand side -In K&R mode the expression is implicitly converted to the '->' selector -for a struct/union pointer left-hand side. -3.3.2.3 -member of structure or union required -3.3.2.3 -types have different qualifier specifications -For two qualified types to be compatible, both shall have the -identically qualified version of a compatible type; qualified -and unqualified versions of a type are distinct types. For two -types to be compatible their types must be the same. -3.5.3(26) -Incompatible array type due to different array size -For two array types to be compatible, both shall have compatible element -types; if both size specifiers are present, they shall have the -same value. -3.5.4.2(11) -Incompatible array type due to incompatible element type -For two array types to be compatible, both shall have compatible element -types. -3.5.4.2(11) -Incompatible pointer type assignment -The type pointed to by the left-hand side of simple assignment -statement is incompatible with the type pointed to by the right-hand side. -3.3.16.1, 3.5.4.1(21) -Incompatible base type of pointer type -K&R feature. -Type %s of %s is incompatible with type %s of %s -Incompatible types can be resolved by casting or by other means. -3.3.16.1 -illegal combination of pointer and integer -Assigning an integral expression to a pointer is a bad practice. -Type for %s is incompatible with %s -Incompatible types can be resolved by casting or by other means. -3.1.2.6 -Bad operand type for += or -= -3.3.16.2(26) -A case or default label appears outside a switch statement -A case or default label shall appear only in a switch statement. -3.6.1 -The controlling expression of the if statement is not scalar type -The controlling expression of an if statement shall have scalar type. -3.6.4.1 -The controlling expression of switch statement is not integral type -The controlling expression of an switch statement shall have integral type. -3.6.4.2(20) -The case label is not an integral constant expression -The case label shall be an integral constant expression. -3.6.4.2(22) -Duplicate case label in the same switch statement -No two of the case constant expressions in the same switch statement -shall have the same value after conversion. -3.6.4.2(22) -More than one default label in the same switch statement -There may be at most one default label in a switch statement. -3.6.4.2(23) -The controlling expression of the iteration statement is not scalar -type -The controlling expression of a iteration statement shall have scalar -type. -3.6.5.1 -label '%s' used, but not defined -The identifier in a goto statement shall name a label located -somewhere in the enclosing function. -3.6.6.1 -A continue statement shall appear only in or as a loop body -3.6.6.2 -A break statement shall appear only in or as a switch body or loop body -3.6.6.3 -A return statement with an expression should not appear -in a function '%s', whose return type is void -3.6.6.4(24) -A return statement without an expression appears in a -function '%s', whose return type is not void -If a return statement without an expression is executed, and the value -of the function call is used by the caller, the behavior is undefined. -3.6.6.4(33) -Internal Error: statement stack underflow -Long double not supported; double assumed. -Long float not standard; double assumed. -Only 'register' allowed in parameter declaration -The only storage-class specifier that shall occur in a parameter -declaration is 'register'; illegal storage class ignored. -3.5.4.3(25) -Name(s) without types in a function declaration -An old-style function declaration is not allowed to have names -in the parameter list; useless names ignored -3.5.4.3(26) -Functions cannot return functions -3.7.1(33), 3.3.2.2 -Functions cannot return a non-object type -3.3.2.2 -enum declaration must contain enum literals -Although structs or unions may delay the declaration of their members, -a similar construction with enum does not exist and is not necessary, -as there can be no mutual dependencies between the declaration of an -enumerated type and any other type. -3.5.2.3(27) -Register qualification has no effect for this type of object -Register declarations for array, struct, and function types have -no effect. -3.5.1(16), 3.5.1(19) -Functions cannot be declared 'register' -The declaration of an identifier for a function that has block -scope shall have no explicit storage-class specifier other than -'extern'. -3.5.1(19) -'%s' cannot be initialized -The type of the entity to be initialized shall be an object type -or an array of unknown size. -3.5.7(32) -Cannot initialize 'extern' variable '%s' within a function -If the declaration of an identifier has block scope, and the -identifier has 'extern' or 'static' linkage, the declaration -shall have no initializer for the identifier; initialization -allowed anyway. -3.5.7(35) -initializing an 'extern' is an ANSI C extension -conflicting declarations for '%s' -'static' and 'extern' declarations conflict. Which is meant? -3.1.2.2(15), 3.1.2.2(27) -Too many initial values for '%s' -3.5.7(1) -incompatible types in initialization -3.3.16(35) -redefinition of '%s'; previous definition at line %s in file '%s' -Identifier redeclared in the same scope/block. -3.1.2.3 -bit-fields as members of a union are an ANSI C invention. -storage size for '%s' isn't known -type mismatch in initialization -Missing braces in a union initialization or illegally formed -initialization. -3.5.7(5) -union '%s' only allowed one initializer for the first member -3.5.7(5) -width of '%s' exceeds its type -the specified bitfield width is too large to be contained within a -bitfield type. -structure has no member named '%s' -This is allowed for compatibility with AT&T pcc-based compilers. -Reference of an expression of void type or an incomplete type. -3.2.2.1 -element size of an array shall not be zero -3.2.2.5(25) -invalid combination of type specifiers -Although order is unimportant, not all type specifiers can occur together. -3.5.2 -declaration must at least declare an identifier, tag, or the member of an enumeration -3.5(16) -at most one storage class may be given in the declaration -Duplicate occurrence ignored. -3.5.1(10) -size of function's return type is zero -The return type of a function must be void or an object type other than array. -3.7.1(33) -Expecting an integral return type from the main function -identifier missing from parameter declaration -Prototypes for function definitions require identifiers in parameter -declarations. -3.7.1(4) -only 'register' allowed for storage class for parameters -The declarations in the declaration list shall contain no storage class -other than 'register', and no initializations. -3.7.1(10) -parameters declarations can not have initializations -3.7.1(10) -only one instance of 'void' allowed in the parameter list -'void' must occur by itself (specifying that the function has no parameters). -3.5.4.3(1) -%s must have function type -1) An argument list must be explicitly present in the declarator; it cannot - be inherited from a typedef (3.5.4.3). -2) The declarator is not a function. -3.7.1(30) -Illegal hexadecimal constant -You have no digits after the 0x or 0X. 0x0 assumed. -3.1.3.2 -value overflows its type in this context. Value is set to be '%s'! -3.2.1.4 -value is outside range representable for type '%s' -missing member name -K&R mode permits a missing member name; otherwise, only bitfields can omit -the member name. -3.5.2.1(10) -useless keyword or type name in declaration -Type was ignored. -'%s' declared within and is limited to this function prototype -Possible program error, since parameter type checking will always fail -unless the type declaration is visible to the caller. -3.1.2.1(35) -Extra spaces within operator, %s assumed -In ANSI C, the compound assignment operator cannot have embedded -white space characters. -3.1.5 -missing size for array '%s' -Incomplete types permitted for identifiers with internal or -external linkage, but not automatic linkage. -3.1.2.5(10) -can't jump into (from outside of) the body of a 'try' or into either type of handler -'%s' missing, please #include excpt.h -excpt.h required to declare exception statements, intrinsics or compiler -runtime names. -local function declarations cannot be 'static' -A function declaration can only contain the storage-class 'static' -if it is at file scope. Declaration made 'extern'. -3.5.1(19) -static function '%s' declared and referenced, but not defined. -If an identifier declared with internal linkage is used in an -expression (other than as a part of the operand of a sizeof -operator), there shall be exactly one external definition for -the identifier in the translation unit. -3.7(12) -pragma argument '%s' must be declared prior to being used in a pragma -Pragma name ignored. -Pragma not supported -'%s' not enabled as intrinsic -It may have already appeared in a function pragma, or never occurred in -an intrinsic pragma. -'%s' is already enabled as an intrinsic -weak definition for '%s' is later redefined; pragma weak ignored. -definition of primary name '%s' not found; pragma weak ignored. -definition of secondary name '%s' not found; pragma weak ignored. -primary name '%s' is declared as a common or external, and is not defined -with initial value within this file; pragma weak ignored. -useless '%s' storage class ignored -array of functions not allowed -The element type must be an object type representing a region -of data storage which can represent values. -3.1.2.5(23) -array of voids not allowed -The element type must be an object type representing a region -of data storage which can represent values. -3.1.2.5(23) -argument for pragma pack must be an integer constant; pragma ignored -'%s' has wrong tag type. -Identifier redeclared in the same scope/block. -3.1.2.3 -missing dimension bound -For multidimensional arrays, the constant bounds of the array may be -omitted only for the first member of the sequence. -3.1.2.5(23) -Internal error in parameters to function substr; loc: '%s'; len: '%s'. -Internal error in parameters to function insertstr; indx: '%s'. -Internal error in function get_tag_name; input is a non-tagged type. -Internal error in function gen_type_str -- not a type tree '%s' -Cannot open file '%s' -Prototype should be moved after tag or a typedef declaration. -Please look for comments in the extracted header file. -The extracted header file includes prototypes for static functions, -which should be removed, if you wish to include the header in a source file -other than the originator. -ANSI C requires formal parameter before "..." -This extension is meant to be used for compatibility with varargs.h -3.5.4.3(35) -syntax error: "&..." invalid -extension used to access "..." formal arguments. -function '%s' initialized like a variable -The type of entity to be initialized shall be an object type or an -array of unknown size. -3.5.7(31) -initializer not an array aggregate -The initializer for an object that has aggregate type shall be a -brace-enclosed list of initializers for the members of the aggregate, -written in increasing subscript or member order. -3.5.7(20) -'%s' type is incomplete; cannot initialize -Was the struct ever defined? -3.5.7.(31) -'%s' is not standard ANSI. -This keyword/type is not defined in strict ANSI mode. -3.1.1 -not a legal asm string -The first operand of an asm string should be, after argument substitution, -a legal assembly string. -The -float option will be ignored in ANSI mode. -The -float option is ignored, since otherwise program semantics would -violate the ANSI standard. In particular, fp constants are always -'double' with ANSI-C, while with -float the type of fp constants will -depend on the context and may be 'float'. -ANSI C support unavailable with C compiler bundled with RISC/os -The C compiler bundled with RISC/os does not support ANSI C. ANSI -C support requires a separate license. -Ignored invalid warning number(s) in -woff option, %s%s ! -Warning numbers must be in the range %s to %s. -The set of warning numbers in cfe is disjoint from the set of warning numbers -in accom, since accom warnings cannot be mapped one-to-one to cfe warnings. -'%s' not handled as an intrinsic due to incompatible argument types . -'__unalign' only qualifies pointers -'__unalign' indicates the object pointed at by pointer is unaligned (e.g., -int * __unalign p). This is an extension to ANSI C and like 'volatile' -and 'const' can follow the '*' in pointer declarations, but unlike both -cannot qualify a base type. -index expression is an anachronism -ANSI C++ doesn't support array index expressions in delete. -5.3.4 -member cannot be of function or incomplete type. -3.5.2.1(12) -Illegal lint option, '%s', is ignored. -cannot open header message buffer file -cannot write header message buffer file -cannot read header message buffer file -cannot seek in header message buffer file -struct/union/enum '%s' is used, but not defined -static '%s' unused -nonportable character comparison (chars may be signed or unsigned) -redundant comparison of unsigned with constant expression -redundant statement, control flow cannot reach this statement -'%s' may be used before set -function parameter '%s' is not used in function '%s' -'%s' can be const qualified, since it is not set within its lifetime. -'%s' is not used in function '%s' -'%s' set but unused in function '%s' -control may fall through %s statement -function '%s' has return(e); and return; -function '%s' may return random value to place of invocation %s -label without goto: '%s' -width of %s constant is smaller than size of type (%s) -explicit conversion from '%s' to '%s' %s -implicit conversion from '%s' to '%s' %s -'%s' may be indistinguishable from '%s' due to internal name truncation -Promoted formal parameter and promoted argument have incompatible types -No prototype for the definition of '%s' %s -References to '%s' are substituted by its literal initializer - (as included in %s) -============== -unsupported language linkage -string-literal specifies an unsupported linkage -7.4(1) -No prototype for the call to %s -To achieve better type-checking, there should be a full prototype for -the function being called. -3.5.4.3 -'inline' only applies to function declarations -leave statment can occur only within try body -Microsoft extension -Use of a Microsoft extension detected without usage of the -compiler option -msft. -No parameter mentioned -A file with no declarations or definitions is accepted as an extension to ANSI C -The translation unit must contain at least one external definition. -3.7 -Incompatible signed and unsigned version of a type -Yacc initialization error -Internal error: yacc cannot initialize itself. -The cfe option %s may not be in future releases. We suggest that you not use this option! -Incompatible char and unsigned char versions of a type -Lshift with undefined behaviour. -Lshift with a negative right operand, or a right operand that is greater -than or equal to the width in bits of the promoted left operand, results -in undefined behaviour. -3.3.7(11) -useless type name in declaration, possibly a semicolon is missing. -Type was ignored. -constant initializer expression is invalid (refers to automatic variables). -All the expressions in an initializer for an object that has static storage -duration or in the initializer list for an object that has aggregate or -union type shall be constant expressions. Otherwise, unexpected results -may occur. -3.5.7(32) and 3.4 -invalid explicit or implicit conversion of an address constant to an integral value in a constant initializing expression. -An address constant in a constant initializing expression can neither -initialize a bit-field nor be directly or indirectly converted to an -integral type of size different from an address type. -6.4 diff --git a/tools/ido_recomp/macos/5.3/ugen b/tools/ido_recomp/macos/5.3/ugen deleted file mode 100755 index add44a34df..0000000000 Binary files a/tools/ido_recomp/macos/5.3/ugen and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/ujoin b/tools/ido_recomp/macos/5.3/ujoin deleted file mode 100755 index 5e7ed4789d..0000000000 Binary files a/tools/ido_recomp/macos/5.3/ujoin and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/uld b/tools/ido_recomp/macos/5.3/uld deleted file mode 100755 index 64fc3899cf..0000000000 Binary files a/tools/ido_recomp/macos/5.3/uld and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/umerge b/tools/ido_recomp/macos/5.3/umerge deleted file mode 100755 index c66ef9f2fb..0000000000 Binary files a/tools/ido_recomp/macos/5.3/umerge and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/uopt b/tools/ido_recomp/macos/5.3/uopt deleted file mode 100755 index 0872f9c171..0000000000 Binary files a/tools/ido_recomp/macos/5.3/uopt and /dev/null differ diff --git a/tools/ido_recomp/macos/5.3/usplit b/tools/ido_recomp/macos/5.3/usplit deleted file mode 100755 index 2a7c351880..0000000000 Binary files a/tools/ido_recomp/macos/5.3/usplit and /dev/null differ diff --git a/tools/ido_recomp/windows/5.3/err.english.cc b/tools/ido_recomp/windows/5.3/err.english.cc deleted file mode 100755 index 6976e38a95..0000000000 --- a/tools/ido_recomp/windows/5.3/err.english.cc +++ /dev/null @@ -1,1260 +0,0 @@ -@ - 358 358 358 - 6464 6482 6553 - 6553 6593 6728 - 6728 6746 6803 - 6803 6808 6808 - 6808 6818 6818 - 6818 6826 6826 - 6826 6847 6847 - 6847 6875 6922 - 6922 6930 6930 - 6930 6939 6939 - 6939 6948 6948 - 6948 6974 7120 - 7120 7149 7204 - 7210 7248 7311 - 7317 7350 7442 - 7450 7497 7627 - 7635 7709 7930 - 7938 7975 8063 - 8071 8113 8253 - 8261 8289 8289 - 8298 8338 8445 - 8460 8502 8635 - 8650 8690 8819 - 8834 8857 8965 - 8965 9008 9113 - 9119 9142 9227 - 9235 9282 9451 - 9451 9462 9462 - 9462 9477 9477 - 9477 9497 9497 - 9497 9545 9545 - 9545 9584 9584 - 9584 9604 9662 - 9662 9682 9720 - 9720 9749 9749 - 9749 9788 9788 - 9788 9802 9802 - 9802 9829 9829 - 9829 9861 9861 - 9861 9904 9904 - 9904 9920 9920 - 9920 9962 9962 - 9962 9988 9988 - 9988 10014 10014 -10014 10035 10035 -10035 10054 10097 -10097 10115 10115 -10115 10147 10147 -10147 10183 10183 -10183 10208 10208 -10208 10236 10236 -10236 10269 10269 -10269 10304 10304 -10304 10328 10328 -10328 10351 10351 -10351 10371 10371 -10371 10402 10402 -10402 10447 10447 -10447 10497 10497 -10497 10533 10533 -10533 10598 10598 -10606 10630 10630 -10640 10671 10671 -10690 10719 10719 -10728 10752 10795 -10795 10837 10837 -10837 10876 10876 -10876 10900 10900 -10900 10948 10948 -10960 11021 11103 -11103 11128 11128 -11128 11153 11153 -11153 11216 11216 -11216 11239 11239 -11239 11303 11303 -11303 11347 11347 -11357 11393 11393 -11393 11432 11432 -11442 11494 11494 -11494 11536 11536 -11536 11595 11595 -11595 11622 11622 -11622 11684 11684 -11684 11726 11726 -11738 11778 11778 -11782 11813 11813 -11813 11850 11850 -11850 11900 12087 -12111 12120 12120 -12120 12129 12129 -12129 12158 12158 -12158 12192 12192 -12192 12237 12237 -12237 12273 12273 -12273 12326 12326 -12330 12366 12366 -12366 12423 12423 -12427 12482 12482 -12486 12560 12560 -12568 12631 12631 -12637 12691 12691 -12691 12743 12743 -12743 12785 12785 -12785 12826 12826 -12826 12865 12865 -12865 12883 12883 -12883 12946 12946 -12956 12995 12995 -13005 13066 13066 -13077 13163 13163 -13163 13211 13211 -13211 13270 13270 -13270 13318 13318 -13318 13350 13350 -13350 13387 13387 -13387 13428 13428 -13428 13464 13533 -13533 13580 13737 -13737 13776 13854 -13854 13913 13913 -13913 13950 13950 -13950 14118 14118 -14118 14150 14150 -14150 14163 14194 -14194 14224 14255 -14255 14275 14319 -14319 14353 14458 -14466 14484 14530 -14534 14567 14567 -14567 14635 14682 -14690 14742 14742 -14742 14789 14789 -14801 14875 14875 -14886 14947 14947 -14947 14992 14992 -14992 15035 15085 -15085 15134 15205 -15214 15267 15448 -15454 15496 16810 -16822 16875 16960 -16972 17053 17179 -17191 17236 17332 -17344 17491 17841 -17853 17939 18304 -18316 18471 18774 -18786 18952 19323 -19335 19364 19496 -19500 19527 19598 -19598 19613 19776 -19797 19808 19837 -19837 19862 19862 -19868 19927 20026 -20034 20075 20179 -20187 20223 20223 -20223 20290 20382 -20392 20441 20589 -20601 20656 20656 -20656 20699 20818 -20826 20860 21038 -21046 21094 21191 -21203 21236 21314 -21326 21395 21457 -21469 21502 21502 -21502 21587 21731 -21756 21789 21864 -21875 21901 21976 -22013 22059 22220 -22257 22397 22561 -22561 22595 22595 -22603 22623 22623 -22631 22667 22828 -22865 22919 22994 -23031 23059 23120 -23132 23201 23201 -23212 23274 23274 -23285 23345 23345 -23356 23393 23393 -23399 23431 23532 -23542 23587 23646 -23656 23697 23745 -23755 23796 23844 -23854 23876 23928 -23942 23971 24153 -24160 24243 24243 -24247 24273 24743 -24755 24784 24984 -24996 25034 25034 -25034 25075 25273 -25281 25332 25410 -25420 25467 25544 -25554 25583 25744 -25754 25783 26061 -26071 26111 26185 -26194 26239 26525 -26535 26568 26914 -26924 26951 26998 -27008 27035 27082 -27093 27120 27167 -27178 27206 27251 -27261 27289 27334 -27345 27391 27931 -27938 27959 28007 -28019 28037 28037 -28043 28069 28069 -28077 28147 28199 -28207 28266 28266 -28274 28306 28306 -28314 28339 28339 -28347 28404 28510 -28518 28567 28682 -28690 28728 28728 -28736 28782 29023 -29033 29085 29234 -29246 29303 29383 -29395 29432 29570 -29592 29631 29644 -29644 29693 29758 -29767 29810 29875 -29875 29911 29976 -29984 30014 30014 -30027 30086 30151 -30157 30223 30293 -30301 30369 30445 -30457 30511 30568 -30580 30630 30743 -30755 30812 30874 -30886 30959 31035 -31043 31076 31175 -31183 31243 31243 -31251 31323 31323 -31331 31433 31433 -31445 31544 31686 -31698 31740 31740 -31740 31783 31783 -31783 31824 31824 -31824 31873 31996 -32008 32056 32164 -32176 32210 32210 -32229 32271 32271 -32279 32323 32569 -32581 32642 32718 -32739 32779 32916 -32926 32953 33047 -33057 33116 33315 -33325 33373 33373 -33373 33407 33469 -33494 33527 33527 -33536 33573 33573 -33584 33650 33697 -33705 33763 33763 -33763 33797 33797 -33797 33829 33906 -33915 33976 33976 -33985 34016 34098 -34098 34133 34198 -34198 34261 34261 -34269 34312 34312 -34324 34363 34438 -34444 34530 34530 -34538 34596 34626 -34636 34675 34754 -34764 34821 34821 -34821 34867 34950 -34959 35016 35135 -35145 35198 35198 -35208 35266 35344 -35355 35382 35537 -35547 35576 35629 -35637 35705 35705 -35713 35764 35764 -35764 35784 35876 -35888 35932 35950 -35950 36013 36138 -36150 36191 36280 -36286 36314 36419 -36431 36516 36516 -36516 36554 36642 -36642 36689 36808 -36818 36881 37105 -37113 37183 37204 -37204 37225 37225 -37225 37255 37348 -37348 37388 37388 -37388 37454 37454 -37454 37518 37518 -37518 37584 37584 -37584 37717 37717 -37717 37752 37752 -37752 37783 37889 -37901 37928 38034 -38046 38115 38115 -38115 38140 38187 -38195 38219 38339 -38351 38422 38422 -38422 38486 38486 -38486 38555 38555 -38555 38619 38619 -38619 38641 38641 -38641 38758 38758 -38758 38929 38929 -38929 38975 39043 -39055 39084 39133 -39133 39175 39265 -39275 39310 39494 -39504 39547 39576 -39587 39614 39668 -39674 39697 39797 -39797 39845 40094 -40094 40158 40264 -40264 40369 40523 -40523 40593 40593 -40593 40629 40876 -40876 40911 40971 -40977 41026 41026 -41038 41077 41077 -41077 41116 41116 -41116 41156 41156 -41156 41195 41195 -41195 41237 41237 -41237 41285 41285 -41285 41304 41304 -41304 41371 41371 -41371 41429 41429 -41429 41491 41491 -41491 41519 41519 -41519 41572 41572 -41572 41642 41642 -41642 41676 41676 -41676 41713 41713 -41713 41751 41751 -41751 41792 41792 -41792 41856 41856 -41856 41881 41881 -41881 41936 41936 -41936 41977 41977 -41977 42018 42018 -42018 42090 42090 -42090 42162 42162 -42162 42205 42205 -42205 42267 42267 -42267 42294 42294 -42294 42309 42309 -42309 42338 42386 -42393 42425 42522 -42530 42577 42577 -42577 42623 42623 -42623 42643 42725 -42725 42748 42748 -42748 42829 42897 -42901 42952 42952 -42952 42978 43025 -43025 43116 43116 -43116 43171 43171 -43171 43204 43376 -43386 43453 43471 -43471 43547 43780 -43798 43921 44116 -44120 44120 44120 -Out of memory: %s -There is no more memory left in the system for compiling this program. -Internal Error Unknown Error Message %s -1) An internal error, while attempting to print an unavailable message -2) The error message file is inaccessible or has other problems -Unknown Signal %s -1) An unknown signal has been caught -2) 2 Nested signals -line -Warning: -Fatal: -Source not available -Too many errors... goodbye. -There is a limit of 30 errors before aborting. -Error: -reserved -reserved -Unknown Control Statement -1) The line begins with a '#' and is not of the form: - # "" -2) Please compile this program with the preprocessor enabled. -Unknown character %s ignored -The character is not part of the source character set. -2.2.1 -Unknown control character \%s ignored -The control character is not part of the source character set. -2.2.1 -Illegal character %s in exponent -1) Digits or sign expected after 'e' or 'E'. -2) Digits are expected after sign in exponent. -3.1.3.1 -Constant is out of range and may be truncated. -The constant is too large to be accurately represented and may be -truncated. The limits are in the system include file limits.h. -2.2.4.2 -Constant is out of range for a 32-bit data type, but accepted as written. -The constant is too large to fit in a 32-bit data type, but will be -accurately represented in a wider data type. The value may be truncated, -depending on its context. The limits are in the system include file -limits.h. -2.2.4.2 -Character constant size out of range -1) No characters in a character constant. -2) More than 4 bytes in a character constant. -3.1.3.4 -Wide character constant size out of range -1) No characters in the multibyte sequence (0 assumed). -2) More than 1 byte in the multi-byte sequence (only the first byte was converted). -3.1.3.4 -Invalid multibyte character -4.10.7.2 -Newline in string or character constant -1) Terminate your string or character constant with closing quotes. -2) Put a backslash before the newline. -3.1.3.4, 3.1.4 -Octal character escape too large: %s > %s -1) Terminate end of octal sequence with a non-octal character. -2) Select a character value within the limits. -Value may be truncated -3.1.3.4, 3.1.4 -Hex character escape too large: %s > %s -1) Terminate end of hex sequence with a non-hex character. -2) Select a character value within the limits. -Value may be truncated -3.1.3.4, 3.1.4 -Unexpected End-of-file -1) Unterminated string or character constant -2) Missing closing comment marker (*/) -3) File system problems -Unrecognized escape sequence in string \%s -Recognized escape sequences are \a, \b, \f, \n, \r, \t, and \v. -Character will be treated as un-escaped. -3.9.2 -Illegal octal digit %s -Octal constants, beginning with 0, must only have digits between 0 and 7, -inclusive. -3.1.3.2 -Unable to open temporary file for compiling %s -1) TMPDIR environment variable is set to a directory that you have no - permissions for. -2) The file system is full. -3) System errors beyond the scope of the compiler. -%s: Hangup -%s: Interrupt -%s: Quit (ASCII FS) -%s: Illegal instruction (not reset when caught) -%s: Trace trap (not reset when caught) -%s: IOT instruction -Also SIGABRT, used by abort, replace SIGIOT in the future -%s: EMT instruction -Also SIGXCPU, Exceeded CPU time limit -%s: Floating point exception -%s: Kill (cannot be caught or ignored) -%s: Bus error -%s: Segmentation violation -%s: Bad argument to system call -%s: Write on a pipe with no one to read it -%s: Alarm clock -%s: Software termination signal from kill -%s: User defined signal 1 -%s: User defined signal 2 -%s: Death of a child -Power-fail restart -%s: Also SIGXFSZ, exceeded file size limit -%s: Window change -%s: Handset, line status change -%s: Sendablestop signalnot from tty -%s: Stop signal from tty -%s: Pollable event occurred -%s: Input/Output possible signal -%s: Urgent condition on IO channel -%s: Window size changes -%s: Virtual time alarm -%s: Profiling alarm -%s: Continue a stopped process -%s: To readers pgrp upon background tty read -%s: Like TTIN for output if (tp->t_local<OSTOP) -%s: Resource lost (eg, record-lock) -'auto' and 'register' are not allowed in an external declaration -3.7(10) -must have function type -3.7.1(30) -Functions cannot return arrays -3.7.1(33), 3.3.2.2 -Declaration list not allowed -3.7.1(5) -Too many input files %s -The command line may contain only one file -cpp internal error: input stack underflow -cpp internal error: if stack underflow -Cannot open the file %s -No new-line character at the end of the file %s -2.1.1.2(30) -Fatal: Exceeded the limit of nesting level for #include file -Fatal: Exceeded the limit of nesting level for #include file. This limit -is 200. -Fail to read the file %s -Cannot write the file %s -%s: %s: An if directive is not terminated properly in the file -%s: %s: nested comment -%s:%s: Illegal macro name %s; macro name shall be an identifier -%s:%s: Illegal preprocessing token sequence -3.8.3(35) -%s:%s: Illegal macro parameter name -%s:%s: Non-unique macro parameter name -3.8.3(18) -%s:%s: Missing ')' in parameter list for #define %s -%s:%s: Missing ')' in macro instantiation -%s:%s: Bad punctuator in the parameter list for #define %s -%s:%s: Macro %s redefined. -%s:%s: # operator should be followed by a macro argument name -%s:%s: Badly formed constant expression%s -3.4(9), 3.8 -%s:%s: Division by zero in #if or #elif -3.8 -unknown command line option %s -extraneous input/output file name %s -%s: %s: Unterminated string or character constant -A preprocessing string or character constant token was not -terminated. Note that preprocessing directives are processed -after the source file has been divided into preprocessing tokens. -2.1.1.2(30) 3.1(18) 3.8 -%s: %s: -%s: %s: -%s: %s: Unterminated comment -%s: %s: Unknown directive type %s -%s: %s: #elif or #else after #else directive -%s: %s: Bad identifier after the %s -%s: %s: #%s accepts only one identifier as parameter -3.8 -%s: %s: Bad identifier after the %s -%s: %s: text following #%s violates the ANSI C standard. -3.8 -%s: %s: Bad character %s occurs after the # directive. -3.8 -%s: %s: the ## operator shall not be the %s token in the replacement list -3.8.3.3 -%s: %s: the defined operator takes identifier as operand only. -3.8.1 -%s: %s: Not in a conditional directive while using %s -%s: %s: Illegal filename specification for #include -%s: %s: Invalid file name %s for #include -%s: %s: Cannot open file %s for #include -%s: %s: Bad argument for #line command -%s: %s: #error %s -%s: %s: Tried to redefine predefined macro %s, attempt ignored -3.8.7(22) -%s: %s: Undefining predefined macro %s -3.8.7(22) -%s: %s: Undefined the ANSI standard library defined macro %s -4.1.2.1(9) -%s: %s: The number of arguments in the macro invocation does not match the definition -%s: %s: Illegal character %s in preprocessor if -%s: %s: Illegal character %s for number in preprocessor if -%s: %s: No string is allowed in preprocessor if -%s: %s: Not supported pragma %s -%s: %s: Not supported #pragma format -%s: %s: ANSI C does not allow #ident; %s -%s: %s: Not supported #ident format -This cpp extension accepts the following format: -#ident "any string" -%s: %s: Not supported #assert/#unassert format -This cpp extension accepts the following format: -#assert identifier -#assert identifier ( pp-tokens ) -#unassert identifier -#unassert identifier ( pp-tokens ) -%s: %s: Bad assertion predicate format -The correct syntax for this cpp extension is: -#assert identifier ( pp-token ) -%s: %s: directive is an upward-compatible ANSI C extension -%s: This option requires an argument -%s: %s: A macro has expanded recursively more than %s times. Further expansion will be disabled! Use command-line option: -Wp,-max_rec_depth=depth to recurse deeper. -A status return from cpp to cfe -Syntax Error -The token read was unexpected. -Syntax Error -- cannot backup -The token read was unexpected. -Yacc stack overflow -The expression is too complicated to parse. -Trailing comma in enumerator list -The use of a trailing comma in an enumerator list is not standard C. There -may be portability problems. -3.5.2.2 -Empty declaration -Empty declarations are invalid in standard C. -3.5 -%s declared, but not referenced. -redeclaration of '%s'; previous declaration at line %s in file '%s' -Identifier redeclared in the same scope/block. -3.1.2.3 -'%s' undefined; reoccurrences will not be reported. -Non-function name referenced in function call. -3.3.2.2(18) -The number of arguments doesn't agree with the number in the declaration. -3.3.2.2(5) -'%s' section name longer than 8 characters. Name truncated. -'%s' is already placed by pragma alloc_text. -Cannot write ucode file while compiling %s -1) The file system is full -2) Permissions problem -Must have corresponding formal argument for '%s' -Parameter found in the declaration part, but not in the argument list. -3.7.1(7) -Non-prototype declaration is an obsolescent feature. -The use of function definitions with separate parameter identifier -and declaration lists (not prototype-format parameter type and -identifier declarators) is an obsolescent feature. -3.9.5 -Incompatible function declarations for %s -For two function types to be compatible, both shall specify compatible -return types. Moreover, the parameter type lists, if both are present, -shall agree in the number of parameters and in use of the ellipsis -terminator; corresponding parameters shall have compatible types. If -one type has a parameter type list and the other type is specified by -a function declarator that is not part of a function definition and -contains an empty identifier list, the parameter list shall not have -an ellipsis terminator and the type of each parameter shall be -compatible with they type that results from application of the default -argument promotions. If one type has a parameter type list and the -other is specified by a function definition that contains a (possibly -empty) identifier list, both shall agree in the number of parameters, -and the type of each prototype parameter shall be compatible with the -type that results from application of the default argument promotions -to the type of the corresponding identifier. (For each parameter -declared with function or array type, its type for these comparisons -is the one that results from conversion to a pointer type. For each -parameter declared with qualified type, its type for these comparisons -is the unqualified version of its declared type.) There you have it! -3.5.4.3(15) -Incompatible function return type for this function. -For two function types to be compatible, both shall specify compatible -return types. -3.5.4.3(15) -The number of parameters for function is different from the previous declaration -The parameter type lists, if both are present, shall agree in the -number of parameters and in use of the ellipsis terminator. -3.5.4.3(15) -Incompatible type for the function parameter -If both parameter type lists are present, corresponding -parameters shall have compatible types. -3.5.4.3(15) -Function %s is redeclared with an incompatible argument type (after default argument promotion), which could lead to undefined run-time behaviour. -The redeclaration could cause arguments at a call site to be passed -inconsistently with what the function implementation expects, and -parameters would therefore be accessed erroneously when executing the -function body. Note that a float argument is promoted to a double -when passed (potentially through fp registers) to an unprototyped -function. -3.5.4.3(15) -prototype and non-prototype declaration found for %s, ellipsis terminator not allowed -If one type has a parameter type list and the other type is specified -by a function declarator that is not part of a function definition and -contains an empty identifier list, the parameter list shall not have -an ellipsis terminator and the type of each parameter shall be -compatible with they type that results from application of the default -argument promotions. -3.5.4.3(15) -prototype and non-prototype declaration found for %s, the type of this parameter is not compatible with the type after applying default argument promotion -If one type has a parameter type list and the other type is specified -by a function declarator that is not part of a function definition and -contains an empty identifier list, the type of each parameter shall be -compatible with the type that results from application of the default -argument promotions. -3.5.4.3(15) -prototype declaration and non-prototype definition found for %s, the type of this parameter is not compatible with the type after applying default argument promotion -If one type has a parameter type list and the other is specified by a -function definition that contains a (possibly empty) identifier list, -both shall agree in the number of parameters, and the type of each -prototype parameter shall be compatible with the type that results -from application of the default argument promotions to the type of the -corresponding identifier. -3.5.4.3(15) -Empty declaration specifiers -Standard C requires at least a storage class specifier, type specifier, -or a type qualifier in declarations. 'extern int' assumed. -3.5 -Can't write to the file %s -1) The output file cannot be opened for writing. -2) Out of file space. -Duplicate '%s' -typedef, extern, static, auto, register, const, volatile may not -appear more than once in the same specifier list or qualifier list. -Duplicate occurrence ignored. -3.5.1(10) , 3.5.3(5) -Null input -There is nothing to compile. -Illegal type combination -3.5.2 -Missing ';' at end of structure / union member declaration -In standard C, each member declaration must be terminated by a ';'. A -terminating ';' is assumed. -3.5.2.1 -Missing member name in structure / union -In standard C, each member declaration have a member name. The missing -member is assumed to not exist. -3.5.2.1 -This variable is initialized twice. -Neither 'const' or 'volatile' have any effect on function results. -Qualifiers only apply to expressions designating an object that -can be altered or examined. -3.5.3(10) -An integer constant expression is required here. -The expression that defines the value of an enumeration constant -shall be an integral constant expression that has a value -representable as an int. -3.5.2.2(28) -(previous declaration of '%s' at line %s in file '%s') -Must be an integer type greater than zero. -The array size must be either a char, signed or unsigned integer or -an enumerated type with a value greater than zero. -3.5.4.2 -Array size cannot be a long long. -Arrays with more than 2^32 elements are not yet supported. -The array size must be either a char, signed or unsigned integer or -an enumerated type with a value greater than zero. -3.5.4.2 -bit-field '%s' width is not an integer constant -The expression that specifies the width of a bit-field shall be an -integral constant expression. -3.5.2.1(15) -bit-field '%s' width is negative -The expression that specifies the width of a bit-field shall be -non-negative. -3.5.2.1(15) -bit-field '%s' type required to be int, unsigned int, or signed int. -A bit-field shall have type int, unsigned int, or signed int. -3.5.2.1(30) -bit-field %s's type not integer. -Non-scalar type or pointer type to a non-object for increment or decrement operator. -The operand of the prefix/postfix increment or decrement operator shall have scalar type; if it is of pointer type, it must point to an object. -3.3.2.4(37), 3.3.3.1(25) -Assign value to a function type. -An assignment operator shall have a modifiable lvalue as its left operand. -3.2.2.1(5) -Assign value to an array. -An assignment operator shall have a modifiable lvalue as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Change value for variable of incomplete type. -The operand of increment and decrement operator shall be a modifiable -scalar lvalue. An assignment operator shall have a modifiable lvalue -as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -The left-hand side of the '.' operator must be an addressable lvalue, when a bit-field is not contained within a unit of 32 bits alignment. -This is a restriction in our implementation, which can be worked -around by always accessing long long bit-fields indirectly (i.e. -by means of the '->' operator). -This expression is not an lvalue. -3.2.2.1 -Modified an rvalue. -3.2.2.1 -Change value for constant variable. -The operand of increment and decrement operators shall be modifiable -scalar lvalues. An assignment operator shall have a modifiable lvalue -as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Change value for constant field of a struct or union. -An assignment operator shall have a modifiable lvalue as its left operand. -3.3.2.4(36), 3.3.3.1(24), 3.2.2.1(5) -Dereferenced a non-pointer. -The operand of the unary * operator shall have pointer type. -3.3.3.2(39) -The operand of the unary + or - operator shall have arithmetic type. -3.3.3.3(6) -The operand of the unary ~ operator shall have integral type. -3.3.3.3(6) -The operand of the unary ! operator shall have scalar type. -3.3.3.3(6) -Constants must have arithmetic type. -3.1.3 -Bad type name for cast operator -The type name for the cast operator should either be void or a -qualified or unqualified scalar type. -3.3.4(22) -Improper cast of non-scalar type expression. -The operand for the cast operator shall be of scalar type. -3.3.4(23) -Cast a pointer into a non-integral type. -A pointer may be converted to an integral type. -3.3.4(31) -Cast a non-integral type into a pointer. -An integral type may be converted to a pointer. -3.3.4(31) -Duplicate member '%s' -Two members of a struct may not have the same name. -3.1.2.2(7,25) -Invalid constant expression. -Constant expressions shall not contain assignment, increment, decrement, -function-call, or comma operators, except when they are contained within -the operand of the sizeof operator. -3.4(9) -Constant expressions must be derived from a constant value or a constant -variable. -3.4 -Dangerous operand of '&'. -The operand of the unary & operator shall be either a function -designator or an lvalue that designates an object that is not a -bit-field and is not declared with the register storage-class -specifier. This operand is NOT an lvalue, but we let it pass. -Note that a segmentation error with possible core dump will result -when the resulting address does not denote a valid (declared) -storage location. This feature will be discontinued in future -releases of the compiler! -3.3.3.2(36) -Unacceptable operand of '&'. -The operand of the unary & operator shall be either a function -designator or an lvalue that designates an object that is not a -bit-field and is not declared with the register storage-class -specifier. -3.3.3.2(36) -'&' before array or function; ignored -Unacceptable operand of sizeof operator. -The sizeof operator shall not be applied to an expression that has -function type or an incomplete type, to the parenthesized name of such -a type, or to an lvalue that designates a bit-field object. -3.3.3.4 -Unacceptable operand of a multiplicative operator. -Each of the operands of a multiplicative operator shall have arithmetic type. -3.3.5(18) -Unacceptable operand of the remainder operator -Each of the operands of the remainder (%) operator shall have integral type. -3.3.5(18) -Unacceptable operand of '+'. -For the + operator, either both operands shall have arithmetic type, or -one operand shall be a pointer to an object type and the other shall -have integral type. -3.3.6(39) -Unacceptable operand of '-'. -For the subtraction operator, one of the following shall hold: both operands -have arithmetic type; operands are pointers to qualified or unqualified -versions of compatible object types; or the left operand is a pointer -to an object type and the right operand has integral type. -3.3.6(39) -Unacceptable operand of shift operator. -Each of the operands of bitwise shift operators shall have integral type. -3.3.7(9) -Unacceptable operand of relational operator. -For relational operators, one of the following shall hold: both -operands have arithmetic type; both operands are pointers to qualified -or unqualified versions of compatible object types; or both operands -are pointers to qualified or unqualified versions of compatible -incomplete types. -3.3.8(32) -Unacceptable operand of == or != -For the == or != operator, one of the following shall hold: both operands -are pointers to qualified or unqualified versions of compatible types; one -operand is a pointer to an object or incomplete type and the other is a -pointer to a qualified or unqualified version of void; or one operand is -a pointer and the other is a null pointer constant. -3.3.9(21) -Unacceptable operand of &. -Each of the operands shall have integral type. -3.3.10(7) -Unacceptable operand of ^. -Each of the operands shall have integral type. -3.3.11(18) -Unacceptable operand of |. -Each of the operands shall have integral type. -3.3.12(30) -Unacceptable operand of &&. -Each of the operands shall have scalar type. -3.3.13(7) -Unacceptable operand of ||. -Each of the operands shall have scalar type. -3.3.14(20) -Unacceptable operand of conditional operator. -The first operand of conditional operator shall have scalar type. One -of the following shall hold for the second and third operands: -both operands have arithmetic type; both operands have compatible -structure or union types; both operands have void type; both operands -are pointers to qualified or unqualified versions of compatible types; -one operand is a pointer and the other is a null pointer constant; or -one operand is pointer to an object or incomplete type and the other -is a pointer to a qualified or unqualified version of void. -3.3.15 -Duplicate label '%s' -A label name can only occur once in a function. -3.1.2.1(25) -Division by zero. -3.3.5 -Subscripting a non-array. -3.3.2.1 -Subscripting an array of incomplete type which is not an object type. -The element of the array shall have an object type. -3.3.2.1 -Should only subscript an array with an integral expression -3.3.2.1 -Subscripting an unbounded array -3.3.2.1 -Array index out of range -3.3.2.1 -Selector requires struct/union pointer as left hand side -In K&R mode the expression is implicitly converted to the '.' selector -for a struct/union left-hand side. -3.3.2.3 -Selector requires struct/union as left hand side -In K&R mode the expression is implicitly converted to the '->' selector -for a struct/union pointer left-hand side. -3.3.2.3 -member of structure or union required -3.3.2.3 -types have different qualifier specifications -For two qualified types to be compatible, both shall have the -identically qualified version of a compatible type; qualified -and unqualified versions of a type are distinct types. For two -types to be compatible their types must be the same. -3.5.3(26) -Incompatible array type due to different array size -For two array types to be compatible, both shall have compatible element -types; if both size specifiers are present, they shall have the -same value. -3.5.4.2(11) -Incompatible array type due to incompatible element type -For two array types to be compatible, both shall have compatible element -types. -3.5.4.2(11) -Incompatible pointer type assignment -The type pointed to by the left-hand side of simple assignment -statement is incompatible with the type pointed to by the right-hand side. -3.3.16.1, 3.5.4.1(21) -Incompatible base type of pointer type -K&R feature. -Type %s of %s is incompatible with type %s of %s -Incompatible types can be resolved by casting or by other means. -3.3.16.1 -illegal combination of pointer and integer -Assigning an integral expression to a pointer is a bad practice. -Type for %s is incompatible with %s -Incompatible types can be resolved by casting or by other means. -3.1.2.6 -Bad operand type for += or -= -3.3.16.2(26) -A case or default label appears outside a switch statement -A case or default label shall appear only in a switch statement. -3.6.1 -The controlling expression of the if statement is not scalar type -The controlling expression of an if statement shall have scalar type. -3.6.4.1 -The controlling expression of switch statement is not integral type -The controlling expression of an switch statement shall have integral type. -3.6.4.2(20) -The case label is not an integral constant expression -The case label shall be an integral constant expression. -3.6.4.2(22) -Duplicate case label in the same switch statement -No two of the case constant expressions in the same switch statement -shall have the same value after conversion. -3.6.4.2(22) -More than one default label in the same switch statement -There may be at most one default label in a switch statement. -3.6.4.2(23) -The controlling expression of the iteration statement is not scalar -type -The controlling expression of a iteration statement shall have scalar -type. -3.6.5.1 -label '%s' used, but not defined -The identifier in a goto statement shall name a label located -somewhere in the enclosing function. -3.6.6.1 -A continue statement shall appear only in or as a loop body -3.6.6.2 -A break statement shall appear only in or as a switch body or loop body -3.6.6.3 -A return statement with an expression should not appear -in a function '%s', whose return type is void -3.6.6.4(24) -A return statement without an expression appears in a -function '%s', whose return type is not void -If a return statement without an expression is executed, and the value -of the function call is used by the caller, the behavior is undefined. -3.6.6.4(33) -Internal Error: statement stack underflow -Long double not supported; double assumed. -Long float not standard; double assumed. -Only 'register' allowed in parameter declaration -The only storage-class specifier that shall occur in a parameter -declaration is 'register'; illegal storage class ignored. -3.5.4.3(25) -Name(s) without types in a function declaration -An old-style function declaration is not allowed to have names -in the parameter list; useless names ignored -3.5.4.3(26) -Functions cannot return functions -3.7.1(33), 3.3.2.2 -Functions cannot return a non-object type -3.3.2.2 -enum declaration must contain enum literals -Although structs or unions may delay the declaration of their members, -a similar construction with enum does not exist and is not necessary, -as there can be no mutual dependencies between the declaration of an -enumerated type and any other type. -3.5.2.3(27) -Register qualification has no effect for this type of object -Register declarations for array, struct, and function types have -no effect. -3.5.1(16), 3.5.1(19) -Functions cannot be declared 'register' -The declaration of an identifier for a function that has block -scope shall have no explicit storage-class specifier other than -'extern'. -3.5.1(19) -'%s' cannot be initialized -The type of the entity to be initialized shall be an object type -or an array of unknown size. -3.5.7(32) -Cannot initialize 'extern' variable '%s' within a function -If the declaration of an identifier has block scope, and the -identifier has 'extern' or 'static' linkage, the declaration -shall have no initializer for the identifier; initialization -allowed anyway. -3.5.7(35) -initializing an 'extern' is an ANSI C extension -conflicting declarations for '%s' -'static' and 'extern' declarations conflict. Which is meant? -3.1.2.2(15), 3.1.2.2(27) -Too many initial values for '%s' -3.5.7(1) -incompatible types in initialization -3.3.16(35) -redefinition of '%s'; previous definition at line %s in file '%s' -Identifier redeclared in the same scope/block. -3.1.2.3 -bit-fields as members of a union are an ANSI C invention. -storage size for '%s' isn't known -type mismatch in initialization -Missing braces in a union initialization or illegally formed -initialization. -3.5.7(5) -union '%s' only allowed one initializer for the first member -3.5.7(5) -width of '%s' exceeds its type -the specified bitfield width is too large to be contained within a -bitfield type. -structure has no member named '%s' -This is allowed for compatibility with AT&T pcc-based compilers. -Reference of an expression of void type or an incomplete type. -3.2.2.1 -element size of an array shall not be zero -3.2.2.5(25) -invalid combination of type specifiers -Although order is unimportant, not all type specifiers can occur together. -3.5.2 -declaration must at least declare an identifier, tag, or the member of an enumeration -3.5(16) -at most one storage class may be given in the declaration -Duplicate occurrence ignored. -3.5.1(10) -size of function's return type is zero -The return type of a function must be void or an object type other than array. -3.7.1(33) -Expecting an integral return type from the main function -identifier missing from parameter declaration -Prototypes for function definitions require identifiers in parameter -declarations. -3.7.1(4) -only 'register' allowed for storage class for parameters -The declarations in the declaration list shall contain no storage class -other than 'register', and no initializations. -3.7.1(10) -parameters declarations can not have initializations -3.7.1(10) -only one instance of 'void' allowed in the parameter list -'void' must occur by itself (specifying that the function has no parameters). -3.5.4.3(1) -%s must have function type -1) An argument list must be explicitly present in the declarator; it cannot - be inherited from a typedef (3.5.4.3). -2) The declarator is not a function. -3.7.1(30) -Illegal hexadecimal constant -You have no digits after the 0x or 0X. 0x0 assumed. -3.1.3.2 -value overflows its type in this context. Value is set to be '%s'! -3.2.1.4 -value is outside range representable for type '%s' -missing member name -K&R mode permits a missing member name; otherwise, only bitfields can omit -the member name. -3.5.2.1(10) -useless keyword or type name in declaration -Type was ignored. -'%s' declared within and is limited to this function prototype -Possible program error, since parameter type checking will always fail -unless the type declaration is visible to the caller. -3.1.2.1(35) -Extra spaces within operator, %s assumed -In ANSI C, the compound assignment operator cannot have embedded -white space characters. -3.1.5 -missing size for array '%s' -Incomplete types permitted for identifiers with internal or -external linkage, but not automatic linkage. -3.1.2.5(10) -can't jump into (from outside of) the body of a 'try' or into either type of handler -'%s' missing, please #include excpt.h -excpt.h required to declare exception statements, intrinsics or compiler -runtime names. -local function declarations cannot be 'static' -A function declaration can only contain the storage-class 'static' -if it is at file scope. Declaration made 'extern'. -3.5.1(19) -static function '%s' declared and referenced, but not defined. -If an identifier declared with internal linkage is used in an -expression (other than as a part of the operand of a sizeof -operator), there shall be exactly one external definition for -the identifier in the translation unit. -3.7(12) -pragma argument '%s' must be declared prior to being used in a pragma -Pragma name ignored. -Pragma not supported -'%s' not enabled as intrinsic -It may have already appeared in a function pragma, or never occurred in -an intrinsic pragma. -'%s' is already enabled as an intrinsic -weak definition for '%s' is later redefined; pragma weak ignored. -definition of primary name '%s' not found; pragma weak ignored. -definition of secondary name '%s' not found; pragma weak ignored. -primary name '%s' is declared as a common or external, and is not defined -with initial value within this file; pragma weak ignored. -useless '%s' storage class ignored -array of functions not allowed -The element type must be an object type representing a region -of data storage which can represent values. -3.1.2.5(23) -array of voids not allowed -The element type must be an object type representing a region -of data storage which can represent values. -3.1.2.5(23) -argument for pragma pack must be an integer constant; pragma ignored -'%s' has wrong tag type. -Identifier redeclared in the same scope/block. -3.1.2.3 -missing dimension bound -For multidimensional arrays, the constant bounds of the array may be -omitted only for the first member of the sequence. -3.1.2.5(23) -Internal error in parameters to function substr; loc: '%s'; len: '%s'. -Internal error in parameters to function insertstr; indx: '%s'. -Internal error in function get_tag_name; input is a non-tagged type. -Internal error in function gen_type_str -- not a type tree '%s' -Cannot open file '%s' -Prototype should be moved after tag or a typedef declaration. -Please look for comments in the extracted header file. -The extracted header file includes prototypes for static functions, -which should be removed, if you wish to include the header in a source file -other than the originator. -ANSI C requires formal parameter before "..." -This extension is meant to be used for compatibility with varargs.h -3.5.4.3(35) -syntax error: "&..." invalid -extension used to access "..." formal arguments. -function '%s' initialized like a variable -The type of entity to be initialized shall be an object type or an -array of unknown size. -3.5.7(31) -initializer not an array aggregate -The initializer for an object that has aggregate type shall be a -brace-enclosed list of initializers for the members of the aggregate, -written in increasing subscript or member order. -3.5.7(20) -'%s' type is incomplete; cannot initialize -Was the struct ever defined? -3.5.7.(31) -'%s' is not standard ANSI. -This keyword/type is not defined in strict ANSI mode. -3.1.1 -not a legal asm string -The first operand of an asm string should be, after argument substitution, -a legal assembly string. -The -float option will be ignored in ANSI mode. -The -float option is ignored, since otherwise program semantics would -violate the ANSI standard. In particular, fp constants are always -'double' with ANSI-C, while with -float the type of fp constants will -depend on the context and may be 'float'. -ANSI C support unavailable with C compiler bundled with RISC/os -The C compiler bundled with RISC/os does not support ANSI C. ANSI -C support requires a separate license. -Ignored invalid warning number(s) in -woff option, %s%s ! -Warning numbers must be in the range %s to %s. -The set of warning numbers in cfe is disjoint from the set of warning numbers -in accom, since accom warnings cannot be mapped one-to-one to cfe warnings. -'%s' not handled as an intrinsic due to incompatible argument types . -'__unalign' only qualifies pointers -'__unalign' indicates the object pointed at by pointer is unaligned (e.g., -int * __unalign p). This is an extension to ANSI C and like 'volatile' -and 'const' can follow the '*' in pointer declarations, but unlike both -cannot qualify a base type. -index expression is an anachronism -ANSI C++ doesn't support array index expressions in delete. -5.3.4 -member cannot be of function or incomplete type. -3.5.2.1(12) -Illegal lint option, '%s', is ignored. -cannot open header message buffer file -cannot write header message buffer file -cannot read header message buffer file -cannot seek in header message buffer file -struct/union/enum '%s' is used, but not defined -static '%s' unused -nonportable character comparison (chars may be signed or unsigned) -redundant comparison of unsigned with constant expression -redundant statement, control flow cannot reach this statement -'%s' may be used before set -function parameter '%s' is not used in function '%s' -'%s' can be const qualified, since it is not set within its lifetime. -'%s' is not used in function '%s' -'%s' set but unused in function '%s' -control may fall through %s statement -function '%s' has return(e); and return; -function '%s' may return random value to place of invocation %s -label without goto: '%s' -width of %s constant is smaller than size of type (%s) -explicit conversion from '%s' to '%s' %s -implicit conversion from '%s' to '%s' %s -'%s' may be indistinguishable from '%s' due to internal name truncation -Promoted formal parameter and promoted argument have incompatible types -No prototype for the definition of '%s' %s -References to '%s' are substituted by its literal initializer - (as included in %s) -============== -unsupported language linkage -string-literal specifies an unsupported linkage -7.4(1) -No prototype for the call to %s -To achieve better type-checking, there should be a full prototype for -the function being called. -3.5.4.3 -'inline' only applies to function declarations -leave statment can occur only within try body -Microsoft extension -Use of a Microsoft extension detected without usage of the -compiler option -msft. -No parameter mentioned -A file with no declarations or definitions is accepted as an extension to ANSI C -The translation unit must contain at least one external definition. -3.7 -Incompatible signed and unsigned version of a type -Yacc initialization error -Internal error: yacc cannot initialize itself. -The cfe option %s may not be in future releases. We suggest that you not use this option! -Incompatible char and unsigned char versions of a type -Lshift with undefined behaviour. -Lshift with a negative right operand, or a right operand that is greater -than or equal to the width in bits of the promoted left operand, results -in undefined behaviour. -3.3.7(11) -useless type name in declaration, possibly a semicolon is missing. -Type was ignored. -constant initializer expression is invalid (refers to automatic variables). -All the expressions in an initializer for an object that has static storage -duration or in the initializer list for an object that has aggregate or -union type shall be constant expressions. Otherwise, unexpected results -may occur. -3.5.7(32) and 3.4 -invalid explicit or implicit conversion of an address constant to an integral value in a constant initializing expression. -An address constant in a constant initializing expression can neither -initialize a bit-field nor be directly or indirectly converted to an -integral type of size different from an address type. -6.4 diff --git a/tools/msgenc.py b/tools/msgenc.py index b7a03a5b23..1483dcdc2d 100644 --- a/tools/msgenc.py +++ b/tools/msgenc.py @@ -13,18 +13,16 @@ def read_charmap(path : str, wchar : bool) -> Dict[str,str]: out_charmap = {} for k,v in charmap.items(): - v = v[wchar] - if v is None: - v = 0 assert isinstance(k, str) - assert v in (range(0xFFFF + 1) if wchar else range(0xFF + 1)) + assert isinstance(v, int) and v in range(0xFFFF + 1) k = repr(k)[1:-1] - if wchar: + if wchar or v > 0xFF: + # split value across two bytes u = (v >> 8) & 0xFF l = (v >> 0) & 0xFF - out_charmap[k] = f"0x{u:02X}, 0x{l:02X}," + out_charmap[k] = f"0x{u:02X},0x{l:02X}," else: out_charmap[k] = f"0x{v:02X}," @@ -62,7 +60,7 @@ def emit(text : Optional[str], advance : int): # flush text to_flush = string[run_start:i] if len(string[run_start:i]) != 0: - out += ",".join(f"0x{b:02X}" for b in to_flush.encode(encoding)) + out += ",".join(f"0x{b:02X}" for b in to_flush.encode(encoding, "replace")) out += "," if text is None: return @@ -126,24 +124,25 @@ def main(): ) parser.add_argument( "--encoding", - help="encoding (jpn or nes)", + help="base text encoding", required=True, type=str, - choices=("jpn", "nes"), + choices=("utf-8", "SHIFT-JIS"), ) parser.add_argument( "--charmap", help="path to charmap file specifying custom encoding elements", required=True, ) + parser.add_argument( + "--wchar", + help="force wide encoding", + required=False, + action="store_true" + ) args = parser.parse_args() - wchar,encoding = { - "jpn" : (True, "SHIFT-JIS"), - "nes" : (False, "raw-unicode-escape"), - }[args.encoding] - - charmap = read_charmap(args.charmap, wchar) + charmap = read_charmap(args.charmap, args.wchar) text = "" if args.input == "-": @@ -153,7 +152,7 @@ def main(): text = infile.read() text = remove_comments(text) - text = convert_text(text, encoding, charmap) + text = convert_text(text, args.encoding, charmap) if args.output == "-": sys.stdout.buffer.write(text.encode("utf-8")) diff --git a/tools/patch_ique_driverominit.py b/tools/patch_ique_driverominit.py new file mode 100755 index 0000000000..f7ca9daac2 --- /dev/null +++ b/tools/patch_ique_driverominit.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +import struct, sys, argparse + +import elftools.elf.elffile + +# Patches driverominit.o to change bnez t6,3c to nop at offset 0x20 in the .text section + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + + parser.add_argument("file", help="input file") + args = parser.parse_args() + + with open(args.file, "r+b") as f: + elf = elftools.elf.elffile.ELFFile(f) + + text_offset = 0 + for section in elf.iter_sections(): + if section.name == ".text": + text_offset = section["sh_offset"] + break + + if text_offset == 0: + print("Error: .text section not found") + sys.exit(1) + + f.seek(text_offset + 0x20) + instruction = struct.unpack(">I", f.read(4))[0] + if instruction != 0x15C00006: # bnez t6,3c + print("Error: expected instruction not found, found 0x%08X" % instruction) + sys.exit(1) + + f.seek(text_offset + 0x20) + f.write(struct.pack(">I", 0x00000000)) # nop diff --git a/tools/preprocess.sh b/tools/preprocess.sh index dc327c09c3..f5691d8f32 100755 --- a/tools/preprocess.sh +++ b/tools/preprocess.sh @@ -4,7 +4,9 @@ # SPDX-License-Identifier: CC0-1.0 # Usage: preprocess [flags] -- [compile command minus input file...] [single input file] -# Flags: -v OOT_VERSION (required) +# Flags: +# -v OOT_VERSION (required) +# -i ICONV_PATH (optional, default: iconv) # Preprocess a C file to: # * Re-encode from UTF-8 to EUC-JP # (the repo uses UTF-8 for text encoding, but the strings in the ROM are encoded in EUC-JP) @@ -39,12 +41,17 @@ then echo srcfile="$srcfile" fi -while getopts "v:" opt "${flags[@]}" +ICONV=iconv + +while getopts "v:i:" opt "${flags[@]}" do case $opt in v) OOT_VERSION=$OPTARG ;; + i) + ICONV=$OPTARG + ;; ?) echo "Error: Bad flags" exit 1 @@ -76,7 +83,7 @@ trap "rm -rf $tempdir" EXIT { printf '#line 1 "%s"\n' "$srcfile" # linemarker ./tools/preprocess_pragmas $OOT_VERSION "$srcfile" < "$srcfile" -} | iconv -f UTF-8 -t EUC-JP > "$tempfile" +} | "${ICONV}" -f UTF-8 -t EUC-JP > "$tempfile" # Also include the source file's directory to have the include path as if we compiled the original source. # Pass the processed temporary file for compilation. diff --git a/tools/version_config.py b/tools/version_config.py index 9377637763..3516073f0d 100644 --- a/tools/version_config.py +++ b/tools/version_config.py @@ -23,8 +23,8 @@ class VersionConfig: checksums: list[str] # ROM offset to start of DMA table dmadata_start: int - # Whether the languages are PAL (EN/DE/FR) or not (JP/EN) - text_lang_pal: bool + # "NTSC" (JP/EN), "PAL" (EN/DE/FR), or "CN" (JP/CN) + text_lang: str # DMA segment information, in ROM order dmadata_segments: OrderedDict[str, SegmentInfo] # ROM pieces that are copied directly into the build with .incbin @@ -92,7 +92,7 @@ def load_version_config(version: str) -> VersionConfig: version=version, checksums=config.get("checksums", ["checksum"]), dmadata_start=config["dmadata_start"], - text_lang_pal=config["text_lang_pal"], + text_lang=config["text_lang"], dmadata_segments=load_dmadata_segments(version), incbins=incbins, variables=config["variables"], diff --git a/undefined_syms.txt b/undefined_syms.txt index deba8affd0..6f663eae89 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -9,3 +9,17 @@ D_0F000000 = 0x0F000000; // z_bg_mjin D_06000000 = 0x06000000; + +#if PLATFORM_IQUE +__divdi3 = 0x80008010; +__moddi3 = 0x800085F0; +__udivdi3 = 0x80008B80; +__umoddi3 = 0x800090F0; +__cmpdi2 = 0x80009600; +__floatdidf = 0x80009650; +__floatdisf = 0x800096A0; +__fixunsdfdi = 0x80009760; +__fixdfdi = 0x80009960; +__fixunssfdi = 0x800099D0; +__fixsfdi = 0x80009BD0; +#endif