diff --git a/Makefile b/Makefile index c9cb490a..cc2cf081 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ BIN_OBJS := $(filter-out $(ASSET_OBJS),$(BIN_OBJS)) ALL_OBJS := $(C_OBJS) $(ASM_OBJS) $(BIN_OBJS) SYMBOL_ADDRS := symbol_addrs.$(VERSION).txt SYMBOL_ADDR_FILES := $(filter-out $(SYMBOL_ADDRS), $(wildcard symbol_addrs.*.$(VERSION).txt)) -MIPS3_OBJS := $(BUILD_DIR)/$(SRC_ROOT)/core1/done/ll.c.o +MIPS3_OBJS := $(BUILD_DIR)/$(SRC_ROOT)/core1/ll.c.o BOOT_MIPS3_OBJS := $(BUILD_DIR)/$(SRC_ROOT)/done/ll.c.o BOOT_C_OBJS := $(filter-out $(BOOT_MIPS3_OBJS),$(BOOT_C_OBJS)) COMPRESSED_SYMBOLS := $(BUILD_DIR)/compressed_symbols.txt @@ -366,24 +366,13 @@ clean: # Per-file flag definitions build/$(VERSION)/src/core1/io/%.c.o: OPT_FLAGS = -O1 -build/$(VERSION)/src/core1/io/pimgr.c.o: OPT_FLAGS = -O1 -build/$(VERSION)/src/core1/done/io/%.c.o: OPT_FLAGS = -O1 build/$(VERSION)/src/core1/os/%.c.o: OPT_FLAGS = -O1 -build/$(VERSION)/src/core1/code_2D2D0.c.o: OPT_FLAGS = -O1 -build/$(VERSION)/src/core1/done/os/%.c.o: OPT_FLAGS = -O1 -build/$(VERSION)/src/core1/code_21A10.c.o: INCLUDE_CFLAGS = -I . -I include -I include/2.0L -I include/2.0L/PR -build/$(VERSION)/src/core1/code_21A10.c.o: OPT_FLAGS = -O3 -build/$(VERSION)/src/core1/done/gu/%.c.o: OPT_FLAGS = -O3 -build/$(VERSION)/src/core1/done/gu/%.c.o: INCLUDE_CFLAGS = -I . -I include -I include/2.0L -I include/2.0L/PR -build/$(VERSION)/src/core1/gu/mtxutil.c.o: OPT_FLAGS = -O2 -build/$(VERSION)/src/core1/gu/rotate.c.o: OPT_FLAGS = -O2 -build/$(VERSION)/src/core1/done/audio/%.c.o: INCLUDE_CFLAGS = -I . -I include -I include/2.0L -I include/2.0L/PR -build/$(VERSION)/src/core1/done/audio/%.c.o: OPT_FLAGS = -O3 -# build/$(VERSION)/src/core1/code_21CB0.c.o: INCLUDE_CFLAGS = -I . -I include -I include/2.0L -I include/2.0L/PR -# build/$(VERSION)/src/core1/code_21CB0.c.o: OPT_FLAGS = -O3 -build/$(VERSION)/src/core1/done/io/sptask.c.o: OPT_FLAGS = -O1 -build/$(VERSION)/src/core1/done/ll.c.o: OPT_FLAGS := -O1 -build/$(VERSION)/src/core1/done/ll.c.o: MIPSBIT := -mips3 -o32 +build/$(VERSION)/src/core1/gu/%.c.o: OPT_FLAGS = -O3 +build/$(VERSION)/src/core1/gu/%.c.o: INCLUDE_CFLAGS = -I . -I include -I include/2.0L -I include/2.0L/PR +build/$(VERSION)/src/core1/audio/%.c.o: OPT_FLAGS = -O3 +build/$(VERSION)/src/core1/audio/%.c.o: INCLUDE_CFLAGS = -I . -I include -I include/2.0L -I include/2.0L/PR +build/$(VERSION)/src/core1/ll.c.o: OPT_FLAGS := -O1 +build/$(VERSION)/src/core1/ll.c.o: MIPSBIT := -mips3 -o32 build/$(VERSION)/src/bk_boot_27F0.c.o: OPT_FLAGS = -O2 build/$(VERSION)/src/done/destroythread.c.o: OPT_FLAGS := -O1 diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index 3c35232e..a2277585 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -143,216 +143,216 @@ segments: subalign: 4 subsegments: - [0xF19250, c, code_0] - - [0xF198B0, c, code_660] #DONE - - [0xF19A10, c, inflate] #DONE - - [0xF1AF50, c, code_1D00] #DONE - - [0xF1BE20, c, code_2BD0] - - [0xF1BFF0, c, code_2DA0] #DONE - - [0xF1C1F0, c, code_2FA0] #DONE - - [0xF1C410, c, code_31C0] #DONE - - [0xF1C4A0, c, code_3250] #DONE - - [0xF1CCC0, c, code_3A70] #DONE - - [0xF1E8A0, c, code_5650] - - [0xF202E0, c, code_7090] #DONE - - [0xF20500, c, code_72B0] #DONE - - [0xF211B0, c, code_7F60] #DONE - - [0xF21EA0, c, code_8C50] #DONE - - [0xF22F80, c, code_9D30] - - [0xF23E00, c, code_ABB0] #DONE - - [0xF260B0, c, done/code_CE60] #DONE - - [0xF275B0, c, code_E360] #DONE - - [0xF27D40, c, code_EAF0] #DONE - - [0xF29C50, c,code_10A00] - - [0xF2AD10, c, code_11AC0] #DONE - - [0xF2C160, c, code_12F10] #DONE - - [0xF2C890, c, code_13640] #DONE - - [0xF2C8D0, c, code_13680] #DONE - - [0xF2C920, c, code_136D0] - - [0xF2CBE0, c, code_13990] - - [0xF2E840, hasm, code_155F0] #DONE - - [0xF2E880, c, code_15630] #DONE - - [0xF2E9C0, c, code_15770] #DONE - - [0xF2ED80, c, code_15B30] #DONE - - [0xF2FCA0, c, memory] #DONE - - [0xF31360, c, code_18110] #DONE - - [0xF31460, c, code_18210] #DONE - - [0xF31560, c, code_18310] #DONE - - [0xF315A0, c, code_18350] #DONE - - [0xF350E0, c, code_1BE90] #DONE - - [0xF367E0, c, done/code_1D590] #DONE - - [0xF36810, hasm, code_1D5C0] #DONE - - [0xF36820, c, code_1D5D0] #DONE - - [0xF375B0, c, done/code_1E360] #DONE - - [0xF37930, c, code_1E6E0] #DONE - - [0xF37A70, hasm, code_1E820] - - [0xF37B10, c, done/audio/n_sl] #DONE - - [0xF37BA0, c, done/audio/n_synthesizer] #DONE - - [0xF38580, c, done/audio/event] #DONE - - [0xF38860, c, done/audio/n_synaddplayer] #DONE - - [0xF38A30, c, done/audio/n_synallocvoice] #DONE - - [0xF38C30, c, done/audio/n_synsetvol] #DONE - - [0xF38CD0, c, done/audio/n_synstartvoice] #DONE - - [0xF38D50, c, done/audio/n_synsetpan] #DONE - - [0xF38DD0, c, done/audio/n_synsetpitch] #DONE - - [0xF38E50, c, done/audio/n_synsetfxmix] #DONE - - [0xF38EE0, c, done/audio/n_synstopvoice] #DONE - - [0xF38F50, c, done/audio/n_synfreevoice] #DONE - - [0xF38FF0, c, done/audio/n_csplayer] #DONE - - [0xF3A460, c, done/audio/cspsetbank] #DONE - - [0xF3A4A0, c, done/audio/cspstop] #DONE - - [0xF3A4D0, c, done/audio/n_csq] #DONE - - [0xF3AB70, c, done/audio/cspsetseq] #DONE - - [0xF3ABB0, c, done/audio/cspplay] #DONE - - [0xF3ABE0, c, done/audio/cspsetvol] #DONE - - [0xF3AC20, c, done/audio/code_219D0] #DONE - - [0xF3AC60, c, done/audio/cspsettempo] #DONE - - [0xF3ACD0, c, done/audio/code_21A80] #DONE - - [0xF3AD00, c, done/audio/cspgettempo] #DONE - - [0xF3AD40, c, done/audio/code_21AF0] #DONE - - [0xF3ADA0, c, done/audio/code_21B50] #DONE - - [0xF3AE40, c, done/audio/n_syndelete] #DONE - - [0xF3AEA0, c, done/audio/n_synallocfx] #DONE - - [0xF3AF00, c, done/audio/n_reverb] #DONE - - [0xF3B990, c, done/audio/n_auxbus] #DONE - - [0xF3BA40, c, done/audio/n_drvrNew] #DONE - - [0xF3BFA0, c, done/audio/n_save] #DONE - - [0xF3BFF0, c, done/audio/n_envresample] #DONE - - [0xF3C090, c, done/audio/n_env] #DONE - - [0xF3CA40, c, done/audio/n_seqplayer] #DONE - - [0xF3E5B0, c, done/audio/n_synstartvoiceparam] #DONE - - [0xF3E690, c, done/audio/n_mainbus] #DONE - - [0xF3E710, c, done/audio/n_load] #DONE - - [0xF3E8D0, c, done/audio/n_adpcm] #DONE - - [0xF3EE90, c, done/audio/n_resample] #DONE - - [0xF3F070, c, done/audio/n_seq] #DONE - - [0xF3F360, c, done/audio/n_synsetpriority] #DONE - - [0xF3F370, asm, os/invaldcache] #DONE - - [0xF3F410, asm, os/writebackdcacheall] #DONE - - [0xF3F440, c, os/initialize] #DONE - - [0xF3F6D0, c, done/os/createthread] #DONE - - [0xF3F820, c, done/gu/sinf] #DONE - - [0xF3F9E0, c, done/audio/cents2ratio] #DONE - - [0xF3FA30, c, done/audio/heapinit] #DONE + - [0xF198B0, c, code_660] #DONE + - [0xF19A10, c, inflate] #DONE + - [0xF1AF50, c, code_1D00] #DONE + - [0xF1BE20, c, code_2BD0] + - [0xF1BFF0, c, code_2DA0] #DONE + - [0xF1C1F0, c, code_2FA0] #DONE + - [0xF1C410, c, code_31C0] #DONE + - [0xF1C4A0, c, code_3250] #DONE + - [0xF1CCC0, c, code_3A70] #DONE + - [0xF1E8A0, c, code_5650] + - [0xF202E0, c, code_7090] #DONE + - [0xF20500, c, code_72B0] #DONE + - [0xF211B0, c, code_7F60] #DONE + - [0xF21EA0, c, code_8C50] #DONE + - [0xF22F80, c, code_9D30] #DONE + - [0xF23E00, c, code_ABB0] #DONE + - [0xF260B0, c, code_CE60] #DONE + - [0xF275B0, c, code_E360] #DONE + - [0xF27D40, c, code_EAF0] #DONE + - [0xF29C50, c,code_10A00] + - [0xF2AD10, c, code_11AC0] #DONE + - [0xF2C160, c, code_12F10] #DONE + - [0xF2C890, c, code_13640] #DONE + - [0xF2C8D0, c, code_13680] #DONE + - [0xF2C920, c, code_136D0] #DONE + - [0xF2CBE0, c, code_13990] + - [0xF2E840, hasm, code_155F0] #DONE + - [0xF2E880, c, code_15630] #DONE + - [0xF2E9C0, c, code_15770] #DONE + - [0xF2ED80, c, code_15B30] #DONE + - [0xF2FCA0, c, memory] #DONE + - [0xF31360, c, code_18110] #DONE + - [0xF31460, c, code_18210] #DONE + - [0xF31560, c, code_18310] #DONE + - [0xF315A0, c, code_18350] #DONE + - [0xF350E0, c, code_1BE90] #DONE + - [0xF367E0, c, code_1D590] #DONE + - [0xF36810, hasm, code_1D5C0] #DONE + - [0xF36820, c, code_1D5D0] #DONE + - [0xF375B0, c, code_1E360] #DONE + - [0xF37930, c, code_1E6E0] #DONE + - [0xF37A70, hasm, code_1E820] #DONE + - [0xF37B10, c, audio/n_sl] #DONE + - [0xF37BA0, c, audio/n_synthesizer] #DONE + - [0xF38580, c, audio/event] #DONE + - [0xF38860, c, audio/n_synaddplayer] #DONE + - [0xF38A30, c, audio/n_synallocvoice] #DONE + - [0xF38C30, c, audio/n_synsetvol] #DONE + - [0xF38CD0, c, audio/n_synstartvoice] #DONE + - [0xF38D50, c, audio/n_synsetpan] #DONE + - [0xF38DD0, c, audio/n_synsetpitch] #DONE + - [0xF38E50, c, audio/n_synsetfxmix] #DONE + - [0xF38EE0, c, audio/n_synstopvoice] #DONE + - [0xF38F50, c, audio/n_synfreevoice] #DONE + - [0xF38FF0, c, audio/n_csplayer] #DONE + - [0xF3A460, c, audio/cspsetbank] #DONE + - [0xF3A4A0, c, audio/cspstop] #DONE + - [0xF3A4D0, c, audio/n_csq] #DONE + - [0xF3AB70, c, audio/cspsetseq] #DONE + - [0xF3ABB0, c, audio/cspplay] #DONE + - [0xF3ABE0, c, audio/cspsetvol] #DONE + - [0xF3AC20, c, audio/code_219D0] #DONE + - [0xF3AC60, c, audio/cspsettempo] #DONE + - [0xF3ACD0, c, audio/code_21A80] #DONE + - [0xF3AD00, c, audio/cspgettempo] #DONE + - [0xF3AD40, c, audio/code_21AF0] #DONE + - [0xF3ADA0, c, audio/code_21B50] #DONE + - [0xF3AE40, c, audio/n_syndelete] #DONE + - [0xF3AEA0, c, audio/n_synallocfx] #DONE + - [0xF3AF00, c, audio/n_reverb] #DONE + - [0xF3B990, c, audio/n_auxbus] #DONE + - [0xF3BA40, c, audio/n_drvrNew] #DONE + - [0xF3BFA0, c, audio/n_save] #DONE + - [0xF3BFF0, c, audio/n_envresample] #DONE + - [0xF3C090, c, audio/n_env] #DONE + - [0xF3CA40, c, audio/n_seqplayer] #DONE + - [0xF3E5B0, c, audio/n_synstartvoiceparam] #DONE + - [0xF3E690, c, audio/n_mainbus] #DONE + - [0xF3E710, c, audio/n_load] #DONE + - [0xF3E8D0, c, audio/n_adpcm] #DONE + - [0xF3EE90, c, audio/n_resample] #DONE + - [0xF3F070, c, audio/n_seq] #DONE + - [0xF3F360, c, audio/n_synsetpriority] #DONE + - [0xF3F370, asm, os/invaldcache] #DONE + - [0xF3F410, asm, os/writebackdcacheall] #DONE + - [0xF3F440, c, os/initialize] #DONE + - [0xF3F6D0, c, os/createthread] #DONE + - [0xF3F820, c, gu/sinf] #DONE + - [0xF3F9E0, c, audio/cents2ratio] #DONE + - [0xF3FA30, c, audio/heapinit] #DONE - [0xF3FA70, asm, padding] # 0x60 bytes of zeroes? - - [0xF3FAD0, c, done/os/createmesgqueue] #DONE - - [0xF3FB00, c, done/io/aisetfreq] #DONE - - [0xF3FC60, c, done/audio/sl] #DONE - - [0xF3FD20, c, done/audio/heapalloc] #DONE - - [0xF3FD80, c, done/os/recvmesg] #DONE - - [0xF3FEC0, c, done/io/aigetlen] #DONE - - [0xF3FED0, c, done/os/virtualtophysical] #DONE - - [0xF3FF50, c, done/io/aisetnextbuf] #DONE - - [0xF40000, c, done/os/pidma] #DONE - - [0xF40110, c, done/os/stopthread] #DONE - - [0xF401D0, c, done/os/startthread] #DONE - - [0xF40320, hasm, os/writebackdcache] #DONE - - [0xF403A0, hasm, invaldcache] #DONE - - [0xF40450, c, done/io/pimgr] #DONE - - [0xF405E0, c, done/os/destroythread] #DONE - - [0xF406E0, c, done/os/sendmesg] #DONE - - [0xF40830, c, done/os/settreadpri] #DONE - - [0xF40910, c, done/gu/mtxutil] #DONE - - [0xF40B80, c, done/gu/sqrtf] #DONE - - [0xF40B90, c, done/gu/cosf] #DONE - - [0xF40D00, hasm, ultra/setintmask] #DONE - - [0xF40DA0, c, done/io/dpsetstat] #DONE - - [0xF40DB0, c, done/io/sptask] #DONE - - [0xF410A0, c, done/io/dpgetstat] #DONE - - [0xF410A0, c, done/io/vigetcurrframebuf] #DONE - - [0xF410F0, c, done/os/stoptimer] #DONE - - [0xF411E0, c, done/os/settimer] #DONE - - [0xF412C0, c, done/ll] #DONE - - [0xF41580, c, done/io/sptaskyielded] #DONE - - [0xF41600, c, done/io/sptaskyield] #DONE - - [0xF41620, c, done/io/visetmode] #DONE - - [0xF41690, c, done/os/seteventmesg] #DONE - - [0xF41700, c, done/io/vimgr] #DONE - - [0xF41A60, c, done/io/visetspecial] #DONE - - [0xF41C20, c, done/io/viswapbuf] #DONE - - [0xF41C70, c, done/io/visetevent] #DONE - - [0xF41CE0, c, done/io/vigetnextframebuf] #DONE - - [0xF41D20, c, done/io/viblack] #DONE - - [0xF41D90, c, done/gu/ortho] #DONE - - [0xF41F50, c, done/gu/translate] #DONE - - [0xF41FF0, c, done/gu/rotate] #DONE - - [0xF421E0, c, done/io/contreaddata] #DONE - - [0xF42440, c, done/io/controller] #DONE - - [0xF42800, c, done/io/contsetch] #DONE - - [0xF42870, c, done/audio/bnkf] #DONE - - [0xF42AC0, c, done/os/gettime] #DONE - - [0xF42B50, c, done/audio/cseq] #DONE - - [0xF43610, c, done/io/motor] #DONE - - [0xF43C30, c, done/io/pfsinit] #DONE - - [0xF43CF0, hasm, invalicache] #DONE - - [0xF43D70, c, done/io/conteeplongwrite] #DONE - - [0xF43EA0, c, done/io/conteeplongread] #DONE - - [0xF43F30, c, done/io/piread] #DONE - - [0xF43F70, c, done/audio/copy] #DONE - - [0xF43FF0, c, done/audio/drvrNew] #DONE - - [0xF44790, c, done/audio/reverb] #DONE - - [0xF453E0, c, done/syncprintf] #DONE - - [0xF45420, c, done/audio/seq] #DONE - - [0xF45A40, hasm, setsr] #DONE - - [0xF45A50, hasm, getsr] #DONE - - [0xF45A60, hasm, setfpccsr] #DONE - - [0xF45A70, c, done/io/sirawread] #DONE - - [0xF45AC0, c, done/io/sirawwrite] #DONE - - [0xF45B10, hasm, ultra/exceptasm] #DONE - - [0xF46480, c, done/io/pirawread] #DONE - - [0xF464E0, hasm, interrupt] #DONE - - [0xF46520, c, done/os/thread] #DONE - - [0xF46560, c, done/audio/synthesizer] #DONE - - [0xF46C40, c, done/audio/syndelete] #DONE - - [0xF46C50, hasm, probetlb] #DONE - - [0xF46D10, c, done/io/ai] #DONE - - [0xF46D40, c, done/os/jammesg] #DONE - - [0xF46E90, c, done/io/pigetcmdq] #DONE - - [0xF46EC0, c, done/io/cartrominit] #DONE - - [0xF46FC0, c, done/io/leodiskinit] #DONE - - [0xF470C0, c, done/io/piacs] #DONE - - [0xF47180, c, done/os/getthreadpri] #DONE - - [0xF471A0, c, done/io/pirawdma] #DONE - - [0xF47280, c, done/io/epirawdma] #DONE - - [0xF474B0, c, done/io/devmgr] #DONE - - [0xF47940, hasm, bcopy] #DONE - - [0xF47C50, c, done/io/spsetstat] #DONE - - [0xF47C60, c, done/io/spsetpc] #DONE - - [0xF47CA0, c, done/io/sprawdma] #DONE - - [0xF47D30, c, done/io/sp] #DONE - - [0xF47D60, c, done/io/vi] #DONE - - [0xF47EA0, c, done/os/timerintr] #DONE - - [0xF482A0, hasm, setcompare] #DONE - - [0xF482B0, c, done/io/spgetstat] #DONE - - [0xF482C0, c, done/io/vigetcurrcontext] #DONE - - [0xF482D0, c, done/io/viswapcontext] #DONE - - [0xF48630, hasm, getcount] #DONE - - [0xF48640, c, done/gu/normalize] #DONE - - [0xF486D0, c, done/io/siacs] #DONE - - [0xF48790, c, done/io/sirawdma] #DONE - - [0xF48840, c, done/io/pfsisplug] #DONE - - [0xF48BB0, c, done/io/crc] #DONE - - [0xF48D30, c, done/io/contramwrite] #DONE - - [0xF490B0, c, done/io/contramread] #DONE - - [0xF49440, c, done/io/pfsgetstatus] #DONE - - [0xF49550, c, done/io/contpfs] #DONE - - [0xF4A2B0, c, done/io/pfschecker] #DONE - - [0xF4AD10, c, done/io/conteepwrite] #DONE - - [0xF4B260, c, done/io/conteepread] #DONE - - [0xF4B5C0, c, done/audio/filter] #DONE - - [0xF4B5E0, c, done/audio/env] #DONE - - [0xF4C160, c, done/audio/load] #DONE - - [0xF4CCB0, c, done/audio/resample] #DONE - - [0xF4CFB0, c, done/audio/auxbus] #DONE - - [0xF4D0C0, c, done/audio/mainbus] #DONE - - [0xF4D210, c, done/audio/save] #DONE - - [0xF4D2D0, c, done/io/si] #DONE - - [0xF4D300, c, done/io/leointerrupt] #DONE - - [0xF4DB80, c, done/audio/synallocfx] #DONE - - [0xF4DC20, c, done/os/resetglobalintmask] #DONE - - [0xF4DC80, c, done/io/epirawwrite] #DONE - - [0xF4DCD0, c, done/io/epirawread] #DONE - - [0xF4DD20, c, done/os/setglobalintmask] #DONE - - [0xF4DD70, c, done/os/yieldthread] #DONE + - [0xF3FAD0, c, os/createmesgqueue] #DONE + - [0xF3FB00, c, io/aisetfreq] #DONE + - [0xF3FC60, c, audio/sl] #DONE + - [0xF3FD20, c, audio/heapalloc] #DONE + - [0xF3FD80, c, os/recvmesg] #DONE + - [0xF3FEC0, c, io/aigetlen] #DONE + - [0xF3FED0, c, os/virtualtophysical] #DONE + - [0xF3FF50, c, io/aisetnextbuf] #DONE + - [0xF40000, c, os/pidma] #DONE + - [0xF40110, c, os/stopthread] #DONE + - [0xF401D0, c, os/startthread] #DONE + - [0xF40320, hasm, os/writebackdcache] #DONE + - [0xF403A0, hasm, invaldcache] #DONE + - [0xF40450, c, io/pimgr] #DONE + - [0xF405E0, c, os/destroythread] #DONE + - [0xF406E0, c, os/sendmesg] #DONE + - [0xF40830, c, os/settreadpri] #DONE + - [0xF40910, c, gu/mtxutil] #DONE + - [0xF40B80, c, gu/sqrtf] #DONE + - [0xF40B90, c, gu/cosf] #DONE + - [0xF40D00, hasm, ultra/setintmask] #DONE + - [0xF40DA0, c, io/dpsetstat] #DONE + - [0xF40DB0, c, io/sptask] #DONE + - [0xF410A0, c, io/dpgetstat] #DONE + - [0xF410A0, c, io/vigetcurrframebuf] #DONE + - [0xF410F0, c, os/stoptimer] #DONE + - [0xF411E0, c, os/settimer] #DONE + - [0xF412C0, c, ll] #DONE + - [0xF41580, c, io/sptaskyielded] #DONE + - [0xF41600, c, io/sptaskyield] #DONE + - [0xF41620, c, io/visetmode] #DONE + - [0xF41690, c, os/seteventmesg] #DONE + - [0xF41700, c, io/vimgr] #DONE + - [0xF41A60, c, io/visetspecial] #DONE + - [0xF41C20, c, io/viswapbuf] #DONE + - [0xF41C70, c, io/visetevent] #DONE + - [0xF41CE0, c, io/vigetnextframebuf] #DONE + - [0xF41D20, c, io/viblack] #DONE + - [0xF41D90, c, gu/ortho] #DONE + - [0xF41F50, c, gu/translate] #DONE + - [0xF41FF0, c, gu/rotate] #DONE + - [0xF421E0, c, io/contreaddata] #DONE + - [0xF42440, c, io/controller] #DONE + - [0xF42800, c, io/contsetch] #DONE + - [0xF42870, c, audio/bnkf] #DONE + - [0xF42AC0, c, os/gettime] #DONE + - [0xF42B50, c, audio/cseq] #DONE + - [0xF43610, c, io/motor] #DONE + - [0xF43C30, c, io/pfsinit] #DONE + - [0xF43CF0, hasm, invalicache] #DONE + - [0xF43D70, c, io/conteeplongwrite] #DONE + - [0xF43EA0, c, io/conteeplongread] #DONE + - [0xF43F30, c, io/piread] #DONE + - [0xF43F70, c, audio/copy] #DONE + - [0xF43FF0, c, audio/drvrNew] #DONE + - [0xF44790, c, audio/reverb] #DONE + - [0xF453E0, c, syncprintf] #DONE + - [0xF45420, c, audio/seq] #DONE + - [0xF45A40, hasm, setsr] #DONE + - [0xF45A50, hasm, getsr] #DONE + - [0xF45A60, hasm, setfpccsr] #DONE + - [0xF45A70, c, io/sirawread] #DONE + - [0xF45AC0, c, io/sirawwrite] #DONE + - [0xF45B10, hasm, ultra/exceptasm] #DONE + - [0xF46480, c, io/pirawread] #DONE + - [0xF464E0, hasm, interrupt] #DONE + - [0xF46520, c, os/thread] #DONE + - [0xF46560, c, audio/synthesizer] #DONE + - [0xF46C40, c, audio/syndelete] #DONE + - [0xF46C50, hasm, probetlb] #DONE + - [0xF46D10, c, io/ai] #DONE + - [0xF46D40, c, os/jammesg] #DONE + - [0xF46E90, c, io/pigetcmdq] #DONE + - [0xF46EC0, c, io/cartrominit] #DONE + - [0xF46FC0, c, io/leodiskinit] #DONE + - [0xF470C0, c, io/piacs] #DONE + - [0xF47180, c, os/getthreadpri] #DONE + - [0xF471A0, c, io/pirawdma] #DONE + - [0xF47280, c, io/epirawdma] #DONE + - [0xF474B0, c, io/devmgr] #DONE + - [0xF47940, hasm, bcopy] #DONE + - [0xF47C50, c, io/spsetstat] #DONE + - [0xF47C60, c, io/spsetpc] #DONE + - [0xF47CA0, c, io/sprawdma] #DONE + - [0xF47D30, c, io/sp] #DONE + - [0xF47D60, c, io/vi] #DONE + - [0xF47EA0, c, os/timerintr] #DONE + - [0xF482A0, hasm, setcompare] #DONE + - [0xF482B0, c, io/spgetstat] #DONE + - [0xF482C0, c, io/vigetcurrcontext] #DONE + - [0xF482D0, c, io/viswapcontext] #DONE + - [0xF48630, hasm, getcount] #DONE + - [0xF48640, c, gu/normalize] #DONE + - [0xF486D0, c, io/siacs] #DONE + - [0xF48790, c, io/sirawdma] #DONE + - [0xF48840, c, io/pfsisplug] #DONE + - [0xF48BB0, c, io/crc] #DONE + - [0xF48D30, c, io/contramwrite] #DONE + - [0xF490B0, c, io/contramread] #DONE + - [0xF49440, c, io/pfsgetstatus] #DONE + - [0xF49550, c, io/contpfs] #DONE + - [0xF4A2B0, c, io/pfschecker] #DONE + - [0xF4AD10, c, io/conteepwrite] #DONE + - [0xF4B260, c, io/conteepread] #DONE + - [0xF4B5C0, c, audio/filter] #DONE + - [0xF4B5E0, c, audio/env] #DONE + - [0xF4C160, c, audio/load] #DONE + - [0xF4CCB0, c, audio/resample] #DONE + - [0xF4CFB0, c, audio/auxbus] #DONE + - [0xF4D0C0, c, audio/mainbus] #DONE + - [0xF4D210, c, audio/save] #DONE + - [0xF4D2D0, c, io/si] #DONE + - [0xF4D300, c, io/leointerrupt] #DONE + - [0xF4DB80, c, audio/synallocfx] #DONE + - [0xF4DC20, c, os/resetglobalintmask] #DONE + - [0xF4DC80, c, io/epirawwrite] #DONE + - [0xF4DCD0, c, io/epirawread] #DONE + - [0xF4DD20, c, os/setglobalintmask] #DONE + - [0xF4DD70, c, os/yieldthread] #DONE - [0xF4DDC0, bin, n_aspMain_text] - [0xF4EA20, bin, gSPF3DEX_fifo_text] - [0xF4FE50, bin, gSPL3DEX_fifo_text] @@ -371,7 +371,7 @@ segments: - [0xF51140, .data, code_8C50] - [0xF51280, .data, code_9D30] - [0xF51430, .data, code_ABB0] - - [0xF51440, .data, done/code_CE60] + - [0xF51440, .data, code_CE60] - [0xF514B0, .data, code_E360] - [0xF51550, .data, code_EAF0] - [0xF51560, .data, code_10A00] @@ -384,28 +384,28 @@ segments: - [0xF524E0, .data, code_18350] - [0xF52660, .data, code_1BE90] - [0xF52670, .data, code_1D5D0] - - [0xF52690, .data, done/code_1E360] + - [0xF52690, .data, code_1E360] - [0xF526A0, .data, data_1E820] - - [0xF526B0, .data, done/audio/n_sl] - - [0xF526C0, .data, done/audio/n_drvrNew] - - [0xF52850, .data, done/audio/n_env] + - [0xF526B0, .data, audio/n_sl] + - [0xF526C0, .data, audio/n_drvrNew] + - [0xF52850, .data, audio/n_env] - [0xF52950, .data, os/initialize] - - [0xF52970, .data, done/audio/sl] - - [0xF52980, .data, done/io/aisetnextbuf] - - [0xF52990, .data, done/io/pimgr] - - [0xF529C0, .data, done/io/vimgr] - - [0xF529E0, .data, done/io/controller] - - [0xF529F0, .data, done/audio/drvrNew] + - [0xF52970, .data, audio/sl] + - [0xF52980, .data, io/aisetnextbuf] + - [0xF52990, .data, io/pimgr] + - [0xF529C0, .data, io/vimgr] + - [0xF529E0, .data, io/controller] + - [0xF529F0, .data, audio/drvrNew] - [0xF52B80, .data, ultra/exceptasm] - - [0xF52BA0, .data, done/os/thread] - - [0xF52BC0, .data, done/io/piacs] - - [0xF52BD0, .data, done/io/vi] - - [0xF52C40, .data, done/os/timerintr] - - [0xF52C50, .data, done/io/siacs] - - [0xF52C60, .data, done/audio/env] - - [0xF52D60, .data, done/io/vimodepallan1] - - [0xF52DB0, .data, done/io/vimodempallan1] - - [0xF52DB0, .data, done/io/vimodentsclan1] + - [0xF52BA0, .data, os/thread] + - [0xF52BC0, .data, io/piacs] + - [0xF52BD0, .data, io/vi] + - [0xF52C40, .data, os/timerintr] + - [0xF52C50, .data, io/siacs] + - [0xF52C60, .data, audio/env] + - [0xF52D60, .data, io/vimodepallan1] + - [0xF52DB0, .data, io/vimodempallan1] + - [0xF52DB0, .data, io/vimodentsclan1] - [0xF52E50, .rodata, code_1D00] - [0xF52E70, .rodata, code_3250] - [0xF52E80, .rodata, code_3A70] @@ -413,7 +413,7 @@ segments: - [0xF52EF0, .rodata, code_72B0] - [0xF52F10, .rodata, code_7F60] - [0xF52F30, .rodata, code_9D30] - - [0xF52F50, .rodata, done/code_CE60] + - [0xF52F50, .rodata, code_CE60] - [0xF53220, .rodata, code_EAF0] - [0xF532A0, .rodata, code_10A00] - [0xF539B0, .rodata, code_11AC0] @@ -423,29 +423,29 @@ segments: - [0xF53A70, .rodata, code_18350] - [0xF53B70, .rodata, code_1BE90] - [0xF53BA0, .rodata, code_1D5D0] - - [0xF53C00, .rodata, done/audio/n_synthesizer] - - [0xF53C10, .rodata, done/audio/n_csplayer] - - [0xF53F80, .rodata, done/audio/n_reverb] - - [0xF53FB0, .rodata, done/audio/n_drvrNew] - - [0xF53FD0, .rodata, done/audio/n_env] - - [0xF54020, .rodata, done/audio/n_seqplayer] - - [0xF543D0, .rodata, done/audio/n_resample] - - [0xF543E0, .rodata, done/gu/sinf] - - [0xF54430, .rodata, done/audio/cents2ratio] - - [0xF54440, .rodata, done/gu/cosf] + - [0xF53C00, .rodata, audio/n_synthesizer] + - [0xF53C10, .rodata, audio/n_csplayer] + - [0xF53F80, .rodata, audio/n_reverb] + - [0xF53FB0, .rodata, audio/n_drvrNew] + - [0xF53FD0, .rodata, audio/n_env] + - [0xF54020, .rodata, audio/n_seqplayer] + - [0xF543D0, .rodata, audio/n_resample] + - [0xF543E0, .rodata, gu/sinf] + - [0xF54430, .rodata, audio/cents2ratio] + - [0xF54440, .rodata, gu/cosf] - [0xF54490, .rodata, ultra/setintmask] - - [0xF54510, .rodata, done/gu/rotate] - - [0xF54520, .rodata, done/audio/cseq] - - [0xF54530, .rodata, done/audio/drvrNew] - - [0xF54550, .rodata, done/audio/reverb] - - [0xF54580, .rodata, done/audio/seq] + - [0xF54510, .rodata, gu/rotate] + - [0xF54520, .rodata, audio/cseq] + - [0xF54530, .rodata, audio/drvrNew] + - [0xF54550, .rodata, audio/reverb] + - [0xF54580, .rodata, audio/seq] - [0xF54590, .rodata, ultra/exceptasm] - [0xF545E0, hasm, ultra/libm_vals] # Nothing in this file, just here so splat sees it's ASM - [0xF545E0, .rodata, ultra/libm_vals] - - [0xF545F0, .rodata, done/audio/synthesizer] - - [0xF54600, .rodata, done/io/devmgr] - - [0xF54620, .rodata, done/audio/env] - - [0xF54670, .rodata, done/audio/resample] + - [0xF545F0, .rodata, audio/synthesizer] + - [0xF54600, .rodata, io/devmgr] + - [0xF54620, .rodata, audio/env] + - [0xF54670, .rodata, audio/resample] - [0xF546B0, bin, n_aspMain_data] - [0xF54960, bin, gSPF3DEX_fifo_data] - [0xF55160, bin, gSPL3DEX_fifo_data] @@ -461,7 +461,7 @@ segments: - [0xF55960, .bss, code_72B0] - [0xF55960, .bss, code_8C50] - [0xF55960, .bss, code_ABB0] - - [0xF55960, .bss, done/code_CE60] + - [0xF55960, .bss, code_CE60] - [0xF55960, .bss, code_E360] - [0xF55960, .bss, code_EAF0] - [0xF55960, .bss, code_10A00] @@ -475,24 +475,24 @@ segments: - [0xF55960, .bss, memory] - [0xF55960, .bss, code_18210] - [0xF55960, .bss, code_1D5D0] - - [0xF55960, .bss, done/code_1E360] + - [0xF55960, .bss, code_1E360] - [0xF55960, .bss, os/initialize] - - [0xF55960, .bss, done/io/pimgr] - - [0xF55960, .bss, done/io/sptask] - - [0xF55960, .bss, done/os/seteventmesg] - - [0xF55960, .bss, done/io/vimgr] - - [0xF55960, .bss, done/gu/rotate] - - [0xF55960, .bss, done/io/controller] - - [0xF55960, .bss, done/io/motor] - - [0xF55960, .bss, done/io/cartrominit] - - [0xF55960, .bss, done/io/leodiskinit] - - [0xF55960, .bss, done/io/piacs] - - [0xF55960, .bss, done/os/timerintr] - - [0xF55960, .bss, done/io/siacs] - - [0xF55960, .bss, done/io/pfsisplug] - - [0xF55960, .bss, done/io/conteepread] + - [0xF55960, .bss, io/pimgr] + - [0xF55960, .bss, io/sptask] + - [0xF55960, .bss, os/seteventmesg] + - [0xF55960, .bss, io/vimgr] + - [0xF55960, .bss, gu/rotate] + - [0xF55960, .bss, io/controller] + - [0xF55960, .bss, io/motor] + - [0xF55960, .bss, io/cartrominit] + - [0xF55960, .bss, io/leodiskinit] + - [0xF55960, .bss, io/piacs] + - [0xF55960, .bss, os/timerintr] + - [0xF55960, .bss, io/siacs] + - [0xF55960, .bss, io/pfsisplug] + - [0xF55960, .bss, io/conteepread] - [0xF55960, .bss, os/kdebugserver] - - [0xF55960, .bss, done/io/leointerrupt] + - [0xF55960, .bss, io/leointerrupt] - name: core2 dir: core2 type: code @@ -541,7 +541,7 @@ segments: - [0xF66630, c, code_10CD0] #DONE - [0xF66700, c, pitch] #DONE - [0xF669A0, c, code_11040] #DONE - - [0xF66BB0, c, done/climb] #DONE + - [0xF66BB0, c, climb] #DONE - [0xF66DC0, c, code_11460] #DONE - [0xF66FC0, c, code_11660] #DONE - [0xF67130, c, code_117D0] #DONE @@ -585,10 +585,10 @@ segments: - [0xF7C0A0, c, bs/crouch] #DONE - [0xF7C7D0, c, bs/die] #DONE - [0xF7CD40, c, bs/drone] #DONE - - [0xF7CEB0, c, code_27550] #DONE #drone_enter??? + - [0xF7CEB0, c, bs/droneenter] #DONE - [0xF7D530, c, bs/dronegoto] #DONE - - [0xF7D8A0, c, code_27F40] #DONE #dronelook??? - - [0xF7DB80, c, code_28220] #DONE #dronevanish??? + - [0xF7D8A0, c, bs/dronelook] #DONE + - [0xF7DB80, c, bs/dronevanish] #DONE - [0xF7E170, c, bs/dronexform] #DONE - [0xF7F430, c, bs/jig] #DONE - [0xF7FAD0, c, bs/jump] #DONE @@ -602,7 +602,7 @@ segments: - [0xF83240, c, bs/stand] #DONE - [0xF83E50, c, bs/swim] #DONE - [0xF849A0, c, bs/surf] #DONE - - [0xF84B00, c, done/bs/talk] #DONE + - [0xF84B00, c, bs/talk] #DONE - [0xF84C40, c, bs/timeout] #DONE - [0xF84F10, c, bs/throw] #DONE - [0xF85130, c, bs/turn] #DONE @@ -637,7 +637,7 @@ segments: - [0xF8F370, c, code_39A10] #DONE - [0xF8F850, c, code_39EF0] #DONE - [0xF90770, c, code_3AE10] #DONE - - [0xF90C20, c, done/code_3B2C0] #DONE + - [0xF90C20, c, code_3B2C0] #DONE - [0xF90F20, c, code_3B5C0] #DONE - [0xF914E0, c, spawnqueue] #DONE - [0xF92D30, c, ch/gameSelect] #DONE @@ -1134,7 +1134,7 @@ segments: - [0x10433B0, .rodata, code_10CD0] - [0x10433C0, .rodata, pitch] - [0x10433F0, .rodata, code_11040] - - [0x1043400, .rodata, done/climb] + - [0x1043400, .rodata, climb] - [0x1043410, .rodata, code_11660] - [0x10435D0, .rodata, code_11870] - [0x10435E0, .rodata, roll] @@ -1168,10 +1168,10 @@ segments: - [0x1044180, .rodata, bs/croc] - [0x10441E0, .rodata, bs/crouch] - [0x1044210, .rodata, bs/die] - - [0x1044220, .rodata, code_27550] + - [0x1044220, .rodata, bs/droneenter] - [0x1044230, .rodata, bs/dronegoto] - - [0x1044240, .rodata, code_27F40] - - [0x1044250, .rodata, code_28220] + - [0x1044240, .rodata, bs/dronelook] + - [0x1044250, .rodata, bs/dronevanish] - [0x1044260, .rodata, bs/dronexform] - [0x1044310, .rodata, bs/jig] - [0x1044330, .rodata, bs/jump] @@ -1183,7 +1183,7 @@ segments: - [0x1044440, .rodata, bs/stand] - [0x1044470, .rodata, bs/swim] - [0x10444C0, .rodata, bs/surf] - - [0x10444D0, .rodata, done/bs/talk] + - [0x10444D0, .rodata, bs/talk] - [0x10444E0, .rodata, bs/timeout] - [0x10444F0, .rodata, bs/throw] - [0x1044500, .rodata, bs/turn] @@ -1394,7 +1394,7 @@ segments: - [0x1048560, .bss, code_10CD0] - [0x1048560, .bss, pitch] - [0x1048560, .bss, code_11040] - - [0x1048560, .bss, done/climb] + - [0x1048560, .bss, climb] - [0x1048560, .bss, code_11460] - [0x1048560, .bss, code_11660] - [0x1048560, .bss, code_117D0] @@ -1435,9 +1435,9 @@ segments: - [0x1048560, .bss, bs/croc] - [0x1048560, .bss, bs/crouch] - [0x1048560, .bss, bs/die] - - [0x1048560, .bss, code_27550] + - [0x1048560, .bss, bs/droneenter] - [0x1048560, .bss, bs/dronegoto] - - [0x1048560, .bss, code_28220] + - [0x1048560, .bss, bs/dronevanish] - [0x1048560, .bss, bs/dronexform] - [0x1048560, .bss, bs/jig] - [0x1048560, .bss, bs/jump] @@ -1450,7 +1450,7 @@ segments: - [0x1048560, .bss, bs/stand] - [0x1048560, .bss, bs/swim] - [0x1048560, .bss, bs/surf] - - [0x1048560, .bss, done/bs/talk] + - [0x1048560, .bss, bs/talk] - [0x1048560, .bss, bs/throw] - [0x1048560, .bss, bs/turn] - [0x1048560, .bss, bs/twirl] @@ -1477,7 +1477,7 @@ segments: - [0x1048560, .bss, code_396B0] - [0x1048560, .bss, code_39A10] - [0x1048560, .bss, code_39EF0] - - [0x1048560, .bss, done/code_3B2C0] + - [0x1048560, .bss, code_3B2C0] - [0x1048560, .bss, code_3B5C0] - [0x1048560, .bss, ch/gameSelect] - [0x1048560, .bss, code_41460] @@ -1882,55 +1882,55 @@ segments: # after: core2-data subsegments: - [0x1068370, c, ch/flibbit] #DONE - - [0x1069960, c, done/ch/pinkegg] #DONE + - [0x1069960, c, ch/pinkegg] #DONE - [0x1069C10, c, ch/croctus] #DONE - - [0x106A5E0, c, done/ch/code_2270] #DONE + - [0x106A5E0, c, ch/code_2270] #DONE - [0x106B3A0, c, code_3030] #DONE - [0x106B790, c, code_3420] - [0x106D0E0, c, ch/yumblie] #DONE - [0x106D970, c, ch/mrvile] #DONE - - [0x106EAA0, c, done/ch/code_6730] #DONE + - [0x106EAA0, c, ch/code_6730] #DONE - [0x106F160, c, ch/yellowflibbit] #DONE - - [0x10709B0, c, done/ch/mudhut] #DONE - - [0x1070DD0, c, done/ch/code_8A60] #DONE - - [0x1071160, c, done/code_8DF0] #DONE + - [0x10709B0, c, ch/mudhut] #DONE + - [0x1070DD0, c, ch/code_8A60] #DONE + - [0x1071160, c, code_8DF0] #DONE - [0x10713F0, c, ch/tanktup] - [0x1071AC0, c, code_9750] #DONE - - [0x1071C30, c, done/ch/bigalligator] #DONE + - [0x1071C30, c, ch/bigalligator] #DONE - [0x1071C90, c, ch/leafboat] #DONE - [0x1072610, .data, ch/flibbit] - - [0x1072640, .data, done/ch/pinkegg] + - [0x1072640, .data, ch/pinkegg] - [0x1072730, .data, ch/croctus] - - [0x10727B0, .data, done/ch/code_2270] + - [0x10727B0, .data, ch/code_2270] - [0x1072800, .data, code_3030] - [0x10728E0, .data, code_3420] - [0x10729C0, .data, ch/yumblie] - [0x10729F0, .data, ch/mrvile] - - [0x1072A30, .data, done/ch/code_6730] + - [0x1072A30, .data, ch/code_6730] - [0x1072A60, .data, ch/yellowflibbit] - [0x1072AA0, .data, crc] - - [0x1072AB0, .data, done/ch/mudhut] - - [0x1072B10, .data, done/ch/code_8A60] + - [0x1072AB0, .data, ch/mudhut] + - [0x1072B10, .data, ch/code_8A60] - [0x1072BA0, .data, ch/tanktup] - [0x1072BD0, .data, code_9750] - - [0x1072CF0, .data, done/ch/bigalligator] + - [0x1072CF0, .data, ch/bigalligator] - [0x1072D20, .data, ch/leafboat] - [0x1072D50, .rodata, ch/flibbit] - [0x1072E60, .rodata, ch/croctus] - - [0x1072EF0, .rodata, done/ch/code_2270] + - [0x1072EF0, .rodata, ch/code_2270] - [0x1072F60, .rodata, code_3030] - [0x1072F70, .rodata, code_3420] - [0x1072F90, .rodata, ch/yumblie] - [0x1072FC0, .rodata, ch/mrvile] - - [0x1073010, .rodata, done/ch/code_6730] + - [0x1073010, .rodata, ch/code_6730] - [0x1073020, .rodata, ch/yellowflibbit] - - [0x1073110, .rodata, done/ch/mudhut] - - [0x1073120, .rodata, done/ch/code_8A60] + - [0x1073110, .rodata, ch/mudhut] + - [0x1073120, .rodata, ch/code_8A60] - [0x1073130, .rodata, ch/tanktup] - [0x1073140, .rodata, code_9750] - [0x1073150, .rodata, ch/leafboat] - [0x10731B0, .bss, bss_pad] - - [0x10731B0, .bss, done/ch/code_6730] + - [0x10731B0, .bss, ch/code_6730] - name: RBB dir: RBB type: code diff --git a/include/bs_funcs.h b/include/bs_funcs.h index 4db85e14..c8b3bc3a 100644 --- a/include/bs_funcs.h +++ b/include/bs_funcs.h @@ -227,15 +227,15 @@ void bscarry_idle_init(void); void bscarry_idle_update(void); void bscarry_idle_end(void); void bscarry_interrupt(void); -//BS_CARRY_WALK(void); +//BS_3B_CARRY_WALK(void); void bscarry_walk_init(void); void bscarry_walk_update(void); void bscarry_walk_end(void); //0x3C (void); -void func_802B6130(void); -void func_802B61E0(void); -void func_802B6218(void); -void func_802B6220(void); +void bstalk_init(void); +void bstalk_update(void); +void bstalk_end(void); +void bstalk_interrupt(void); //BS_3D_FALL_TUMBLING(void); void bsjump_tumble_init(void); void bsjump_tumble_update(void); @@ -699,17 +699,17 @@ void func_802AAE4C(void); void func_802AEDE8(void); void func_802AEE48(void); void func_802AEE9C(void); -void func_802AEEF4(void); -void func_802AEFB0(void); -void func_802AF164(void); +void bsDroneLook_init(void); +void bsDroneLook_update(void); +void bsDroneLook_end(void); void bsdronexform_init(void); void bsdronexform_update(void); void bsdronexform_end(void); void bsdronexform_interrupt(void); -void func_802AE9C8(void); -void func_802AEA2C(void); -void func_802AEB24(void); -void func_802AF604(void); -void bsdronevanish_update(void); -void func_802AF768(void); +void bsDroneEnter_init(void); +void bsDroneEnter_update(void); +void bsDroneEnter_end(void); +void bsDroneVanish_init(void); +void bsDroneVanish_update(void); +void bsDroneVanish_end(void); #endif diff --git a/include/enums.h b/include/enums.h index 1cf026d0..97357087 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1905,6 +1905,7 @@ enum actor_e enum bs_e { + BS_0_NONE = 0, BS_1_IDLE = 0x1, BS_2_WALK_SLOW, BS_WALK = 0x3, @@ -1963,8 +1964,8 @@ enum bs_e BS_38_ANT_FALL, BS_39_DIVE_A, BS_3A_CARRY_IDLE, - BS_CARRY_WALK = 0x3B, - BS_3C, + BS_3B_CARRY_WALK, + BS_3C_TALK, BS_3D_FALL_TUMBLING, BS_3E_ANT_OW, BS_3F, diff --git a/src/BGS/done/ch/bigalligator.c b/src/BGS/ch/bigalligator.c similarity index 100% rename from src/BGS/done/ch/bigalligator.c rename to src/BGS/ch/bigalligator.c diff --git a/src/BGS/done/ch/code_2270.c b/src/BGS/ch/code_2270.c similarity index 100% rename from src/BGS/done/ch/code_2270.c rename to src/BGS/ch/code_2270.c diff --git a/src/BGS/done/ch/code_6730.c b/src/BGS/ch/code_6730.c similarity index 100% rename from src/BGS/done/ch/code_6730.c rename to src/BGS/ch/code_6730.c diff --git a/src/BGS/done/ch/code_8A60.c b/src/BGS/ch/code_8A60.c similarity index 100% rename from src/BGS/done/ch/code_8A60.c rename to src/BGS/ch/code_8A60.c diff --git a/src/BGS/done/ch/mudhut.c b/src/BGS/ch/mudhut.c similarity index 100% rename from src/BGS/done/ch/mudhut.c rename to src/BGS/ch/mudhut.c diff --git a/src/BGS/done/ch/pinkegg.c b/src/BGS/ch/pinkegg.c similarity index 100% rename from src/BGS/done/ch/pinkegg.c rename to src/BGS/ch/pinkegg.c diff --git a/src/BGS/done/code_8DF0.c b/src/BGS/code_8DF0.c similarity index 100% rename from src/BGS/done/code_8DF0.c rename to src/BGS/code_8DF0.c diff --git a/src/core1/done/audio/auxbus.c b/src/core1/audio/auxbus.c similarity index 100% rename from src/core1/done/audio/auxbus.c rename to src/core1/audio/auxbus.c diff --git a/src/core1/done/audio/bnkf.c b/src/core1/audio/bnkf.c similarity index 100% rename from src/core1/done/audio/bnkf.c rename to src/core1/audio/bnkf.c diff --git a/src/core1/done/audio/cents2ratio.c b/src/core1/audio/cents2ratio.c similarity index 100% rename from src/core1/done/audio/cents2ratio.c rename to src/core1/audio/cents2ratio.c diff --git a/src/core1/done/audio/code_219D0.c b/src/core1/audio/code_219D0.c similarity index 100% rename from src/core1/done/audio/code_219D0.c rename to src/core1/audio/code_219D0.c diff --git a/src/core1/done/audio/code_21A80.c b/src/core1/audio/code_21A80.c similarity index 100% rename from src/core1/done/audio/code_21A80.c rename to src/core1/audio/code_21A80.c diff --git a/src/core1/done/audio/code_21AF0.c b/src/core1/audio/code_21AF0.c similarity index 100% rename from src/core1/done/audio/code_21AF0.c rename to src/core1/audio/code_21AF0.c diff --git a/src/core1/done/audio/code_21B50.c b/src/core1/audio/code_21B50.c similarity index 100% rename from src/core1/done/audio/code_21B50.c rename to src/core1/audio/code_21B50.c diff --git a/src/core1/done/audio/copy.c b/src/core1/audio/copy.c similarity index 100% rename from src/core1/done/audio/copy.c rename to src/core1/audio/copy.c diff --git a/src/core1/done/audio/cseq.c b/src/core1/audio/cseq.c similarity index 100% rename from src/core1/done/audio/cseq.c rename to src/core1/audio/cseq.c diff --git a/src/core1/done/audio/cspgettempo.c b/src/core1/audio/cspgettempo.c similarity index 100% rename from src/core1/done/audio/cspgettempo.c rename to src/core1/audio/cspgettempo.c diff --git a/src/core1/done/audio/cspplay.c b/src/core1/audio/cspplay.c similarity index 100% rename from src/core1/done/audio/cspplay.c rename to src/core1/audio/cspplay.c diff --git a/src/core1/done/audio/cspsetbank.c b/src/core1/audio/cspsetbank.c similarity index 100% rename from src/core1/done/audio/cspsetbank.c rename to src/core1/audio/cspsetbank.c diff --git a/src/core1/done/audio/cspsetseq.c b/src/core1/audio/cspsetseq.c similarity index 100% rename from src/core1/done/audio/cspsetseq.c rename to src/core1/audio/cspsetseq.c diff --git a/src/core1/done/audio/cspsettempo.c b/src/core1/audio/cspsettempo.c similarity index 100% rename from src/core1/done/audio/cspsettempo.c rename to src/core1/audio/cspsettempo.c diff --git a/src/core1/done/audio/cspsetvol.c b/src/core1/audio/cspsetvol.c similarity index 100% rename from src/core1/done/audio/cspsetvol.c rename to src/core1/audio/cspsetvol.c diff --git a/src/core1/done/audio/cspstop.c b/src/core1/audio/cspstop.c similarity index 100% rename from src/core1/done/audio/cspstop.c rename to src/core1/audio/cspstop.c diff --git a/src/core1/done/audio/drvrNew.c b/src/core1/audio/drvrNew.c similarity index 100% rename from src/core1/done/audio/drvrNew.c rename to src/core1/audio/drvrNew.c diff --git a/src/core1/done/audio/env.c b/src/core1/audio/env.c similarity index 100% rename from src/core1/done/audio/env.c rename to src/core1/audio/env.c diff --git a/src/core1/done/audio/event.c b/src/core1/audio/event.c similarity index 100% rename from src/core1/done/audio/event.c rename to src/core1/audio/event.c diff --git a/src/core1/done/audio/filter.c b/src/core1/audio/filter.c similarity index 100% rename from src/core1/done/audio/filter.c rename to src/core1/audio/filter.c diff --git a/src/core1/done/audio/heapalloc.c b/src/core1/audio/heapalloc.c similarity index 100% rename from src/core1/done/audio/heapalloc.c rename to src/core1/audio/heapalloc.c diff --git a/src/core1/done/audio/heapinit.c b/src/core1/audio/heapinit.c similarity index 100% rename from src/core1/done/audio/heapinit.c rename to src/core1/audio/heapinit.c diff --git a/src/core1/done/audio/load.c b/src/core1/audio/load.c similarity index 100% rename from src/core1/done/audio/load.c rename to src/core1/audio/load.c diff --git a/src/core1/done/audio/mainbus.c b/src/core1/audio/mainbus.c similarity index 100% rename from src/core1/done/audio/mainbus.c rename to src/core1/audio/mainbus.c diff --git a/src/core1/done/audio/n_adpcm.c b/src/core1/audio/n_adpcm.c similarity index 100% rename from src/core1/done/audio/n_adpcm.c rename to src/core1/audio/n_adpcm.c diff --git a/src/core1/done/audio/n_auxbus.c b/src/core1/audio/n_auxbus.c similarity index 100% rename from src/core1/done/audio/n_auxbus.c rename to src/core1/audio/n_auxbus.c diff --git a/src/core1/done/audio/n_csplayer.c b/src/core1/audio/n_csplayer.c similarity index 100% rename from src/core1/done/audio/n_csplayer.c rename to src/core1/audio/n_csplayer.c diff --git a/src/core1/done/audio/n_csq.c b/src/core1/audio/n_csq.c similarity index 100% rename from src/core1/done/audio/n_csq.c rename to src/core1/audio/n_csq.c diff --git a/src/core1/done/audio/n_drvrNew.c b/src/core1/audio/n_drvrNew.c similarity index 100% rename from src/core1/done/audio/n_drvrNew.c rename to src/core1/audio/n_drvrNew.c diff --git a/src/core1/done/audio/n_env.c b/src/core1/audio/n_env.c similarity index 100% rename from src/core1/done/audio/n_env.c rename to src/core1/audio/n_env.c diff --git a/src/core1/done/audio/n_envresample.c b/src/core1/audio/n_envresample.c similarity index 100% rename from src/core1/done/audio/n_envresample.c rename to src/core1/audio/n_envresample.c diff --git a/src/core1/done/audio/n_load.c b/src/core1/audio/n_load.c similarity index 100% rename from src/core1/done/audio/n_load.c rename to src/core1/audio/n_load.c diff --git a/src/core1/done/audio/n_mainbus.c b/src/core1/audio/n_mainbus.c similarity index 100% rename from src/core1/done/audio/n_mainbus.c rename to src/core1/audio/n_mainbus.c diff --git a/src/core1/done/audio/n_resample.c b/src/core1/audio/n_resample.c similarity index 100% rename from src/core1/done/audio/n_resample.c rename to src/core1/audio/n_resample.c diff --git a/src/core1/done/audio/n_resample_add01.c_ b/src/core1/audio/n_resample_add01.c_ similarity index 100% rename from src/core1/done/audio/n_resample_add01.c_ rename to src/core1/audio/n_resample_add01.c_ diff --git a/src/core1/done/audio/n_reverb.c b/src/core1/audio/n_reverb.c similarity index 100% rename from src/core1/done/audio/n_reverb.c rename to src/core1/audio/n_reverb.c diff --git a/src/core1/done/audio/n_save.c b/src/core1/audio/n_save.c similarity index 100% rename from src/core1/done/audio/n_save.c rename to src/core1/audio/n_save.c diff --git a/src/core1/done/audio/n_save_add01.c_ b/src/core1/audio/n_save_add01.c_ similarity index 100% rename from src/core1/done/audio/n_save_add01.c_ rename to src/core1/audio/n_save_add01.c_ diff --git a/src/core1/done/audio/n_seq.c b/src/core1/audio/n_seq.c similarity index 100% rename from src/core1/done/audio/n_seq.c rename to src/core1/audio/n_seq.c diff --git a/src/core1/done/audio/n_seqplayer.c b/src/core1/audio/n_seqplayer.c similarity index 100% rename from src/core1/done/audio/n_seqplayer.c rename to src/core1/audio/n_seqplayer.c diff --git a/src/core1/done/audio/n_sl.c b/src/core1/audio/n_sl.c similarity index 100% rename from src/core1/done/audio/n_sl.c rename to src/core1/audio/n_sl.c diff --git a/src/core1/done/audio/n_synaddplayer.c b/src/core1/audio/n_synaddplayer.c similarity index 100% rename from src/core1/done/audio/n_synaddplayer.c rename to src/core1/audio/n_synaddplayer.c diff --git a/src/core1/done/audio/n_synallocfx.c b/src/core1/audio/n_synallocfx.c similarity index 100% rename from src/core1/done/audio/n_synallocfx.c rename to src/core1/audio/n_synallocfx.c diff --git a/src/core1/done/audio/n_synallocvoice.c b/src/core1/audio/n_synallocvoice.c similarity index 100% rename from src/core1/done/audio/n_synallocvoice.c rename to src/core1/audio/n_synallocvoice.c diff --git a/src/core1/done/audio/n_syndelete.c b/src/core1/audio/n_syndelete.c similarity index 100% rename from src/core1/done/audio/n_syndelete.c rename to src/core1/audio/n_syndelete.c diff --git a/src/core1/done/audio/n_synfreevoice.c b/src/core1/audio/n_synfreevoice.c similarity index 100% rename from src/core1/done/audio/n_synfreevoice.c rename to src/core1/audio/n_synfreevoice.c diff --git a/src/core1/done/audio/n_synsetfxmix.c b/src/core1/audio/n_synsetfxmix.c similarity index 100% rename from src/core1/done/audio/n_synsetfxmix.c rename to src/core1/audio/n_synsetfxmix.c diff --git a/src/core1/done/audio/n_synsetpan.c b/src/core1/audio/n_synsetpan.c similarity index 100% rename from src/core1/done/audio/n_synsetpan.c rename to src/core1/audio/n_synsetpan.c diff --git a/src/core1/done/audio/n_synsetpitch.c b/src/core1/audio/n_synsetpitch.c similarity index 100% rename from src/core1/done/audio/n_synsetpitch.c rename to src/core1/audio/n_synsetpitch.c diff --git a/src/core1/done/audio/n_synsetpriority.c b/src/core1/audio/n_synsetpriority.c similarity index 100% rename from src/core1/done/audio/n_synsetpriority.c rename to src/core1/audio/n_synsetpriority.c diff --git a/src/core1/done/audio/n_synsetvol.c b/src/core1/audio/n_synsetvol.c similarity index 100% rename from src/core1/done/audio/n_synsetvol.c rename to src/core1/audio/n_synsetvol.c diff --git a/src/core1/done/audio/n_synstartvoice.c b/src/core1/audio/n_synstartvoice.c similarity index 100% rename from src/core1/done/audio/n_synstartvoice.c rename to src/core1/audio/n_synstartvoice.c diff --git a/src/core1/done/audio/n_synstartvoiceparam.c b/src/core1/audio/n_synstartvoiceparam.c similarity index 100% rename from src/core1/done/audio/n_synstartvoiceparam.c rename to src/core1/audio/n_synstartvoiceparam.c diff --git a/src/core1/done/audio/n_synstopvoice.c b/src/core1/audio/n_synstopvoice.c similarity index 100% rename from src/core1/done/audio/n_synstopvoice.c rename to src/core1/audio/n_synstopvoice.c diff --git a/src/core1/done/audio/n_synthesizer.c b/src/core1/audio/n_synthesizer.c similarity index 100% rename from src/core1/done/audio/n_synthesizer.c rename to src/core1/audio/n_synthesizer.c diff --git a/src/core1/done/audio/resample.c b/src/core1/audio/resample.c similarity index 100% rename from src/core1/done/audio/resample.c rename to src/core1/audio/resample.c diff --git a/src/core1/done/audio/reverb.c b/src/core1/audio/reverb.c similarity index 100% rename from src/core1/done/audio/reverb.c rename to src/core1/audio/reverb.c diff --git a/src/core1/done/audio/save.c b/src/core1/audio/save.c similarity index 100% rename from src/core1/done/audio/save.c rename to src/core1/audio/save.c diff --git a/src/core1/done/audio/seq.c b/src/core1/audio/seq.c similarity index 100% rename from src/core1/done/audio/seq.c rename to src/core1/audio/seq.c diff --git a/src/core1/done/audio/sl.c b/src/core1/audio/sl.c similarity index 100% rename from src/core1/done/audio/sl.c rename to src/core1/audio/sl.c diff --git a/src/core1/done/audio/synallocfx.c b/src/core1/audio/synallocfx.c similarity index 100% rename from src/core1/done/audio/synallocfx.c rename to src/core1/audio/synallocfx.c diff --git a/src/core1/done/audio/syndelete.c b/src/core1/audio/syndelete.c similarity index 100% rename from src/core1/done/audio/syndelete.c rename to src/core1/audio/syndelete.c diff --git a/src/core1/done/audio/synthesizer.c b/src/core1/audio/synthesizer.c similarity index 100% rename from src/core1/done/audio/synthesizer.c rename to src/core1/audio/synthesizer.c diff --git a/src/core1/done/code_1D590.c b/src/core1/code_1D590.c similarity index 100% rename from src/core1/done/code_1D590.c rename to src/core1/code_1D590.c diff --git a/src/core1/done/code_1E360.c b/src/core1/code_1E360.c similarity index 100% rename from src/core1/done/code_1E360.c rename to src/core1/code_1E360.c diff --git a/src/core1/done/code_CE60.c b/src/core1/code_CE60.c similarity index 100% rename from src/core1/done/code_CE60.c rename to src/core1/code_CE60.c diff --git a/src/core1/done/gu/cosf.c b/src/core1/gu/cosf.c similarity index 100% rename from src/core1/done/gu/cosf.c rename to src/core1/gu/cosf.c diff --git a/src/core1/done/gu/guint.h b/src/core1/gu/guint.h similarity index 100% rename from src/core1/done/gu/guint.h rename to src/core1/gu/guint.h diff --git a/src/core1/done/gu/mtxutil.c b/src/core1/gu/mtxutil.c similarity index 100% rename from src/core1/done/gu/mtxutil.c rename to src/core1/gu/mtxutil.c diff --git a/src/core1/done/gu/normalize.c b/src/core1/gu/normalize.c similarity index 100% rename from src/core1/done/gu/normalize.c rename to src/core1/gu/normalize.c diff --git a/src/core1/done/gu/ortho.c b/src/core1/gu/ortho.c similarity index 100% rename from src/core1/done/gu/ortho.c rename to src/core1/gu/ortho.c diff --git a/src/core1/done/gu/rotate.c b/src/core1/gu/rotate.c similarity index 100% rename from src/core1/done/gu/rotate.c rename to src/core1/gu/rotate.c diff --git a/src/core1/done/gu/sinf.c b/src/core1/gu/sinf.c similarity index 100% rename from src/core1/done/gu/sinf.c rename to src/core1/gu/sinf.c diff --git a/src/core1/done/gu/sqrtf.c b/src/core1/gu/sqrtf.c similarity index 100% rename from src/core1/done/gu/sqrtf.c rename to src/core1/gu/sqrtf.c diff --git a/src/core1/done/gu/translate.c b/src/core1/gu/translate.c similarity index 100% rename from src/core1/done/gu/translate.c rename to src/core1/gu/translate.c diff --git a/src/core1/done/io/ai.c b/src/core1/io/ai.c similarity index 100% rename from src/core1/done/io/ai.c rename to src/core1/io/ai.c diff --git a/src/core1/done/io/aigetlen.c b/src/core1/io/aigetlen.c similarity index 100% rename from src/core1/done/io/aigetlen.c rename to src/core1/io/aigetlen.c diff --git a/src/core1/done/io/aisetfreq.c b/src/core1/io/aisetfreq.c similarity index 100% rename from src/core1/done/io/aisetfreq.c rename to src/core1/io/aisetfreq.c diff --git a/src/core1/done/io/aisetnextbuf.c b/src/core1/io/aisetnextbuf.c similarity index 100% rename from src/core1/done/io/aisetnextbuf.c rename to src/core1/io/aisetnextbuf.c diff --git a/src/core1/done/io/cartrominit.c b/src/core1/io/cartrominit.c similarity index 100% rename from src/core1/done/io/cartrominit.c rename to src/core1/io/cartrominit.c diff --git a/src/core1/done/io/conteeplongread.c b/src/core1/io/conteeplongread.c similarity index 100% rename from src/core1/done/io/conteeplongread.c rename to src/core1/io/conteeplongread.c diff --git a/src/core1/done/io/conteeplongwrite.c b/src/core1/io/conteeplongwrite.c similarity index 100% rename from src/core1/done/io/conteeplongwrite.c rename to src/core1/io/conteeplongwrite.c diff --git a/src/core1/done/io/conteepread.c b/src/core1/io/conteepread.c similarity index 100% rename from src/core1/done/io/conteepread.c rename to src/core1/io/conteepread.c diff --git a/src/core1/done/io/conteepwrite.c b/src/core1/io/conteepwrite.c similarity index 100% rename from src/core1/done/io/conteepwrite.c rename to src/core1/io/conteepwrite.c diff --git a/src/core1/done/io/contpfs.c b/src/core1/io/contpfs.c similarity index 100% rename from src/core1/done/io/contpfs.c rename to src/core1/io/contpfs.c diff --git a/src/core1/done/io/contramread.c b/src/core1/io/contramread.c similarity index 100% rename from src/core1/done/io/contramread.c rename to src/core1/io/contramread.c diff --git a/src/core1/done/io/contramwrite.c b/src/core1/io/contramwrite.c similarity index 100% rename from src/core1/done/io/contramwrite.c rename to src/core1/io/contramwrite.c diff --git a/src/core1/done/io/contreaddata.c b/src/core1/io/contreaddata.c similarity index 100% rename from src/core1/done/io/contreaddata.c rename to src/core1/io/contreaddata.c diff --git a/src/core1/done/io/controller.c b/src/core1/io/controller.c similarity index 100% rename from src/core1/done/io/controller.c rename to src/core1/io/controller.c diff --git a/src/core1/done/io/controller.h b/src/core1/io/controller.h similarity index 100% rename from src/core1/done/io/controller.h rename to src/core1/io/controller.h diff --git a/src/core1/done/io/contsetch.c b/src/core1/io/contsetch.c similarity index 100% rename from src/core1/done/io/contsetch.c rename to src/core1/io/contsetch.c diff --git a/src/core1/done/io/crc.c b/src/core1/io/crc.c similarity index 100% rename from src/core1/done/io/crc.c rename to src/core1/io/crc.c diff --git a/src/core1/done/io/devmgr.c b/src/core1/io/devmgr.c similarity index 100% rename from src/core1/done/io/devmgr.c rename to src/core1/io/devmgr.c diff --git a/src/core1/done/io/dpgetstat.c b/src/core1/io/dpgetstat.c similarity index 100% rename from src/core1/done/io/dpgetstat.c rename to src/core1/io/dpgetstat.c diff --git a/src/core1/done/io/dpsetstat.c b/src/core1/io/dpsetstat.c similarity index 100% rename from src/core1/done/io/dpsetstat.c rename to src/core1/io/dpsetstat.c diff --git a/src/core1/done/io/epirawdma.c b/src/core1/io/epirawdma.c similarity index 100% rename from src/core1/done/io/epirawdma.c rename to src/core1/io/epirawdma.c diff --git a/src/core1/done/io/epirawread.c b/src/core1/io/epirawread.c similarity index 100% rename from src/core1/done/io/epirawread.c rename to src/core1/io/epirawread.c diff --git a/src/core1/done/io/epirawwrite.c b/src/core1/io/epirawwrite.c similarity index 100% rename from src/core1/done/io/epirawwrite.c rename to src/core1/io/epirawwrite.c diff --git a/src/core1/done/io/leodiskinit.c b/src/core1/io/leodiskinit.c similarity index 100% rename from src/core1/done/io/leodiskinit.c rename to src/core1/io/leodiskinit.c diff --git a/src/core1/done/io/leointerrupt.c b/src/core1/io/leointerrupt.c similarity index 100% rename from src/core1/done/io/leointerrupt.c rename to src/core1/io/leointerrupt.c diff --git a/src/core1/done/io/motor.c b/src/core1/io/motor.c similarity index 100% rename from src/core1/done/io/motor.c rename to src/core1/io/motor.c diff --git a/src/core1/done/io/pfschecker.c b/src/core1/io/pfschecker.c similarity index 100% rename from src/core1/done/io/pfschecker.c rename to src/core1/io/pfschecker.c diff --git a/src/core1/done/io/pfsgetstatus.c b/src/core1/io/pfsgetstatus.c similarity index 100% rename from src/core1/done/io/pfsgetstatus.c rename to src/core1/io/pfsgetstatus.c diff --git a/src/core1/done/io/pfsinit.c b/src/core1/io/pfsinit.c similarity index 100% rename from src/core1/done/io/pfsinit.c rename to src/core1/io/pfsinit.c diff --git a/src/core1/done/io/pfsisplug.c b/src/core1/io/pfsisplug.c similarity index 100% rename from src/core1/done/io/pfsisplug.c rename to src/core1/io/pfsisplug.c diff --git a/src/core1/done/io/piacs.c b/src/core1/io/piacs.c similarity index 100% rename from src/core1/done/io/piacs.c rename to src/core1/io/piacs.c diff --git a/src/core1/done/io/pigetcmdq.c b/src/core1/io/pigetcmdq.c similarity index 100% rename from src/core1/done/io/pigetcmdq.c rename to src/core1/io/pigetcmdq.c diff --git a/src/core1/done/io/pimgr.c b/src/core1/io/pimgr.c similarity index 100% rename from src/core1/done/io/pimgr.c rename to src/core1/io/pimgr.c diff --git a/src/core1/done/io/pirawdma.c b/src/core1/io/pirawdma.c similarity index 100% rename from src/core1/done/io/pirawdma.c rename to src/core1/io/pirawdma.c diff --git a/src/core1/done/io/pirawread.c b/src/core1/io/pirawread.c similarity index 100% rename from src/core1/done/io/pirawread.c rename to src/core1/io/pirawread.c diff --git a/src/core1/done/io/piread.c b/src/core1/io/piread.c similarity index 100% rename from src/core1/done/io/piread.c rename to src/core1/io/piread.c diff --git a/src/core1/done/io/si.c b/src/core1/io/si.c similarity index 100% rename from src/core1/done/io/si.c rename to src/core1/io/si.c diff --git a/src/core1/done/io/siacs.c b/src/core1/io/siacs.c similarity index 100% rename from src/core1/done/io/siacs.c rename to src/core1/io/siacs.c diff --git a/src/core1/done/io/siint.h b/src/core1/io/siint.h similarity index 100% rename from src/core1/done/io/siint.h rename to src/core1/io/siint.h diff --git a/src/core1/done/io/sirawdma.c b/src/core1/io/sirawdma.c similarity index 100% rename from src/core1/done/io/sirawdma.c rename to src/core1/io/sirawdma.c diff --git a/src/core1/done/io/sirawread.c b/src/core1/io/sirawread.c similarity index 100% rename from src/core1/done/io/sirawread.c rename to src/core1/io/sirawread.c diff --git a/src/core1/done/io/sirawwrite.c b/src/core1/io/sirawwrite.c similarity index 100% rename from src/core1/done/io/sirawwrite.c rename to src/core1/io/sirawwrite.c diff --git a/src/core1/done/io/sp.c b/src/core1/io/sp.c similarity index 100% rename from src/core1/done/io/sp.c rename to src/core1/io/sp.c diff --git a/src/core1/done/io/spgetstat.c b/src/core1/io/spgetstat.c similarity index 100% rename from src/core1/done/io/spgetstat.c rename to src/core1/io/spgetstat.c diff --git a/src/core1/done/io/sprawdma.c b/src/core1/io/sprawdma.c similarity index 100% rename from src/core1/done/io/sprawdma.c rename to src/core1/io/sprawdma.c diff --git a/src/core1/done/io/spsetpc.c b/src/core1/io/spsetpc.c similarity index 100% rename from src/core1/done/io/spsetpc.c rename to src/core1/io/spsetpc.c diff --git a/src/core1/done/io/spsetstat.c b/src/core1/io/spsetstat.c similarity index 100% rename from src/core1/done/io/spsetstat.c rename to src/core1/io/spsetstat.c diff --git a/src/core1/done/io/sptask.c b/src/core1/io/sptask.c similarity index 100% rename from src/core1/done/io/sptask.c rename to src/core1/io/sptask.c diff --git a/src/core1/done/io/sptaskyield.c b/src/core1/io/sptaskyield.c similarity index 100% rename from src/core1/done/io/sptaskyield.c rename to src/core1/io/sptaskyield.c diff --git a/src/core1/done/io/sptaskyielded.c b/src/core1/io/sptaskyielded.c similarity index 100% rename from src/core1/done/io/sptaskyielded.c rename to src/core1/io/sptaskyielded.c diff --git a/src/core1/done/io/vi.c b/src/core1/io/vi.c similarity index 100% rename from src/core1/done/io/vi.c rename to src/core1/io/vi.c diff --git a/src/core1/done/io/viblack.c b/src/core1/io/viblack.c similarity index 100% rename from src/core1/done/io/viblack.c rename to src/core1/io/viblack.c diff --git a/src/core1/done/io/vigetcurrcontext.c b/src/core1/io/vigetcurrcontext.c similarity index 100% rename from src/core1/done/io/vigetcurrcontext.c rename to src/core1/io/vigetcurrcontext.c diff --git a/src/core1/done/io/vigetcurrframebuf.c b/src/core1/io/vigetcurrframebuf.c similarity index 100% rename from src/core1/done/io/vigetcurrframebuf.c rename to src/core1/io/vigetcurrframebuf.c diff --git a/src/core1/done/io/vigetnextframebuf.c b/src/core1/io/vigetnextframebuf.c similarity index 100% rename from src/core1/done/io/vigetnextframebuf.c rename to src/core1/io/vigetnextframebuf.c diff --git a/src/core1/done/io/vimgr.c b/src/core1/io/vimgr.c similarity index 100% rename from src/core1/done/io/vimgr.c rename to src/core1/io/vimgr.c diff --git a/src/core1/done/io/vimodempallan1.c b/src/core1/io/vimodempallan1.c similarity index 100% rename from src/core1/done/io/vimodempallan1.c rename to src/core1/io/vimodempallan1.c diff --git a/src/core1/done/io/vimodentsclan1.c b/src/core1/io/vimodentsclan1.c similarity index 100% rename from src/core1/done/io/vimodentsclan1.c rename to src/core1/io/vimodentsclan1.c diff --git a/src/core1/done/io/vimodepallan1.c b/src/core1/io/vimodepallan1.c similarity index 100% rename from src/core1/done/io/vimodepallan1.c rename to src/core1/io/vimodepallan1.c diff --git a/src/core1/done/io/visetevent.c b/src/core1/io/visetevent.c similarity index 100% rename from src/core1/done/io/visetevent.c rename to src/core1/io/visetevent.c diff --git a/src/core1/done/io/visetmode.c b/src/core1/io/visetmode.c similarity index 100% rename from src/core1/done/io/visetmode.c rename to src/core1/io/visetmode.c diff --git a/src/core1/done/io/visetspecial.c b/src/core1/io/visetspecial.c similarity index 100% rename from src/core1/done/io/visetspecial.c rename to src/core1/io/visetspecial.c diff --git a/src/core1/done/io/viswapbuf.c b/src/core1/io/viswapbuf.c similarity index 100% rename from src/core1/done/io/viswapbuf.c rename to src/core1/io/viswapbuf.c diff --git a/src/core1/done/io/viswapcontext.c b/src/core1/io/viswapcontext.c similarity index 100% rename from src/core1/done/io/viswapcontext.c rename to src/core1/io/viswapcontext.c diff --git a/src/core1/done/ll.c b/src/core1/ll.c similarity index 100% rename from src/core1/done/ll.c rename to src/core1/ll.c diff --git a/src/core1/done/os/createmesgqueue.c b/src/core1/os/createmesgqueue.c similarity index 100% rename from src/core1/done/os/createmesgqueue.c rename to src/core1/os/createmesgqueue.c diff --git a/src/core1/done/os/createthread.c b/src/core1/os/createthread.c similarity index 100% rename from src/core1/done/os/createthread.c rename to src/core1/os/createthread.c diff --git a/src/core1/done/os/destroythread.c b/src/core1/os/destroythread.c similarity index 100% rename from src/core1/done/os/destroythread.c rename to src/core1/os/destroythread.c diff --git a/src/core1/done/os/getthreadpri.c b/src/core1/os/getthreadpri.c similarity index 100% rename from src/core1/done/os/getthreadpri.c rename to src/core1/os/getthreadpri.c diff --git a/src/core1/done/os/gettime.c b/src/core1/os/gettime.c similarity index 100% rename from src/core1/done/os/gettime.c rename to src/core1/os/gettime.c diff --git a/src/core1/done/os/jammesg.c b/src/core1/os/jammesg.c similarity index 100% rename from src/core1/done/os/jammesg.c rename to src/core1/os/jammesg.c diff --git a/src/core1/done/os/pidma.c b/src/core1/os/pidma.c similarity index 100% rename from src/core1/done/os/pidma.c rename to src/core1/os/pidma.c diff --git a/src/core1/done/os/recvmesg.c b/src/core1/os/recvmesg.c similarity index 100% rename from src/core1/done/os/recvmesg.c rename to src/core1/os/recvmesg.c diff --git a/src/core1/done/os/resetglobalintmask.c b/src/core1/os/resetglobalintmask.c similarity index 100% rename from src/core1/done/os/resetglobalintmask.c rename to src/core1/os/resetglobalintmask.c diff --git a/src/core1/done/os/sendmesg.c b/src/core1/os/sendmesg.c similarity index 100% rename from src/core1/done/os/sendmesg.c rename to src/core1/os/sendmesg.c diff --git a/src/core1/done/os/seteventmesg.c b/src/core1/os/seteventmesg.c similarity index 100% rename from src/core1/done/os/seteventmesg.c rename to src/core1/os/seteventmesg.c diff --git a/src/core1/done/os/setglobalintmask.c b/src/core1/os/setglobalintmask.c similarity index 100% rename from src/core1/done/os/setglobalintmask.c rename to src/core1/os/setglobalintmask.c diff --git a/src/core1/done/os/settimer.c b/src/core1/os/settimer.c similarity index 100% rename from src/core1/done/os/settimer.c rename to src/core1/os/settimer.c diff --git a/src/core1/done/os/settreadpri.c b/src/core1/os/settreadpri.c similarity index 100% rename from src/core1/done/os/settreadpri.c rename to src/core1/os/settreadpri.c diff --git a/src/core1/done/os/startthread.c b/src/core1/os/startthread.c similarity index 100% rename from src/core1/done/os/startthread.c rename to src/core1/os/startthread.c diff --git a/src/core1/done/os/stopthread.c b/src/core1/os/stopthread.c similarity index 100% rename from src/core1/done/os/stopthread.c rename to src/core1/os/stopthread.c diff --git a/src/core1/done/os/stoptimer.c b/src/core1/os/stoptimer.c similarity index 100% rename from src/core1/done/os/stoptimer.c rename to src/core1/os/stoptimer.c diff --git a/src/core1/done/os/thread.c b/src/core1/os/thread.c similarity index 100% rename from src/core1/done/os/thread.c rename to src/core1/os/thread.c diff --git a/src/core1/done/os/timerintr.c b/src/core1/os/timerintr.c similarity index 100% rename from src/core1/done/os/timerintr.c rename to src/core1/os/timerintr.c diff --git a/src/core1/done/os/virtualtophysical.c b/src/core1/os/virtualtophysical.c similarity index 100% rename from src/core1/done/os/virtualtophysical.c rename to src/core1/os/virtualtophysical.c diff --git a/src/core1/done/os/yieldthread.c b/src/core1/os/yieldthread.c similarity index 100% rename from src/core1/done/os/yieldthread.c rename to src/core1/os/yieldthread.c diff --git a/src/core1/done/syncprintf.c b/src/core1/syncprintf.c similarity index 100% rename from src/core1/done/syncprintf.c rename to src/core1/syncprintf.c diff --git a/src/core2/bs/carry.c b/src/core2/bs/carry.c index 6ba2ada5..276b83b9 100644 --- a/src/core2/bs/carry.c +++ b/src/core2/bs/carry.c @@ -20,7 +20,7 @@ void func_802AAE80(void){ void func_802AAEE0(void){ enum bs_e state = bs_getNextState(); - if(state != BS_3A_CARRY_IDLE && state != BS_CARRY_WALK) + if(state != BS_3A_CARRY_IDLE && state != BS_3B_CARRY_WALK) func_8029B0C0(); func_80289F10(1); @@ -42,7 +42,7 @@ void bscarry_idle_update(void){ enum bs_e sp1C = 0; if(func_8029B300() > 0) - sp1C = BS_CARRY_WALK; + sp1C = BS_3B_CARRY_WALK; if(carriedobj_getMarker() == NULL) sp1C = BS_1_IDLE; @@ -85,7 +85,7 @@ void bscarry_walk_end(void){ int bscarry_inSet(enum bs_e state){ return state == BS_3A_CARRY_IDLE - || state == BS_CARRY_WALK; + || state == BS_3B_CARRY_WALK; } void bscarry_interrupt(void){ @@ -95,7 +95,7 @@ void bscarry_interrupt(void){ break; case 8: func_8029A86C(2); - bs_setState(BS_3C); + bs_setState(BS_3C_TALK); break; case 0x12: func_8028DE6C(carriedObject_getActorID()); diff --git a/src/core2/bs/drone.c b/src/core2/bs/drone.c index a7c8b1cb..88c05e8c 100644 --- a/src/core2/bs/drone.c +++ b/src/core2/bs/drone.c @@ -10,10 +10,10 @@ typedef struct{ struct_drone D_80364B30[] = { {01, {func_802AEDE8, func_802AEE48, func_802AEE9C, NULL}}, - {02, {func_802AEEF4, func_802AEFB0, func_802AF164, func_80296608}}, + {02, {bsDroneLook_init, bsDroneLook_update, bsDroneLook_end, func_80296608}}, {04, {bsdronexform_init, bsdronexform_update, bsdronexform_end, bsdronexform_interrupt}}, - {05, {func_802AE9C8, func_802AEA2C, func_802AEB24, NULL}}, - {06, {func_802AF604, bsdronevanish_update, func_802AF768, NULL}}, + {05, {bsDroneEnter_init, bsDroneEnter_update, bsDroneEnter_end, NULL}}, + {06, {bsDroneVanish_init, bsDroneVanish_update, bsDroneVanish_end, NULL}}, {0} }; diff --git a/src/core2/bs/droneenter.c b/src/core2/bs/droneenter.c new file mode 100644 index 00000000..8bc32eb0 --- /dev/null +++ b/src/core2/bs/droneenter.c @@ -0,0 +1,152 @@ +#include +#include "functions.h" +#include "variables.h" + +enum bsdroneenter_state_e{ + BSDRONEENTER_SUBSTATE_0_UNINITIALIZED, + BSDRONEENTER_SUBSTATE_1, + BSDRONEENTER_SUBSTATE_2, + BSDRONEENTER_SUBSTATE_3 +}; + +/* .bss */ +struct { + ParticleEmitter *white_sparkle_emitter; + ParticleEmitter *yellow_sparkle_emitter; + f32 unk8; + f32 unkC; + f32 unk10; + u8 pad14[4]; +}bsDroneEnter; +u8 bsDroneEnterSubstate; + +/* .code */ +void __bsDroneEnter_setSubstate(enum bsdroneenter_state_e arg0) { + switch (arg0) { + case 1: + func_8029E3C0(0, 0.2f); + break; + case 2: + func_8025A6CC(COMUSIC_43_ENTER_LEVEL_GLITTER, 32000); + func_8025AABC(COMUSIC_43_ENTER_LEVEL_GLITTER); + func_8029E3C0(0, 0.4f); + playerModel_setEnvAlpha(0); + playerModel_updateModel(); + break; + case 3: + comusic_8025AB44(COMUSIC_43_ENTER_LEVEL_GLITTER, 0, 2000); + func_8029E3C0(0, 0.55f); + break; + } + bsDroneEnterSubstate = arg0; +} + +void __bsDroneEnter_emitParticles(void) { + f32 plyr_pos[3]; + + player_getPosition(plyr_pos); + particleEmitter_setParticleAccelerationRange(bsDroneEnter.yellow_sparkle_emitter, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f); + particleEmitter_setParticleSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -5.0f, -45.0f, 45.0f, 10.0f, 45.0f); + particleEmitter_setPosition(bsDroneEnter.yellow_sparkle_emitter, plyr_pos); + particleEmitter_emitN(bsDroneEnter.yellow_sparkle_emitter, 1); + + particleEmitter_setParticleAccelerationRange(bsDroneEnter.white_sparkle_emitter, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f); + particleEmitter_setParticleSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -5.0f, -45.0f, 45.0f, 10.0f, 45.0f); + particleEmitter_setPosition(bsDroneEnter.white_sparkle_emitter, plyr_pos); + particleEmitter_emitN(bsDroneEnter.white_sparkle_emitter, 1); + + player_getPosition(plyr_pos); + plyr_pos[1] += 130.0f; + particleEmitter_setParticleAccelerationRange(bsDroneEnter.yellow_sparkle_emitter, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f); + particleEmitter_setParticleSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -10.0f, -45.0f, 45.0f, 10.0f, 45.0f); + particleEmitter_setPosition(bsDroneEnter.yellow_sparkle_emitter, plyr_pos); + particleEmitter_emitN(bsDroneEnter.yellow_sparkle_emitter, 1); + + particleEmitter_setParticleAccelerationRange(bsDroneEnter.white_sparkle_emitter, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f); + particleEmitter_setParticleSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -10.0f, -45.0f, 45.0f, 10.0f, 45.0f); + particleEmitter_setPosition(bsDroneEnter.white_sparkle_emitter, plyr_pos); + particleEmitter_emitN(bsDroneEnter.white_sparkle_emitter, 1); +} + +void __bsDroneEnter_initParticleTypes(ParticleEmitter *p_ctrl, enum asset_e sprite_id) { + func_802F0D54(p_ctrl); + particleEmitter_setSprite(p_ctrl, sprite_id); + func_802EFA5C(p_ctrl, 0.3f, 0.8f); + func_802EFB70(p_ctrl, 0.15f, 0.22f); + func_802EFB84(p_ctrl, 0.03f, 0.05f); + func_802EFE24(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f); + func_802EFEC0(p_ctrl, 0.55f, 0.55f); +} + +void __bsDroneEnter_removeParticleTypes(void) { + partEmitList_remove(bsDroneEnter.yellow_sparkle_emitter); + partEmitList_remove(bsDroneEnter.white_sparkle_emitter); +} + +void __bsDroneEnter_init(void) { + bsDroneEnter.unk10 = 0.0f; + bsDroneEnter.unk8 = 0.0f; + bsDroneEnter.unkC = 1.0f; + bsDroneEnter.white_sparkle_emitter = partEmitList_pushNew(60); + __bsDroneEnter_initParticleTypes(bsDroneEnter.white_sparkle_emitter, ASSET_716_SPRITE_SPARKLE_WHITE); + bsDroneEnter.yellow_sparkle_emitter = partEmitList_pushNew(60); + __bsDroneEnter_initParticleTypes(bsDroneEnter.yellow_sparkle_emitter, ASSET_713_SPRITE_SPARKLE_YELLOW); +} + +void func_802AE914(void) { + bsDroneEnter.unk10 -= time_getDelta(); + while ( bsDroneEnter.unk10 < 0.0f) { + __bsDroneEnter_emitParticles(); + bsDroneEnter.unk8 += 0.02 * (f64) bsDroneEnter.unkC; + bsDroneEnter.unk10 += 0.02; + } +} + +void bsDroneEnter_init(void) { + f32 anim_duration; + enum asset_e anim_id; + + func_8029BCF8(&anim_id, &anim_duration); + func_8028A010(anim_id, anim_duration); + func_8029C7F4(1, 1, 3, 7); + func_80294378(6); + __bsDroneEnter_init(); + bsDroneEnterSubstate = BSDRONEENTER_SUBSTATE_0_UNINITIALIZED; + __bsDroneEnter_setSubstate(BSDRONEENTER_SUBSTATE_1); +} + +void bsDroneEnter_update(void) { + s32 next_state; + s32 sp20; + u8 temp_v0; + + next_state = 0; + switch (bsDroneEnterSubstate) { + case BSDRONEENTER_SUBSTATE_1: + func_802AE914(); + if (func_8029E1A8(0)) { + __bsDroneEnter_setSubstate(BSDRONEENTER_SUBSTATE_2); + } + break; + case BSDRONEENTER_SUBSTATE_2: + func_802AE914(); + sp20 = func_8029E1A8(0); + playerModel_setEnvAlpha((s32) ml_map_f(func_8029E270(0), 0.0f, 0.4f, 255.0f, 0.0f)); + if (sp20) { + __bsDroneEnter_setSubstate(BSDRONEENTER_SUBSTATE_3); + } + break; + case BSDRONEENTER_SUBSTATE_3: + if (func_8029E1A8(0)) { + next_state = bs_getIdleState(); + } + break; + } + bs_setState(next_state); +} + +void bsDroneEnter_end(void){ + __bsDroneEnter_removeParticleTypes(); + func_80294378(1); + playerModel_updateModel(); +} diff --git a/src/core2/bs/dronelook.c b/src/core2/bs/dronelook.c new file mode 100644 index 00000000..21514557 --- /dev/null +++ b/src/core2/bs/dronelook.c @@ -0,0 +1,78 @@ +#include +#include "functions.h" +#include "variables.h" + +extern f32 func_8029B2D0(void); + +/* .code */ +void __bsDroneLook_getEyePos(f32 arg0[3]) { + func_8028E9C4(5, arg0); +} + +void bsDroneLook_init(void) { + f32 anim_duration; + f32 eye_position[3]; + f32 eye_rotation[3]; + enum asset_e anim_id; + + func_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.2f, 12000); + func_8029BCF8(&anim_id, &anim_duration); + func_8028A010(anim_id, anim_duration); + func_8029C7F4(1, 1, 3, 2); + func_80297970(0.0f); + func_80297A0C(0); + func_802BE8D8(); + __bsDroneLook_getEyePos(eye_position); + func_802C2A64(eye_position); + player_getRotation(eye_rotation); + eye_rotation[0] = 0.0f; + eye_rotation[1] += 180.0f; + eye_rotation[2] = 0.0f; + func_802C2A8C(eye_rotation); + miscflag_set(0x17); +} + +void bsDroneLook_update(void) { + s32 next_state; + f32 eye_rotation[3]; + f32 eye_position[3]; + f32 dt; + s32 exit_first_person; + + next_state = 0; + dt = time_getDelta(); + if (func_802C2B00() == 2) { + func_802C2ADC(eye_rotation); + eye_rotation[0] -= func_8029B2DC() * 90.0f * dt; + eye_rotation[1] -= func_8029B2D0() * 90.0f * dt; + eye_rotation[2] = 0.0f; + eye_rotation[0] = (eye_rotation[0] > 180.0f) ? max_f(305.0f, eye_rotation[0]) : min_f(70.0f, eye_rotation[0]); + func_802C2A8C(eye_rotation); + yaw_setIdeal(eye_rotation[1] + 180.0f); + exit_first_person = FALSE; + if (button_pressed(BUTTON_B) || button_pressed(BUTTON_A) || button_pressed(BUTTON_C_UP)) { + exit_first_person = TRUE; + } + if (player_inWater()) { + if (player_getTransformation() == TRANSFORM_1_BANJO && func_8028EE84() == BSWATERGROUP_0_NONE) { + exit_first_person += TRUE; + } + } else if (func_8028B254(25) == 0) { + exit_first_person += TRUE; + } + if (exit_first_person) { + next_state = func_8029BDBC(); + } + } + __bsDroneLook_getEyePos(eye_position); + func_802C2A64(eye_position); + bs_setState(next_state); +} + +void bsDroneLook_end(void) { + if (func_80298850() == 0) { + func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000); + } + func_802BE91C(); + miscflag_clear(0x17); +} diff --git a/src/core2/code_28220.c b/src/core2/bs/dronevanish.c similarity index 77% rename from src/core2/code_28220.c rename to src/core2/bs/dronevanish.c index 1b5e1b0f..eea64869 100644 --- a/src/core2/code_28220.c +++ b/src/core2/bs/dronevanish.c @@ -13,7 +13,7 @@ struct { u8 D_8037D468; /* .code */ -void bsdronevanish_setState(s32 next_state) { +void __bsDroneVanish_setSubstate(s32 next_state) { switch (next_state) { case 1: func_8029E3C0(0, 0.3f); @@ -33,7 +33,7 @@ void bsdronevanish_setState(s32 next_state) { D_8037D468 = next_state; } -void func_802AF268(void) { +void __bsDroneVanish_emitParticles(void) { f32 position[3]; player_getPosition(position); @@ -52,7 +52,7 @@ void func_802AF268(void) { particleEmitter_emitN(D_8037D450.unk0, 1); } -void func_802AF3B4(ParticleEmitter *p_ctrl, enum asset_e sprite_id) { +void __bsDroneVanish_particleEmitInit(ParticleEmitter *p_ctrl, enum asset_e sprite_id) { func_802F0D54(); particleEmitter_setSprite(p_ctrl, sprite_id); func_802EFA5C(p_ctrl, 0.3f, 0.8f); @@ -63,31 +63,31 @@ void func_802AF3B4(ParticleEmitter *p_ctrl, enum asset_e sprite_id) { func_802EFEC0(p_ctrl, 0.55f, 0.55f); } -void func_802AF4B0(void) { - func_802F0C78(D_8037D450.unk4); - func_802F0C78(D_8037D450.unk0); +void __bsDroneVanish_end(void) { + partEmitList_remove(D_8037D450.unk4); + partEmitList_remove(D_8037D450.unk0); } -void func_802AF4E0(void) { +void __bsDroneVanish_init(void) { D_8037D450.unk10 = 0.0f; D_8037D450.unk8 = 0.0f; D_8037D450.unkC = 1.0f; D_8037D450.unk0 = partEmitList_pushNew(60); - func_802AF3B4(D_8037D450.unk0, ASSET_716_SPRITE_SPARKLE_WHITE); + __bsDroneVanish_particleEmitInit(D_8037D450.unk0, ASSET_716_SPRITE_SPARKLE_WHITE); D_8037D450.unk4 = partEmitList_pushNew(60); - func_802AF3B4(D_8037D450.unk4, ASSET_713_SPRITE_SPARKLE_YELLOW); + __bsDroneVanish_particleEmitInit(D_8037D450.unk4, ASSET_713_SPRITE_SPARKLE_YELLOW); } -void func_802AF550(void) { +void __bsDroneVanish_update(void) { D_8037D450.unk10 -= time_getDelta(); while ( D_8037D450.unk10 < 0.0f) { - func_802AF268(); + __bsDroneVanish_emitParticles(); D_8037D450.unk8 += 0.02 * (f64) D_8037D450.unkC; D_8037D450.unk10 += 0.02; } } -void func_802AF604(void){ +void bsDroneVanish_init(void){ f32 anim_duration; enum asset_e anim_id; @@ -95,29 +95,29 @@ void func_802AF604(void){ func_8028A010(anim_id, anim_duration); func_8029C7F4(1,1,3,7); func_80294378(6); - func_802AF4E0(); + __bsDroneVanish_init(); D_8037D468 = 0; - bsdronevanish_setState(1); + __bsDroneVanish_setSubstate(1); } -void bsdronevanish_update(void) { +void bsDroneVanish_update(void) { s32 next_state; bool sp20; next_state = 0; switch (D_8037D468) { case 1: - func_802AF550(); + __bsDroneVanish_update(); if (func_8029E1A8(0)) { - bsdronevanish_setState(2); + __bsDroneVanish_setSubstate(2); } break; case 2: - func_802AF550(); + __bsDroneVanish_update(); sp20 = func_8029E1A8(0); playerModel_setEnvAlpha((s32) ml_map_f(func_8029E270(0), 0.0f, 0.4f, 0.0f, 255.0f)); if (sp20) { - bsdronevanish_setState(3); + __bsDroneVanish_setSubstate(3); } break; case 3: @@ -129,8 +129,8 @@ void bsdronevanish_update(void) { bs_setState(next_state); } -void func_802AF768(void){ - func_802AF4B0(); +void bsDroneVanish_end(void){ + __bsDroneVanish_end(); func_80294378(1); playerModel_updateModel(); } diff --git a/src/core2/bs/dronexform.c b/src/core2/bs/dronexform.c index 3e4cf51f..c48b53d2 100644 --- a/src/core2/bs/dronexform.c +++ b/src/core2/bs/dronexform.c @@ -82,8 +82,8 @@ void func_802AF900(void){ } void func_802AFADC(void){ - func_802F0C78(D_8037D470.unk4); - func_802F0C78(D_8037D470.unk0); + partEmitList_remove(D_8037D470.unk4); + partEmitList_remove(D_8037D470.unk0); } void func_802AFB0C(void){ diff --git a/src/core2/bs/stand.c b/src/core2/bs/stand.c index 8b584592..1ec62325 100644 --- a/src/core2/bs/stand.c +++ b/src/core2/bs/stand.c @@ -328,7 +328,7 @@ void func_802B5350(void){ } else if(sp1C == 0x8){//L802B5438 func_8029A86C(2); - bs_setState(BS_3C); + bs_setState(BS_3C_TALK); }else{ func_802948E0(); func_80296608(); diff --git a/src/core2/bs/talk.c b/src/core2/bs/talk.c new file mode 100644 index 00000000..9554ef43 --- /dev/null +++ b/src/core2/bs/talk.c @@ -0,0 +1,51 @@ +#include +#include "functions.h" +#include "variables.h" + +/* .bss */ +bool bsTalkStayInState; + +/* .code */ +void bstalk_init(void){ + AnimCtrl *player_anim_ctrl; + f32 yaw; + f32 plyr_pos[3]; + f32 target_pos[3]; + + player_anim_ctrl = _player_getAnimCtrlPtr(); + animctrl_reset(player_anim_ctrl); + func_8029C848(player_anim_ctrl); + animctrl_setPlaybackType(player_anim_ctrl, ANIMCTRL_LOOP); + func_802875AC(player_anim_ctrl, "bstalk.c", 0x38); + _player_getPosition(plyr_pos); + func_802949F8(target_pos); + func_80257F18(plyr_pos, target_pos, &yaw); + yaw_setIdeal(yaw); + func_80289F10(1); + func_802991A8(1); + func_8029957C(3); + func_802978DC(2); + func_80297970(0.0f); + bsTalkStayInState = TRUE; +} + +void bstalk_update(void){ + enum bs_e next_state = BS_0_NONE; + + if (!bsTalkStayInState) + next_state = BS_1_IDLE; + bsTalkStayInState = FALSE; + bs_setState(next_state); +} + +void bstalk_end(void){} + +void bstalk_interrupt(void){ + if(bs_getInterruptType() == BS_INTR_8){ + bsTalkStayInState = TRUE; + func_8029A86C(2); + } + else{ + func_80296608(); + } +} diff --git a/src/core2/done/climb.c b/src/core2/climb.c similarity index 100% rename from src/core2/done/climb.c rename to src/core2/climb.c diff --git a/src/core2/code_27550.c b/src/core2/code_27550.c deleted file mode 100644 index 440c7d59..00000000 --- a/src/core2/code_27550.c +++ /dev/null @@ -1,141 +0,0 @@ -#include -#include "functions.h" -#include "variables.h" - -/* .bss */ -struct { - ParticleEmitter *unk0; - ParticleEmitter *unk4; - f32 unk8; - f32 unkC; - f32 unk10; -}D_8037D420; -u8 D_8037D438; - -/* .code */ -void func_802AE4E0(s32 arg0) { - switch (arg0) { - case 1: - func_8029E3C0(0, 0.2f); - break; - case 2: - func_8025A6CC(COMUSIC_43_ENTER_LEVEL_GLITTER, 32000); - func_8025AABC(COMUSIC_43_ENTER_LEVEL_GLITTER); - func_8029E3C0(0, 0.4f); - playerModel_setEnvAlpha(0); - playerModel_updateModel(); - break; - case 3: - comusic_8025AB44(COMUSIC_43_ENTER_LEVEL_GLITTER, 0, 2000); - func_8029E3C0(0, 0.55f); - break; - } - D_8037D438 = arg0; -} - -void func_802AE598(void) { - f32 plyr_pos[3]; - - player_getPosition(plyr_pos); - particleEmitter_setParticleAccelerationRange(D_8037D420.unk4, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f); - particleEmitter_setParticleSpawnPositionRange(D_8037D420.unk4, -45.0f, -5.0f, -45.0f, 45.0f, 10.0f, 45.0f); - particleEmitter_setPosition(D_8037D420.unk4, plyr_pos); - particleEmitter_emitN(D_8037D420.unk4, 1); - particleEmitter_setParticleAccelerationRange(D_8037D420.unk0, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f); - particleEmitter_setParticleSpawnPositionRange(D_8037D420.unk4, -45.0f, -5.0f, -45.0f, 45.0f, 10.0f, 45.0f); - particleEmitter_setPosition(D_8037D420.unk0, plyr_pos); - particleEmitter_emitN(D_8037D420.unk0, 1); - player_getPosition(plyr_pos); - plyr_pos[1] += 130.0f; - particleEmitter_setParticleAccelerationRange(D_8037D420.unk4, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f); - particleEmitter_setParticleSpawnPositionRange(D_8037D420.unk4, -45.0f, -10.0f, -45.0f, 45.0f, 10.0f, 45.0f); - particleEmitter_setPosition(D_8037D420.unk4, plyr_pos); - particleEmitter_emitN(D_8037D420.unk4, 1); - particleEmitter_setParticleAccelerationRange(D_8037D420.unk0, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f); - particleEmitter_setParticleSpawnPositionRange(D_8037D420.unk4, -45.0f, -10.0f, -45.0f, 45.0f, 10.0f, 45.0f); - particleEmitter_setPosition(D_8037D420.unk0, plyr_pos); - particleEmitter_emitN(D_8037D420.unk0, 1); -} - -void func_802AE7AC(ParticleEmitter *p_ctrl, enum asset_e sprite_id) { - func_802F0D54(p_ctrl); - particleEmitter_setSprite(p_ctrl, sprite_id); - func_802EFA5C(p_ctrl, 0.3f, 0.8f); - func_802EFB70(p_ctrl, 0.15f, 0.22f); - func_802EFB84(p_ctrl, 0.03f, 0.05f); - func_802EFE24(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f); - func_802EFEC0(p_ctrl, 0.55f, 0.55f); -} - -void func_802AE874(void) { - func_802F0C78(D_8037D420.unk4); - func_802F0C78(D_8037D420.unk0); -} - -void func_802AE8A4(void) { - D_8037D420.unk10 = 0.0f; - D_8037D420.unk8 = 0.0f; - D_8037D420.unkC = 1.0f; - D_8037D420.unk0 = partEmitList_pushNew(60); - func_802AE7AC(D_8037D420.unk0, ASSET_716_SPRITE_SPARKLE_WHITE); - D_8037D420.unk4 = partEmitList_pushNew(60); - func_802AE7AC(D_8037D420.unk4, ASSET_713_SPRITE_SPARKLE_YELLOW); -} - -void func_802AE914(void) { - D_8037D420.unk10 -= time_getDelta(); - while ( D_8037D420.unk10 < 0.0f) { - func_802AE598(); - D_8037D420.unk8 += 0.02 * (f64) D_8037D420.unkC; - D_8037D420.unk10 += 0.02; - } -} - -void func_802AE9C8(void) { - f32 anim_duration; - enum asset_e anim_id; - - func_8029BCF8(&anim_id, &anim_duration); - func_8028A010(anim_id, anim_duration); - func_8029C7F4(1, 1, 3, 7); - func_80294378(6); - func_802AE8A4(); - D_8037D438 = 0; - func_802AE4E0(1); -} - -void func_802AEA2C(void) { - s32 next_state; - s32 sp20; - u8 temp_v0; - - next_state = 0; - switch (D_8037D438) { - case 1: - func_802AE914(); - if (func_8029E1A8(0)) { - func_802AE4E0(2); - } - break; - case 2: - func_802AE914(); - sp20 = func_8029E1A8(0); - playerModel_setEnvAlpha((s32) ml_map_f(func_8029E270(0), 0.0f, 0.4f, 255.0f, 0.0f)); - if (sp20) { - func_802AE4E0(3); - } - break; - case 3: - if (func_8029E1A8(0)) { - next_state = bs_getIdleState(); - } - break; - } - bs_setState(next_state); -} - -void func_802AEB24(void){ - func_802AE874(); - func_80294378(1); - playerModel_updateModel(); -} diff --git a/src/core2/code_27F40.c b/src/core2/code_27F40.c deleted file mode 100644 index 5806268c..00000000 --- a/src/core2/code_27F40.c +++ /dev/null @@ -1,78 +0,0 @@ -#include -#include "functions.h" -#include "variables.h" - -extern f32 func_8029B2D0(void); - -/* .code */ -void func_802AEED0(f32 arg0[3]) { - func_8028E9C4(5, arg0); -} - -void func_802AEEF4(void) { - f32 anim_duration; - f32 sp28[3]; - f32 sp1C[3]; - enum asset_e anim_id; - - func_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.2f, 12000); - func_8029BCF8(&anim_id, &anim_duration); - func_8028A010(anim_id, anim_duration); - func_8029C7F4(1, 1, 3, 2); - func_80297970(0.0f); - func_80297A0C(0); - func_802BE8D8(); - func_802AEED0(sp28); - func_802C2A64(sp28); - player_getRotation(sp1C); - sp1C[0] = 0.0f; - sp1C[1] += 180.0f; - sp1C[2] = 0.0f; - func_802C2A8C(sp1C); - miscflag_set(0x17); -} - -void func_802AEFB0(void) { - s32 next_state; - f32 sp30[3]; - f32 sp24[3]; - f32 sp20; - s32 sp1C; - - next_state = 0; - sp20 = time_getDelta(); - if (func_802C2B00() == 2) { - func_802C2ADC(sp30); - sp30[0] -= func_8029B2DC() * 90.0f * sp20; - sp30[1] -= func_8029B2D0() * 90.0f * sp20; - sp30[2] = 0.0f; - sp30[0] = (sp30[0] > 180.0f) ? max_f(305.0f, sp30[0]) : min_f(70.0f, sp30[0]); - func_802C2A8C(sp30); - yaw_setIdeal(sp30[1] + 180.0f); - sp1C = 0; - if (button_pressed(BUTTON_B) || button_pressed(BUTTON_A) || button_pressed(BUTTON_C_UP)) { - sp1C = 1; - } - if (player_inWater()) { - if (player_getTransformation() == TRANSFORM_1_BANJO && func_8028EE84() == BSWATERGROUP_0_NONE) { - sp1C += 1; - } - } else if (func_8028B254(25) == 0) { - sp1C += 1; - } - if (sp1C) { - next_state = func_8029BDBC(); - } - } - func_802AEED0(sp24); - func_802C2A64(sp24); - bs_setState(next_state); -} - -void func_802AF164(void) { - if (func_80298850() == 0) { - func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000); - } - func_802BE91C(); - miscflag_clear(0x17); -} diff --git a/src/core2/done/code_3B2C0.c b/src/core2/code_3B2C0.c similarity index 100% rename from src/core2/done/code_3B2C0.c rename to src/core2/code_3B2C0.c diff --git a/src/core2/code_679A0.c b/src/core2/code_679A0.c index 85413b7c..340d6e7a 100644 --- a/src/core2/code_679A0.c +++ b/src/core2/code_679A0.c @@ -19,7 +19,7 @@ void func_802EFA78(ParticleEmitter *this, s32 arg1); void func_802EFF5C(ParticleEmitter *, f32, f32, f32); void func_802EFF7C(ParticleEmitter *, f32, f32, f32); void func_802EFF9C(ParticleEmitter *, f32); -void func_802F0C78(ParticleEmitter *this); +void partEmitList_remove(ParticleEmitter *this); Gfx D_80368940[] = { @@ -783,7 +783,7 @@ void func_802F08A0(void){ }//L802F09C0 for(i = 0; i < D_803689B4;){ if(D_803689B0[i]->unk0_1){ - func_802F0C78(D_803689B0[i]); + partEmitList_remove(D_803689B0[i]); } else{ i++; @@ -819,7 +819,7 @@ ParticleEmitter *partEmitList_pushNew(u32 cnt){ } -void func_802F0C78(ParticleEmitter *this){ +void partEmitList_remove(ParticleEmitter *this){ int i = 0; while(this != D_803689B0[i] && i < D_803689B4){i++;} if(i == D_803689B4) diff --git a/src/core2/code_69F60.c b/src/core2/code_69F60.c index d9b0b585..6d22f65a 100644 --- a/src/core2/code_69F60.c +++ b/src/core2/code_69F60.c @@ -59,7 +59,7 @@ void func_802F1104(void){ void func_802F1190(u8 arg0){ if(D_80380938[arg0].p_emitter){ - func_802F0C78(D_80380938[arg0].p_emitter); + partEmitList_remove(D_80380938[arg0].p_emitter); } D_80380938[arg0].unk8_31 = 0; } @@ -73,7 +73,7 @@ void func_802F11E8(void){ ){ D_80380938[i].unk0 -= time_getDelta(); if(D_80380938[i].unk0 <= 0.0f){ - func_802F0C78(D_80380938[i].p_emitter); + partEmitList_remove(D_80380938[i].p_emitter); D_80380938[i].p_emitter = NULL; } } @@ -87,7 +87,7 @@ void func_802F1294(void){ && D_80380938[i].p_emitter != NULL && i != D_80380930 ){ - func_802F0C78(D_80380938[i].p_emitter); + partEmitList_remove(D_80380938[i].p_emitter); D_80380938[i].p_emitter = NULL; } } diff --git a/src/core2/code_7060.c b/src/core2/code_7060.c index bc30b75d..805c0864 100644 --- a/src/core2/code_7060.c +++ b/src/core2/code_7060.c @@ -463,7 +463,7 @@ enum bsgroup_e func_8028ECAC(void) { switch(state_id){ case BS_E_OW: //L8028EE00 case BS_34_JIG_NOTEDOOR: //L8028EE00 - case BS_3C: //L8028EE00 + case BS_3C_TALK: //L8028EE00 case BS_3F: //L8028EE00 case BS_41_DIE: //L8028EE00 case BS_44_JIG_JIGGY: //L8028EE00 diff --git a/src/core2/code_E910.c b/src/core2/code_E910.c index 927cceb6..d37a0bc8 100644 --- a/src/core2/code_E910.c +++ b/src/core2/code_E910.c @@ -62,8 +62,8 @@ bsMap D_80363824[] ={ {BS_ANT_JUMP, bsant_jump_init, bsant_jump_update, bsant_jump_end, func_802B5350}, {BS_39_DIVE_A, func_802A7A54, func_802A7AB0, func_802A7BA8, func_80296608}, {BS_3A_CARRY_IDLE, bscarry_idle_init, bscarry_idle_update, bscarry_idle_end, bscarry_interrupt}, - {BS_CARRY_WALK, bscarry_walk_init, bscarry_walk_update, bscarry_walk_end, bscarry_interrupt}, - {0x3C, func_802B6130, func_802B61E0, func_802B6218, func_802B6220}, + {BS_3B_CARRY_WALK, bscarry_walk_init, bscarry_walk_update, bscarry_walk_end, bscarry_interrupt}, + {0x3C, bstalk_init, bstalk_update, bstalk_end, bstalk_interrupt}, {BS_3D_FALL_TUMBLING, bsjump_tumble_init, bsjump_tumble_update, bsjump_tumble_end, func_80296608}, {BS_38_ANT_FALL, bsant_fall_init, bsant_fall_update, bsant_fall_end, func_80296590}, {BS_3E_ANT_OW, bsant_ow_init, bsant_ow_update, bsant_ow_end, func_80296590}, diff --git a/src/core2/done/bs/talk.c b/src/core2/done/bs/talk.c deleted file mode 100644 index 8c37c7e4..00000000 --- a/src/core2/done/bs/talk.c +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include "functions.h" -#include "variables.h" - -/* .bss */ -s32 D_8037D570; - -/* .code */ -void func_802B6130(void){ - AnimCtrl *plyr_mvmt; - f32 yaw; - f32 plyr_pos[3]; - f32 target_pos[3]; - - plyr_mvmt = _player_getAnimCtrlPtr(); - animctrl_reset(plyr_mvmt); - func_8029C848(plyr_mvmt); - animctrl_setPlaybackType(plyr_mvmt, ANIMCTRL_LOOP); - func_802875AC(plyr_mvmt, "bstalk.c", 0x38); - _player_getPosition(plyr_pos); - func_802949F8(target_pos); - func_80257F18(plyr_pos, target_pos, &yaw); - yaw_setIdeal(yaw); - func_80289F10(1); - func_802991A8(1); - func_8029957C(3); - func_802978DC(2); - func_80297970(0.0f); - D_8037D570 = 1; -} - -void func_802B61E0(void){ - s32 tmp = 0; - - if (D_8037D570 == 0) - tmp = BS_1_IDLE; - D_8037D570 = 0; - bs_setState(tmp); -} - -void func_802B6218(void){} - -void func_802B6220(void){ - if(bs_getInterruptType() == BS_INTR_8){ - D_8037D570 = 1; - func_8029A86C(2); - } - else{ - func_80296608(); - } -}